linux-kernel - 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-next>] [day] [month] [year] [list]

Message-ID: <20230127155753.1f9b9517@canb.auug.org.au>
Date:   Fri, 27 Jan 2023 15:57:53 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Kees Cook <keescook@...omium.org>, Greg KH <greg@...ah.com>
Cc:     Greg Kroah-Hartman <gregkh@...uxfoundation.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: linux-next: manual merge of the kspp tree with the tty tree

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.

I fixed it up (the former removed the line changed by the latter) and
can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped