linux-kernel - Re: linux-next: manual merge of the kspp 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 for Android: free password hash cracker in your pocket

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

Message-ID: <Y9N3GNBKzOKuSOMJ@kroah.com>
Date:   Fri, 27 Jan 2023 08:02:48 +0100
From:   Greg KH <greg@...ah.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Kees Cook <keescook@...omium.org>,
        "Jiri Slaby (SUSE)" <jirislaby@...nel.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 kspp tree with the tty tree

On Fri, Jan 27, 2023 at 03:57:53PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the kspp tree got a conflict in:
> 
>   drivers/tty/vt/vt.c
> 
> between commit:
> 
>   feb36abbedea ("tty: vt: remove struct uni_screen")
> 
> from the tty tree and commit:
> 
>   19c30ead3938 ("vt: Replace 0-length array with flexible array")
> 
> from the kspp tree.

Kees, I was waiting for a new version of your 0-length patch before
applying it as I thought there were review comments on it.  So you
should probably drop it from your tree or resend it so I can merge it
into the tty tree if it's acceptable.

thanks,

greg k-h