* linux-next: manual merge of the char-misc tree with the mmc tree
@ 2018-12-06 4:48 Stephen Rothwell
2018-12-06 5:42 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2018-12-06 4:48 UTC (permalink / raw)
To: Greg KH, Arnd Bergmann, Ulf Hansson
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Oleksij Rempel, Peng Hao
[-- Attachment #1: Type: text/plain, Size: 1209 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the char-misc tree with the mmc tree
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
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2018-12-06 5:42 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Arnd Bergmann, Ulf Hansson, Linux Next Mailing List,
Linux Kernel Mailing List, Oleksij Rempel, Peng Hao
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-12-06 5:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).