Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1493870 > unrolled thread

linux-next: manual merge of the tty tree with the v4l-dvb tree

Back to article view | Back to linux.kernel

Contents

  linux-next: manual merge of the tty tree with the v4l-dvb tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-09-30 05:40 +0200
    Re: linux-next: manual merge of the tty tree with the v4l-dvb tree Greg KH <greg@kroah.com> - 2016-09-30 08:00 +0200
    Re: linux-next: manual merge of the tty tree with the v4l-dvb tree Nicolas Ferre <nicolas.ferre@atmel.com> - 2016-09-30 09:10 +0200

#1493870 — linux-next: manual merge of the tty tree with the v4l-dvb tree

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

[toc] | [next] | [standalone]

#1493892

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

[toc] | [prev] | [next] | [standalone]

#1493921

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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web