From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>,
Ulf Hansson <ulf.hansson@linaro.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Oleksij Rempel <linux@rempel-privat.de>,
Peng Hao <peng.hao2@zte.com.cn>
Subject: Re: linux-next: manual merge of the char-misc tree with the mmc tree
Date: Thu, 6 Dec 2018 06:42:24 +0100 [thread overview]
Message-ID: <20181206054224.GA12239@kroah.com> (raw)
In-Reply-To: <20181206154800.760ff17a@canb.auug.org.au>
On Thu, Dec 06, 2018 at 03:48:00PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in:
>
> drivers/misc/Makefile
>
> between commit:
>
> 4eb78924bf0e ("misc: cardreader: add new Alcor Micro Cardreader PCI driver")
>
> from the mmc tree and commit:
>
> fcb418cd567f ("pvpanic: move pvpanic to misc as common driver")
>
> from the char-misc 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/misc/Makefile
> index fe3134cf3008,b76d611c87de..000000000000
> --- a/drivers/misc/Makefile
> +++ b/drivers/misc/Makefile
> @@@ -57,4 -57,5 +57,5 @@@ obj-$(CONFIG_ASPEED_LPC_CTRL) += aspeed
> obj-$(CONFIG_ASPEED_LPC_SNOOP) += aspeed-lpc-snoop.o
> obj-$(CONFIG_PCI_ENDPOINT_TEST) += pci_endpoint_test.o
> obj-$(CONFIG_OCXL) += ocxl/
> -obj-$(CONFIG_MISC_RTSX) += cardreader/
> +obj-y += cardreader/
> + obj-$(CONFIG_PVPANIC) += pvpanic.o
Looks good to me, thanks!
greg k-h
prev parent reply other threads:[~2018-12-06 5:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-06 4:48 linux-next: manual merge of the char-misc tree with the mmc tree Stephen Rothwell
2018-12-06 5:42 ` Greg KH [this message]
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=20181206054224.GA12239@kroah.com \
--to=greg@kroah.com \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@rempel-privat.de \
--cc=peng.hao2@zte.com.cn \
--cc=sfr@canb.auug.org.au \
--cc=ulf.hansson@linaro.org \
/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.