From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2FD06C41604 for ; Tue, 6 Oct 2020 11:05:55 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 974742083B for ; Tue, 6 Oct 2020 11:05:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=kroah.com header.i=@kroah.com header.b="0Bw0rz4A"; dkim=temperror (0-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="iYb1qjid" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 974742083B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kroah.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EA5E289359; Tue, 6 Oct 2020 11:05:53 +0000 (UTC) X-Greylist: delayed 441 seconds by postgrey-1.36 at gabe; Tue, 06 Oct 2020 11:05:52 UTC Received: from new2-smtp.messagingengine.com (new2-smtp.messagingengine.com [66.111.4.224]) by gabe.freedesktop.org (Postfix) with ESMTPS id BA09F89359 for ; Tue, 6 Oct 2020 11:05:52 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.nyi.internal (Postfix) with ESMTP id AD33B5802D4; Tue, 6 Oct 2020 06:58:28 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 06 Oct 2020 06:58:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm2; bh=QO5Cktwa7U/2cxe1mWgOsTKgbpB WHkoWuoes5Mt0ow0=; b=0Bw0rz4AolMe9dxUfPAZmAXRCF1U0BIgsk1K+z3ltsS 6rOdjVSp44Zf4vvU0GFxgAklxRUtbxtNA9ArOvwGFSlHXLpn7RygijNcXgrEddTB 6Ey/tpiqCyBo3W/dU8RYt0zyeaeGBc2VkzPWVYJTP+yNqBGvNHtXYVBmgRgBjzlK BNSFBG3boCq9tHRAWkpKTHG8odDSWBqLvGPzGx9oWmxb8sQExzChym6uTiSiSCXK 5u9XYxeOM7pDm/2V/F24mZWCKalMRQHkzPYREAn4mJL/6TKx3euz0BF7V8FVgOoQ 8iYU+W5HN6skzOZ8PSCgNQeLYoweI4rMwiH0sHaYSmQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=QO5Ckt wa7U/2cxe1mWgOsTKgbpBWHkoWuoes5Mt0ow0=; b=iYb1qjidja2wtWYK0sBz3z P5S2UxfMwN3IRYowpD06ZdjweByQxJZ/QbOuFlQQNOYFDft8iOFKok41FygSFs+9 DrSUOYZPLyvezbSMT3aisO09uYLdrlkhMWkhpULGT/EAJaY6dknZU71cOg9P3HSb rzUo9C7fWxbiukivy5Gng+Od1+7dwXv7tXBm4ZZusBzG3LWaiFU+D8BrbHSUnyuC EgAJF9YEKYBQBrD02krSxOEJZp+npFWnp8IcrIBQzhXLKnhIx4I03MrvD5jVQpTQ dTSbtL6ccocjAcCmff+Z3JmpO/vkHiFnkIcp4G/cu/9gnsOTdvL5GBi2+ySIkLWA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrgeeggdefgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepifhrvghgucfm jfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecuggftrfgrthhtvghrnhepveeuheejgf ffgfeivddukedvkedtleelleeghfeljeeiueeggeevueduudekvdetnecukfhppeekfedr keeirdejgedrieegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomhepghhrvghgsehkrhhorghhrdgtohhm X-ME-Proxy: Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) by mail.messagingengine.com (Postfix) with ESMTPA id 24F0C306467D; Tue, 6 Oct 2020 06:58:26 -0400 (EDT) Date: Tue, 6 Oct 2020 12:58:24 +0200 From: Greg KH To: Stephen Rothwell Message-ID: <20201006105824.GA26735@kroah.com> References: <20200910141854.1d4b1b10@canb.auug.org.au> <20201006200003.1be00223@canb.auug.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201006200003.1be00223@canb.auug.org.au> Subject: Re: [Intel-gfx] linux-next: manual merge of the extcon tree with the drm-misc tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , Dave Airlie , Daniel Vetter , Intel Graphics , Linux Kernel Mailing List , DRI , Chanwoo Choi , Linux Next Mailing List , Krzysztof Kozlowski , Laurentiu Palcu , Lucas Stach Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, Oct 06, 2020 at 08:00:03PM +1100, Stephen Rothwell wrote: > Hi all, > > On Thu, 10 Sep 2020 14:18:54 +1000 Stephen Rothwell wrote: > > > > Today's linux-next merge of the extcon tree got a conflict in: > > > > MAINTAINERS > > > > between commit: > > > > f61249dddecc ("MAINTAINERS: Add entry for i.MX 8MQ DCSS driver") > > > > from the drm-misc tree and commit: > > > > d0e3c25150dd ("MAINTAINERS: Add entry for NXP PTN5150A CC driver") > > > > from the extcon tree. > > > > I fixed it up (see below) and can carry the fix as necessary. This > > is now fixed as far as linux-next is concerned, but any non trivial > > conflicts should be mentioned to your upstream maintainer when your tree > > is submitted for merging. You may also want to consider cooperating > > with the maintainer of the conflicting tree to minimise any particularly > > complex conflicts. > > > > -- > > Cheers, > > Stephen Rothwell > > > > diff --cc MAINTAINERS > > index 623c53ab5bd5,da94c9b12f1b..000000000000 > > --- a/MAINTAINERS > > +++ b/MAINTAINERS > > @@@ -12496,14 -12430,13 +12496,21 @@@ F: drivers/iio/gyro/fxas21002c_core. > > F: drivers/iio/gyro/fxas21002c_i2c.c > > F: drivers/iio/gyro/fxas21002c_spi.c > > > > +NXP i.MX 8MQ DCSS DRIVER > > +M: Laurentiu Palcu > > +R: Lucas Stach > > +L: dri-devel@lists.freedesktop.org > > +S: Maintained > > +F: Documentation/devicetree/bindings/display/imx/nxp,imx8mq-dcss.yaml > > +F: drivers/gpu/drm/imx/dcss/ > > + > > + NXP PTN5150A CC LOGIC AND EXTCON DRIVER > > + M: Krzysztof Kozlowski > > + L: linux-kernel@vger.kernel.org > > + S: Maintained > > + F: Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml > > + F: drivers/extcon/extcon-ptn5150.c > > + > > NXP SGTL5000 DRIVER > > M: Fabio Estevam > > L: alsa-devel@alsa-project.org (moderated for non-subscribers) > > This is now a conflict between the char-misc tree and the drm tree. Looks fine, this should be easy for Linus to resolve :) thanks, greg k-h _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx