mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Linus Walleij <linus.walleij@linaro.org>,
	Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>
Cc: ARM <linux-arm-kernel@lists.infradead.org>,
	"Alexander Sverdlin" <alexander.sverdlin@gmail.com>,
	"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
	"Linux Next Mailing List" <linux-next@vger.kernel.org>,
	"Nikita Shubin" <nikita.shubin@maquefel.me>,
	"Théo Lebrun" <theo.lebrun@bootlin.com>
Subject: linux-next: manual merge of the pinctrl tree with the arm-soc tree
Date: Thu, 12 Sep 2024 17:55:01 +1000	[thread overview]
Message-ID: <20240912175501.02f057f1@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1525 bytes --]

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/pinctrl/Makefile
index f28602d95424,3c2355150961..000000000000
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@@ -22,8 -22,8 +22,9 @@@ obj-$(CONFIG_PINCTRL_CY8C95X0)	+= pinct
  obj-$(CONFIG_PINCTRL_DA850_PUPD) += pinctrl-da850-pupd.o
  obj-$(CONFIG_PINCTRL_DA9062)	+= pinctrl-da9062.o
  obj-$(CONFIG_PINCTRL_DIGICOLOR)	+= pinctrl-digicolor.o
- obj-$(CONFIG_PINCTRL_EQUILIBRIUM)   += pinctrl-equilibrium.o
 +obj-$(CONFIG_PINCTRL_EP93XX)	+= pinctrl-ep93xx.o
+ obj-$(CONFIG_PINCTRL_EQUILIBRIUM)   += pinctrl-equilibrium.o
+ obj-$(CONFIG_PINCTRL_EYEQ5)	+= pinctrl-eyeq5.o
  obj-$(CONFIG_PINCTRL_GEMINI)	+= pinctrl-gemini.o
  obj-$(CONFIG_PINCTRL_INGENIC)	+= pinctrl-ingenic.o
  obj-$(CONFIG_PINCTRL_K210)	+= pinctrl-k210.o

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2024-09-12  7:55 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-12  7:55 Stephen Rothwell [this message]
2024-09-12 12:10 ` Arnd Bergmann
  -- strict thread matches above, loose matches on Subject: below --
2022-12-06  1:13 Stephen Rothwell
2022-12-06 15:04 ` Andy Shevchenko
2022-11-18  5:06 Stephen Rothwell
2021-12-17  6:29 Stephen Rothwell
2021-12-17  8:02 ` Arnd Bergmann
2021-12-17 11:02 ` Andy Shevchenko
2017-01-31  5:29 Stephen Rothwell
2014-11-10  6:34 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240912175501.02f057f1@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=alexander.sverdlin@gmail.com \
    --cc=arnd@arndb.de \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=nikita.shubin@maquefel.me \
    --cc=olof@lixom.net \
    --cc=theo.lebrun@bootlin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®