Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1493892
| From | Greg KH <greg@kroah.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the tty tree with the v4l-dvb tree |
| Date | 2016-09-30 08:00 +0200 |
| Message-ID | <smZ1v-6b5-3@gated-at.bofh.it> (permalink) |
| References | <smWQ1-4Ok-9@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
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
csiph-web