From patchwork Thu Sep 12 07:55:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13801669 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 D66AAEE645B for ; Thu, 12 Sep 2024 07:56:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: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=zjHxZVqZOWcrDP7grFwYDsOpfB2qzj9ymqd2+By9LYM=; b=kLSKLvmbUAl8ye2NiKDo3ueB/D sZsGLvJcl6Q6cX2tRyPqqu7ueuXH1m2ukhrcbhE2KeBrea0q4zhqe2fAetWTOBGDzmpA1MZWGww3G AwvgiQOuSVhLYkMJLVm5D+K32DV4i9PuM3kjydbm8lb1rw4hc7pWl9u+7Os2EymqGbyaAML8ItIoT K7G3gX+eXL3IZeTbieNnH/MYlxa05A0XJ02e2de0pUe6jYEM04GBqBpKkWuoaDlNPvkLFwkNyB7tz L1rcSgFUjgMLhBDP6P1HCF7KzXgH6jFDiBPRZZN2pyJyZ+UVp3Oh0ZLva/6i1K7y5EWnzX9ZJOqsu wyiuRkRg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1soegb-0000000CGl2-47fc; Thu, 12 Sep 2024 07:56:17 +0000 Received: from gandalf.ozlabs.org ([150.107.74.76] helo=mail.ozlabs.org) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1soefQ-0000000CGPB-0nIm for linux-arm-kernel@lists.infradead.org; Thu, 12 Sep 2024 07:55:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1726127702; bh=zjHxZVqZOWcrDP7grFwYDsOpfB2qzj9ymqd2+By9LYM=; h=Date:From:To:Cc:Subject:From; b=EqcnRPnwQtXzM2GNxRAMHnrmlVeTU7KwD//eBGbmLFc3+mXOqr1q5Z6lx80T6RJNG LGAMYecahAo/EWB4XuC/QfvFXP7LzhDnB2bMb/ipe0ngDWlvwNYuh0MdONRAsaJwFV Omqg4mq5fF1T/JlmUYd2K2tIQQN/36LVZdqyk1Aik51t4ASLPBjbb180gRwBzdUqvB MHETTrOZ+U69lSpxlMcrHOcbfdiSLJd8GjlVnUu5cKG43NkhHMY8BXjzc2zbJLbApR FXHYLgrQyEFMRfK6nvm0soWZ6Z+UjFjD9UIgh8sR93jB0BBsnP+3OVKqBsbyK4/QLD Jl4FIBcmfeHaA== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4X48qV1yjxz4x0K; Thu, 12 Sep 2024 17:55:02 +1000 (AEST) Date: Thu, 12 Sep 2024 17:55:01 +1000 From: Stephen Rothwell To: Linus Walleij , Olof Johansson , Arnd Bergmann Cc: ARM , Alexander Sverdlin , Linux Kernel Mailing List , Linux Next Mailing List , Nikita Shubin , =?utf-8?b?VGjDqW8=?= Lebrun Subject: linux-next: manual merge of the pinctrl tree with the arm-soc tree Message-ID: <20240912175501.02f057f1@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240912_005504_422094_060C88D5 X-CRM114-Status: GOOD ( 16.19 ) 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 pinctrl tree got a conflict in: drivers/pinctrl/Makefile between commit: d1661439f5a3 ("pinctrl: add a Cirrus ep93xx SoC pin controller") from the arm-soc tree and commit: 41795aa1f56a ("pinctrl: eyeq5: add platform driver") from the pinctrl tree. I fixed it up (see below - I also sorted the entries) 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/pinctrl/Makefile index f28602d95424,3c2355150961..000000000000 --- a/drivers/pinctrl/Makefile