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>, ARM <linux-arm-kernel@lists.infradead.org> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>, Drew Fustini <drew@beagleboard.org>, Emil Renner Berthing <kernel@esmil.dk>, Huan Feng <huan.feng@starfivetech.com>, Kiran Kumar S <kiran.kumar1.s@intel.com>, Lakshmi Sowjanya D <lakshmi.sowjanya.d@intel.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org> Subject: linux-next: manual merge of the pinctrl tree with the arm-soc tree Date: Fri, 17 Dec 2021 17:29:31 +1100 [thread overview] Message-ID: <20211217172931.01c24d4b@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 2798 bytes --] Hi all, Today's linux-next merge of the pinctrl tree got conflicts in: drivers/pinctrl/Kconfig drivers/pinctrl/Makefile between commit: ec648f6b7686 ("pinctrl: starfive: Add pinctrl driver for StarFive SoCs") from the arm-soc tree and commits: 12422af8194d ("pinctrl: Add Intel Thunder Bay pinctrl driver") b124c8bd50c7 ("pinctrl: Sort Kconfig and Makefile entries alphabetically") 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. -- Cheers, Stephen Rothwell diff --cc drivers/pinctrl/Kconfig index 0d5b61e4c21e,c27c9ee89f0e..000000000000 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig diff --cc drivers/pinctrl/Makefile index f5bdd6b209a6,6be6c3fc6663..000000000000 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile @@@ -30,26 -39,16 +39,17 @@@ obj-$(CONFIG_PINCTRL_OXNAS) += pinctrl- obj-$(CONFIG_PINCTRL_PALMAS) += pinctrl-palmas.o obj-$(CONFIG_PINCTRL_PIC32) += pinctrl-pic32.o obj-$(CONFIG_PINCTRL_PISTACHIO) += pinctrl-pistachio.o + obj-$(CONFIG_PINCTRL_RK805) += pinctrl-rk805.o obj-$(CONFIG_PINCTRL_ROCKCHIP) += pinctrl-rockchip.o obj-$(CONFIG_PINCTRL_SINGLE) += pinctrl-single.o - obj-$(CONFIG_PINCTRL_SX150X) += pinctrl-sx150x.o - obj-$(CONFIG_ARCH_TEGRA) += tegra/ - obj-$(CONFIG_PINCTRL_XWAY) += pinctrl-xway.o - obj-$(CONFIG_PINCTRL_LANTIQ) += pinctrl-lantiq.o - obj-$(CONFIG_PINCTRL_LPC18XX) += pinctrl-lpc18xx.o - obj-$(CONFIG_PINCTRL_TB10X) += pinctrl-tb10x.o + obj-$(CONFIG_PINCTRL_STMFX) += pinctrl-stmfx.o obj-$(CONFIG_PINCTRL_ST) += pinctrl-st.o +obj-$(CONFIG_PINCTRL_STARFIVE) += pinctrl-starfive.o - obj-$(CONFIG_PINCTRL_STMFX) += pinctrl-stmfx.o - obj-$(CONFIG_PINCTRL_ZYNQ) += pinctrl-zynq.o + obj-$(CONFIG_PINCTRL_SX150X) += pinctrl-sx150x.o + obj-$(CONFIG_PINCTRL_TB10X) += pinctrl-tb10x.o + obj-$(CONFIG_PINCTRL_THUNDERBAY) += pinctrl-thunderbay.o obj-$(CONFIG_PINCTRL_ZYNQMP) += pinctrl-zynqmp.o - obj-$(CONFIG_PINCTRL_INGENIC) += pinctrl-ingenic.o - obj-$(CONFIG_PINCTRL_RK805) += pinctrl-rk805.o - obj-$(CONFIG_PINCTRL_OCELOT) += pinctrl-ocelot.o - obj-$(CONFIG_PINCTRL_MICROCHIP_SGPIO) += pinctrl-microchip-sgpio.o - obj-$(CONFIG_PINCTRL_EQUILIBRIUM) += pinctrl-equilibrium.o - obj-$(CONFIG_PINCTRL_K210) += pinctrl-k210.o - obj-$(CONFIG_PINCTRL_KEEMBAY) += pinctrl-keembay.o + obj-$(CONFIG_PINCTRL_ZYNQ) += pinctrl-zynq.o obj-y += actions/ obj-$(CONFIG_ARCH_ASPEED) += aspeed/ [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --]
WARNING: multiple messages have this Message-ID (diff)
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>, ARM <linux-arm-kernel@lists.infradead.org> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>, Drew Fustini <drew@beagleboard.org>, Emil Renner Berthing <kernel@esmil.dk>, Huan Feng <huan.feng@starfivetech.com>, Kiran Kumar S <kiran.kumar1.s@intel.com>, Lakshmi Sowjanya D <lakshmi.sowjanya.d@intel.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org> Subject: linux-next: manual merge of the pinctrl tree with the arm-soc tree Date: Fri, 17 Dec 2021 17:29:31 +1100 [thread overview] Message-ID: <20211217172931.01c24d4b@canb.auug.org.au> (raw) [-- Attachment #1.1: Type: text/plain, Size: 2798 bytes --] Hi all, Today's linux-next merge of the pinctrl tree got conflicts in: drivers/pinctrl/Kconfig drivers/pinctrl/Makefile between commit: ec648f6b7686 ("pinctrl: starfive: Add pinctrl driver for StarFive SoCs") from the arm-soc tree and commits: 12422af8194d ("pinctrl: Add Intel Thunder Bay pinctrl driver") b124c8bd50c7 ("pinctrl: Sort Kconfig and Makefile entries alphabetically") 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. -- Cheers, Stephen Rothwell diff --cc drivers/pinctrl/Kconfig index 0d5b61e4c21e,c27c9ee89f0e..000000000000 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig diff --cc drivers/pinctrl/Makefile index f5bdd6b209a6,6be6c3fc6663..000000000000 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile @@@ -30,26 -39,16 +39,17 @@@ obj-$(CONFIG_PINCTRL_OXNAS) += pinctrl- obj-$(CONFIG_PINCTRL_PALMAS) += pinctrl-palmas.o obj-$(CONFIG_PINCTRL_PIC32) += pinctrl-pic32.o obj-$(CONFIG_PINCTRL_PISTACHIO) += pinctrl-pistachio.o + obj-$(CONFIG_PINCTRL_RK805) += pinctrl-rk805.o obj-$(CONFIG_PINCTRL_ROCKCHIP) += pinctrl-rockchip.o obj-$(CONFIG_PINCTRL_SINGLE) += pinctrl-single.o - obj-$(CONFIG_PINCTRL_SX150X) += pinctrl-sx150x.o - obj-$(CONFIG_ARCH_TEGRA) += tegra/ - obj-$(CONFIG_PINCTRL_XWAY) += pinctrl-xway.o - obj-$(CONFIG_PINCTRL_LANTIQ) += pinctrl-lantiq.o - obj-$(CONFIG_PINCTRL_LPC18XX) += pinctrl-lpc18xx.o - obj-$(CONFIG_PINCTRL_TB10X) += pinctrl-tb10x.o + obj-$(CONFIG_PINCTRL_STMFX) += pinctrl-stmfx.o obj-$(CONFIG_PINCTRL_ST) += pinctrl-st.o +obj-$(CONFIG_PINCTRL_STARFIVE) += pinctrl-starfive.o - obj-$(CONFIG_PINCTRL_STMFX) += pinctrl-stmfx.o - obj-$(CONFIG_PINCTRL_ZYNQ) += pinctrl-zynq.o + obj-$(CONFIG_PINCTRL_SX150X) += pinctrl-sx150x.o + obj-$(CONFIG_PINCTRL_TB10X) += pinctrl-tb10x.o + obj-$(CONFIG_PINCTRL_THUNDERBAY) += pinctrl-thunderbay.o obj-$(CONFIG_PINCTRL_ZYNQMP) += pinctrl-zynqmp.o - obj-$(CONFIG_PINCTRL_INGENIC) += pinctrl-ingenic.o - obj-$(CONFIG_PINCTRL_RK805) += pinctrl-rk805.o - obj-$(CONFIG_PINCTRL_OCELOT) += pinctrl-ocelot.o - obj-$(CONFIG_PINCTRL_MICROCHIP_SGPIO) += pinctrl-microchip-sgpio.o - obj-$(CONFIG_PINCTRL_EQUILIBRIUM) += pinctrl-equilibrium.o - obj-$(CONFIG_PINCTRL_K210) += pinctrl-k210.o - obj-$(CONFIG_PINCTRL_KEEMBAY) += pinctrl-keembay.o + obj-$(CONFIG_PINCTRL_ZYNQ) += pinctrl-zynq.o obj-y += actions/ obj-$(CONFIG_ARCH_ASPEED) += aspeed/ [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 176 bytes --] _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2021-12-17 6:29 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-12-17 6:29 Stephen Rothwell [this message] 2021-12-17 6:29 ` linux-next: manual merge of the pinctrl tree with the arm-soc tree Stephen Rothwell 2021-12-17 8:02 ` Arnd Bergmann 2021-12-17 8:02 ` Arnd Bergmann 2021-12-17 11:02 ` Andy Shevchenko 2021-12-17 11:02 ` Andy Shevchenko -- strict thread matches above, loose matches on Subject: below -- 2022-12-06 1:13 Stephen Rothwell 2022-12-06 1:13 ` Stephen Rothwell 2022-12-06 15:04 ` Andy Shevchenko 2022-12-06 15:04 ` Andy Shevchenko 2022-11-18 5:06 Stephen Rothwell 2022-11-18 5:06 ` Stephen Rothwell 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=20211217172931.01c24d4b@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=andriy.shevchenko@linux.intel.com \ --cc=arnd@arndb.de \ --cc=drew@beagleboard.org \ --cc=huan.feng@starfivetech.com \ --cc=kernel@esmil.dk \ --cc=kiran.kumar1.s@intel.com \ --cc=lakshmi.sowjanya.d@intel.com \ --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=olof@lixom.net \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.