Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1633539 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2017-05-01 06:20 +0200 |
| Last post | 2017-05-05 01:50 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the staging tree with the usb tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-05-01 06:20 +0200
Re: linux-next: manual merge of the staging tree with the usb tree Greg KH <greg@kroah.com> - 2017-05-05 01:50 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2017-05-01 06:20 +0200 |
| Subject | linux-next: manual merge of the staging tree with the usb tree |
| Message-ID | <tCaYx-4bP-1@gated-at.bofh.it> |
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/Makefile
between commit:
f0690a25a140 ("staging: typec: USB Type-C Port Manager (tcpm)")
from the usb tree and commit:
051420a997a5 ("staging: bcm2835-audio: Move driver under vc04_services")
abefd6741d54 ("staging: ccree: introduce CryptoCell HW driver")
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/staging/Makefile
index 682127c20da5,422fae4ea0f3..000000000000
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -41,4 -42,5 +43,4 @@@ obj-$(CONFIG_MOST) += most
obj-$(CONFIG_KS7010) += ks7010/
obj-$(CONFIG_GREYBUS) += greybus/
obj-$(CONFIG_BCM2835_VCHIQ) += vc04_services/
- obj-$(CONFIG_SND_BCM2835) += bcm2835-audio/
+ obj-$(CONFIG_CRYPTO_DEV_CCREE) += ccree/
-
[toc] | [next] | [standalone]
| From | Greg KH <greg@kroah.com> |
|---|---|
| Date | 2017-05-05 01:50 +0200 |
| Message-ID | <tDyFr-1UA-11@gated-at.bofh.it> |
| In reply to | #1633539 |
On Mon, May 01, 2017 at 02:09:49PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/Makefile
>
> between commit:
>
> f0690a25a140 ("staging: typec: USB Type-C Port Manager (tcpm)")
>
> from the usb tree and commit:
>
> 051420a997a5 ("staging: bcm2835-audio: Move driver under vc04_services")
> abefd6741d54 ("staging: ccree: introduce CryptoCell HW driver")
>
> 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.
I'm the maintainer of both :)
Anyway, I knew this was going to happen, I'll take your fix when the
merge happens, thanks.
greg k-h
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web