Messages in this thread | | | Subject | Re: linux-next: manual merge of the tty tree with the v4l-dvb tree | From | Nicolas Ferre <> | Date | Fri, 30 Sep 2016 09:09:34 +0200 |
| |
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
| |