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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20160930054416.GA5458@kroah.com>
Date:   Fri, 30 Sep 2016 07:44:16 +0200
From:   Greg KH <greg@...ah.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Mauro Carvalho Chehab <mchehab@....samsung.com>,
        linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        Songjun Wu <songjun.wu@...rochip.com>,
        Nicolas Ferre <nicolas.ferre@...el.com>
Subject: Re: linux-next: manual merge of the tty tree with the v4l-dvb tree

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