From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Arnd Bergmann" <arnd@arndb.de>,
"Linux-Next Mailing List" <linux-next@vger.kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Sagar Dharia" <sdharia@codeaurora.org>,
"Srinivas Kandagatla" <srinivas.kandagatla@linaro.org>,
"David Kershner" <david.kershner@unisys.com>
Subject: Re: linux-next: manual merge of the staging tree with the char-misc-next tree
Date: Wed, 20 Dec 2017 09:55:57 +0100 [thread overview]
Message-ID: <20171220085557.GA25945@kroah.com> (raw)
In-Reply-To: <20171220133249.37100a10@canb.auug.org.au>
On Wed, Dec 20, 2017 at 01:32:49PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got conflicts in:
>
> drivers/Kconfig
> drivers/Makefile
>
> between commits:
>
> bbecb07fa0af ("siox: new driver framework for eckelmann SIOX")
> 3648e78ec701 ("slimbus: Add SLIMbus bus type")
>
> from the char-misc-next tree and commit:
>
> 93d3ad90c2d4 ("drivers: visorbus: move driver out of staging")
>
> from the staging 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 02b6fd0864c8,ef5fb8395d76..000000000000
> --- a/drivers/Kconfig
> +++ b/drivers/Kconfig
> @@@ -213,8 -211,6 +213,10 @@@ source "drivers/mux/Kconfig
>
> source "drivers/opp/Kconfig"
>
> +source "drivers/siox/Kconfig"
> +
> +source "drivers/slimbus/Kconfig"
> +
> + source "drivers/visorbus/Kconfig"
> +
> endmenu
> diff --cc drivers/Makefile
> index e09663776d8b,7a2330077e47..000000000000
> --- a/drivers/Makefile
> +++ b/drivers/Makefile
> @@@ -186,4 -184,4 +186,5 @@@ obj-$(CONFIG_FPGA) += fpga
> obj-$(CONFIG_FSI) += fsi/
> obj-$(CONFIG_TEE) += tee/
> obj-$(CONFIG_MULTIPLEXER) += mux/
> +obj-$(CONFIG_SIOX) += siox/
> + obj-$(CONFIG_UNISYS_VISORBUS) += visorbus/
Looks good! Sorry for the conflict, I knew it was going to happen :(
greg k-h
next prev parent reply other threads:[~2017-12-20 8:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-20 2:32 linux-next: manual merge of the staging tree with the char-misc-next tree Stephen Rothwell
2017-12-20 8:55 ` Greg KH [this message]
2017-12-20 10:14 ` 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=20171220085557.GA25945@kroah.com \
--to=greg@kroah.com \
--cc=arnd@arndb.de \
--cc=david.kershner@unisys.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sdharia@codeaurora.org \
--cc=sfr@canb.auug.org.au \
--cc=srinivas.kandagatla@linaro.org \
--cc=u.kleine-koenig@pengutronix.de \
/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 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.