linux-kernel - Re: linux-next: manual merge of the char-misc tree with the tty 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]

Date:   Fri, 29 Jan 2021 08:34:14 +0100
From:   Greg KH <greg@...ah.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Arnd Bergmann <arnd@...db.de>,
        Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
        Linus Torvalds <torvalds@...ux-foundation.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the char-misc tree with the tty tree

On Fri, Jan 29, 2021 at 03:53:41PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got conflicts in:
> 
>   drivers/tty/n_tracerouter.c
>   drivers/tty/n_tracesink.c
> 
> between commit:
> 
>   3b830a9c34d5 ("tty: convert tty_ldisc_ops 'read()' function to take a kernel pointer")
> 
> from the tty tree and commit:
> 
>   8ba59e9dee31 ("misc: pti: Remove driver for deprecated platform")
> 
> from the char-misc tree.

Thanks, I knew this would happen :(