From patchwork Tue May 30 04:19:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13259185 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 C73E9C7EE23 for ; Tue, 30 May 2023 04:20:11 +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-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=kJYJlvTzrWQbQn9OfMFb9Li7EbpWTmi6vNSJawTCQpE=; b=oPQ +0q1BHUhUgyDXtTqGDDRjH1OlVS7VKfdDu+2Mq9FSTPrLQH80Ng1COXYiX2cD3aTFodw/H1N0Vcdj vyeAo7kkVibB3YmkYj0nezbVwqpbfWPUsfJK7MLwFrQMna2uhJZDlkt/THAoi5tLyxEflzha81eTr U3VnhxJw5LpICquJxqBbNXKKTmv7fTFjM0ij2Gnh7JJ0+vEuDWphmkgoukHJpPGF4w10Nu+GRVZWB Jc4YZ7d3bvHFHh5K46vNdtIVirrqlen2R9vwIJeoLJk/+wpYflRiyHfpRxtPiRbl0XYslxHGkkn2W 1bYv0Jhfj+iRe+7Wml5ngdUlNHRkzCw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q3qpl-00CMfg-0n; Tue, 30 May 2023 04:19:45 +0000 Received: from mail.ozlabs.org ([2404:9400:2221:ea00::3] helo=gandalf.ozlabs.org) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q3qpi-00CMdG-1f for linux-arm-kernel@lists.infradead.org; Tue, 30 May 2023 04:19:44 +0000 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4QVfKw1znBz4x1f; Tue, 30 May 2023 14:19:16 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1685420358; bh=IgPFSWN81Jg+HN5A3WReGjNgtUf7bYaVyzuBPljjy44=; h=Date:From:To:Cc:Subject:From; b=s+q4HRV6NN72WOgKgYWC90pj89yF6JZMkGlK0W1VfDaXw9ovUwOXxfquF3+remO16 5+ISrGJMw6FUisv6Uo5BHR6YVKqzVrYcV+s0/puwwWU3TDRKCsHHBVgHohfoY9LCjp W+bHj1Ab9Gr08KrThcbIHnPr8zwD2STjyd/ND3UZvbHpo8cA7nrUvlMI5PDmQXyxdU 7VqZG6fnvWeOnN7H71jBP0ez1G27Ic4mh6CU344VXFFHxeCipdOWPCJTVqUFbKINTO 4323wmhdh0dKPd9RapX6xEhUraNmqFNOg/k9g3DhI3tyXR9jtr5XApUUotqNFP12gp iropQiUKqLP6g== Date: Tue, 30 May 2023 14:19:14 +1000 From: Stephen Rothwell To: Bartosz Golaszewski , Olof Johansson , Arnd Bergmann Cc: ARM , Andrew Davis , Bartosz Golaszewski , Linus Walleij , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the gpio-brgl tree with the arm-soc tree Message-ID: <20230530141914.672a8e59@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230529_211943_002372_D20BB294 X-CRM114-Status: GOOD ( 21.66 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi all, Today's linux-next merge of the gpio-brgl tree got a conflict in: drivers/gpio/gpio-twl4030.c between commit: d5f4fa60d63a ("ARM/gpio: Push OMAP2 quirk down into TWL4030 driver") from the arm-soc tree and commit: fbc8ab2ccd85 ("gpio: twl4030: Use devm_gpiochip_add_data() to simplify remove path") from the gpio-brgl 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. diff --cc drivers/gpio/gpio-twl4030.c index 446599ac234a,3708ed2314e8..000000000000 --- a/drivers/gpio/gpio-twl4030.c