From: Jiri Slaby <jirislaby@kernel.org>
To: Greg KH <greg@kroah.com>, Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Kees Cook <keescook@chromium.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the kspp tree with the tty tree
Date: Fri, 27 Jan 2023 08:12:46 +0100 [thread overview]
Message-ID: <82cfbb3e-cb2c-199c-8833-35498ce894e2@kernel.org> (raw)
In-Reply-To: <Y9N3GNBKzOKuSOMJ@kroah.com>
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
next prev parent reply other threads:[~2023-01-27 7:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-27 4:57 linux-next: manual merge of the kspp tree with the tty tree Stephen Rothwell
2023-01-27 7:02 ` Greg KH
2023-01-27 7:12 ` Jiri Slaby [this message]
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=82cfbb3e-cb2c-199c-8833-35498ce894e2@kernel.org \
--to=jirislaby@kernel.org \
--cc=greg@kroah.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.