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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6B323C352A1 for ; Tue, 6 Dec 2022 15:24:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=AF38RP23iik8UzWy09s7DEoUxiHrxtCAnqXlUDLxqFg=; b=LR6fQsYmIbv7Gx p93wjnMmuDMIUW/aHrLFw8fWrBqTaGjmIi5a+0SQxNoxCLpacSQ7+y5YMMs2Wm2ahwJ0NmhzpZ6zc LEKcn0dlbBPGMaX0XZSqWVCcGlgfysX+t9l+B9ObcRdByJs8iOqMVaL3qM47+nmW5R1PzlJghbCu0 QuQFdHvCLRL19MjHdPCC9+lr7YIYyjgiZONP28eMK6GKfJX31NBbAHEgv+tfOKVPB6jXpcNPshHR6 zfw6Ldbs3w3nSTKlJQSy2NOr9/7M7AWQH3QsgxtgPR4u9/evwaPHkdfrnNGEsBFhLNOVKH5hMPNUS wrgFbTSaS0pURvDo9I8w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p2ZlJ-00CG06-NS; Tue, 06 Dec 2022 15:21:38 +0000 Received: from mga05.intel.com ([192.55.52.43]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1p2ZVH-00BySw-VX for linux-arm-kernel@lists.infradead.org; Tue, 06 Dec 2022 15:05:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670339103; x=1701875103; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=4gaANcgDLtpQVPsnEy3VGI5ie3X6MSAD+xjymeHx3S0=; b=eoLhFsZEZ5xZeUOxL8oLOod6wYszQG9ObT6SS4FslADMytjWlLznHZ3g SNoKWxfUfpG+b3+NZ2nUhfLnGE01kqLoosdbosBIjkqZtNtnI3IeccrIC YbQLZmiBLtH9GqSx6WRIcQQKGfxWpGViSpGPYedAUDWj55rKhZtgl46ta 6Xs5P4bOou4DmokRJoMyENLMGghbUwNdGhd/WCH6kX81sNIF+IOrrlcz+ WcA9boz0EvyYzOQ53BchCXrJuRrvoNQshospOKjebajPKn6OR0NnGJxDw AE0fHmIpxc9fGq0nqs0UDYzow4IVpDeks0thfn8izsakG8SCMi3n5mxQ9 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10553"; a="402918535" X-IronPort-AV: E=Sophos;i="5.96,222,1665471600"; d="scan'208";a="402918535" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Dec 2022 07:04:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10553"; a="677002574" X-IronPort-AV: E=Sophos;i="5.96,222,1665471600"; d="scan'208";a="677002574" Received: from smile.fi.intel.com ([10.237.72.54]) by orsmga008.jf.intel.com with ESMTP; 06 Dec 2022 07:04:45 -0800 Received: from andy by smile.fi.intel.com with local (Exim 4.96) (envelope-from ) id 1p2ZUy-005M2F-0T; Tue, 06 Dec 2022 17:04:44 +0200 Date: Tue, 6 Dec 2022 17:04:43 +0200 From: Andy Shevchenko To: Stephen Rothwell Cc: Linus Walleij , Olof Johansson , Arnd Bergmann , ARM , Dmitry Torokhov , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the pinctrl tree with the arm-soc tree Message-ID: References: <20221206121336.474457bb@canb.auug.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20221206121336.474457bb@canb.auug.org.au> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221206_070504_097932_C70CF7F0 X-CRM114-Status: GOOD ( 18.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Dec 06, 2022 at 12:13:36PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the pinctrl tree got a conflict in: > > drivers/soc/fsl/qe/gpio.c > > between commits: > > 84582f9ed090 ("soc: fsl: qe: Avoid using gpio_to_desc()") > 66310b5a0fc1 ("soc: fsl: qe: request pins non-exclusively") > > from the arm-soc tree and commit: > > c9eb6e546a23 ("soc: fsl: qe: Switch to use fwnode instead of of_node") > > from the pinctrl 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. That's correct fix in my opinion. Thank you! How to avoid conflict and why it's there I have explained here: https://lore.kernel.org/linux-arm-kernel/Y43ij5rwNLOaztch@smile.fi.intel.com/ -- With Best Regards, Andy Shevchenko _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel