From: Stephen Rothwell <sfr@canb.auug.org.au> To: Peter Rosin <peda@axentia.se>, Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>, ARM <linux-arm-kernel@lists.infradead.org> Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Jens Wiklander <jens.wiklander@linaro.org> Subject: linux-next: manual merge of the mux tree with the arm-soc tree Date: Fri, 31 Mar 2017 15:18:36 +1100 [thread overview] Message-ID: <20170331151836.5d89c03a@canb.auug.org.au> (raw) Hi all, Today's linux-next merge of the mux tree got conflicts in: drivers/Kconfig drivers/Makefile between commit: 967c9cca2cc5 ("tee: generic TEE subsystem") from the arm-soc tree and commit: 1fc1dd988186 ("mux: minimal mux subsystem and gpio-based mux controller") from the mux 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/Kconfig index ba2901e76769,a7ea13e1b869..000000000000 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@@ -204,6 -204,6 +204,8 @@@ source "drivers/fpga/Kconfig source "drivers/fsi/Kconfig" + source "drivers/mux/Kconfig" + +source "drivers/tee/Kconfig" + endmenu diff --cc drivers/Makefile index 5db9aa6beeaf,c0436f6dd5a9..000000000000 --- a/drivers/Makefile +++ b/drivers/Makefile @@@ -177,4 -177,4 +177,5 @@@ obj-$(CONFIG_ANDROID) += android obj-$(CONFIG_NVMEM) += nvmem/ obj-$(CONFIG_FPGA) += fpga/ obj-$(CONFIG_FSI) += fsi/ + obj-$(CONFIG_MULTIPLEXER) += mux/ +obj-$(CONFIG_TEE) += tee/
WARNING: multiple messages have this Message-ID (diff)
From: sfr@canb.auug.org.au (Stephen Rothwell) To: linux-arm-kernel@lists.infradead.org Subject: linux-next: manual merge of the mux tree with the arm-soc tree Date: Fri, 31 Mar 2017 15:18:36 +1100 [thread overview] Message-ID: <20170331151836.5d89c03a@canb.auug.org.au> (raw) Hi all, Today's linux-next merge of the mux tree got conflicts in: drivers/Kconfig drivers/Makefile between commit: 967c9cca2cc5 ("tee: generic TEE subsystem") from the arm-soc tree and commit: 1fc1dd988186 ("mux: minimal mux subsystem and gpio-based mux controller") from the mux 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/Kconfig index ba2901e76769,a7ea13e1b869..000000000000 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@@ -204,6 -204,6 +204,8 @@@ source "drivers/fpga/Kconfig source "drivers/fsi/Kconfig" + source "drivers/mux/Kconfig" + +source "drivers/tee/Kconfig" + endmenu diff --cc drivers/Makefile index 5db9aa6beeaf,c0436f6dd5a9..000000000000 --- a/drivers/Makefile +++ b/drivers/Makefile @@@ -177,4 -177,4 +177,5 @@@ obj-$(CONFIG_ANDROID) += android obj-$(CONFIG_NVMEM) += nvmem/ obj-$(CONFIG_FPGA) += fpga/ obj-$(CONFIG_FSI) += fsi/ + obj-$(CONFIG_MULTIPLEXER) += mux/ +obj-$(CONFIG_TEE) += tee/
next reply other threads:[~2017-03-31 4:18 UTC|newest] Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-31 4:18 Stephen Rothwell [this message] 2017-03-31 4:18 ` linux-next: manual merge of the mux tree with the arm-soc tree 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=20170331151836.5d89c03a@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=arnd@arndb.de \ --cc=jens.wiklander@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 \ --cc=peda@axentia.se \ /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.