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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <82cfbb3e-cb2c-199c-8833-35498ce894e2@kernel.org>
Date:   Fri, 27 Jan 2023 08:12:46 +0100
From:   Jiri Slaby <jirislaby@...nel.org>
To:     Greg KH <greg@...ah.com>, Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Kees Cook <keescook@...omium.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 27. 01. 23, 8:02, Greg KH wrote:
> 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.

feb36abbedea removes the array completely, so obsoletes 19c30ead3938.

thanks,
-- 
js
suse labs