From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Kees Cook <keescook@chromium•org>, Greg KH <greg@kroah•com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
"Jiri Slaby (SUSE)" <jirislaby@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the kspp tree with the tty tree
Date: Fri, 27 Jan 2023 15:57:53 +1100 [thread overview]
Message-ID: <20230127155753.1f9b9517@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 749 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-01-27 4:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-27 4:57 Stephen Rothwell [this message]
2023-01-27 7:02 ` linux-next: manual merge of the kspp tree with the tty tree Greg KH
2023-01-27 7:12 ` Jiri Slaby
2023-01-27 7:21 ` Greg KH
2023-01-27 18:39 ` Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230127155753.1f9b9517@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=jirislaby@kernel$(echo .)org \
--cc=keescook@chromium$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox