* linux-next: manual merge of the tty tree with the v4l-dvb tree
@ 2016-09-30 3:33 Stephen Rothwell
2016-09-30 5:44 ` Greg KH
2016-09-30 7:09 ` Nicolas Ferre
0 siblings, 2 replies; 3+ messages in thread
From: Stephen Rothwell @ 2016-09-30 3:33 UTC (permalink / raw)
To: Greg KH, Mauro Carvalho Chehab
Cc: linux-next, linux-kernel, Songjun Wu, Nicolas Ferre
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in:
MAINTAINERS
between commit:
71fb2c74287d ("[media] MAINTAINERS: atmel-isc: add entry for Atmel ISC")
from the v4l-dvb tree and commit:
5615c3715749 ("MAINTAINERS: update entry for atmel_serial driver")
from the tty 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 MAINTAINERS
index 8c86c07409c8,4e2ae17c478e..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -7848,14 -7745,12 +7843,20 @@@ T: git git://git.monstr.eu/linux-2.6-mi
S: Supported
F: arch/microblaze/
+ MICROCHIP / ATMEL AT91 / AT32 SERIAL DRIVER
+ M: Richard Genoud <richard.genoud@gmail.com>
+ S: Maintained
+ F: drivers/tty/serial/atmel_serial.c
+ F: include/linux/atmel_serial.h
+
+MICROCHIP / ATMEL ISC DRIVER
+M: Songjun Wu <songjun.wu@microchip.com>
+L: linux-media@vger.kernel.org
+S: Supported
+F: drivers/media/platform/atmel/atmel-isc.c
+F: drivers/media/platform/atmel/atmel-isc-regs.h
+F: devicetree/bindings/media/atmel-isc.txt
+
MICROSOFT SURFACE PRO 3 BUTTON DRIVER
M: Chen Yu <yu.c.chen@intel.com>
L: platform-driver-x86@vger.kernel.org
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the tty tree with the v4l-dvb tree
2016-09-30 3:33 linux-next: manual merge of the tty tree with the v4l-dvb tree Stephen Rothwell
@ 2016-09-30 5:44 ` Greg KH
2016-09-30 7:09 ` Nicolas Ferre
1 sibling, 0 replies; 3+ messages in thread
From: Greg KH @ 2016-09-30 5:44 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mauro Carvalho Chehab, linux-next, linux-kernel, Songjun Wu,
Nicolas Ferre
On Fri, Sep 30, 2016 at 01:33:19PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> 71fb2c74287d ("[media] MAINTAINERS: atmel-isc: add entry for Atmel ISC")
>
> from the v4l-dvb tree and commit:
>
> 5615c3715749 ("MAINTAINERS: update entry for atmel_serial driver")
>
> from the tty tree.
Ick, MAINTAINERS is a tough thing to merge at times, sorry, patch looks
fine to me.
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the tty tree with the v4l-dvb tree
2016-09-30 3:33 linux-next: manual merge of the tty tree with the v4l-dvb tree Stephen Rothwell
2016-09-30 5:44 ` Greg KH
@ 2016-09-30 7:09 ` Nicolas Ferre
1 sibling, 0 replies; 3+ messages in thread
From: Nicolas Ferre @ 2016-09-30 7:09 UTC (permalink / raw)
To: Stephen Rothwell, Greg KH, Mauro Carvalho Chehab
Cc: linux-next, linux-kernel, Songjun Wu
Le 30/09/2016 à 05:33, Stephen Rothwell a écrit :
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> 71fb2c74287d ("[media] MAINTAINERS: atmel-isc: add entry for Atmel ISC")
>
> from the v4l-dvb tree and commit:
>
> 5615c3715749 ("MAINTAINERS: update entry for atmel_serial driver")
>
> from the tty 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.
Both changes are merged well. Thanks Stephen,
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-09-30 7:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-30 3:33 linux-next: manual merge of the tty tree with the v4l-dvb tree Stephen Rothwell
2016-09-30 5:44 ` Greg KH
2016-09-30 7:09 ` Nicolas Ferre
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).