From: "Arnd Bergmann" <arnd@arndb•de>
To: "Greg KH" <greg@kroah•com>, "Stephen Rothwell" <sfr@canb•auug.org.au>
Cc: "Ard Biesheuvel" <ardb@kernel•org>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
linux-next <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the tty tree with the asm-generic tree
Date: Mon, 23 Oct 2023 09:49:25 +0200 [thread overview]
Message-ID: <784903c2-cae8-497b-9d67-48428c203c83@app.fastmail.com> (raw)
In-Reply-To: <2023102350-gumminess-crease-db03@gregkh>
On Mon, Oct 23, 2023, at 09:28, Greg KH wrote:
> On Mon, Oct 23, 2023 at 02:43:27PM +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the tty tree got conflicts in:
>>
>> arch/ia64/kernel/setup.c
>> drivers/firmware/pcdp.c
>>
>> between commit:
>>
>> cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")
>>
>> from the asm-generic tree and commits:
>>
>> 8a736ddfc861 ("vgacon: rework screen_info #ifdef checks")
>> acfc78823326 ("vgacon: remove screen_info dependency")
>> 555624c0d10b ("vgacon: clean up global screen_info instances")
>>
>> from the tty tree.
>>
>> I fixed it up (I deleted the files) 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.
>
> Deleting the files are fine, thanks!
Agreed, I was aware of the conflict and considered dropping the
ia64 portion from the vgacon series, but it seemed cleaner to still
leave it in there with the trivial conflict after I had structured
it in a way that would not regress ia64 in the middle.
Arnd
next prev parent reply other threads:[~2023-10-23 7:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-23 3:43 linux-next: manual merge of the tty tree with the asm-generic tree Stephen Rothwell
2023-10-23 7:28 ` Greg KH
2023-10-23 7:49 ` Arnd Bergmann [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-03-15 6:36 Stephen Rothwell
2018-03-15 10:18 ` Greg KH
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=784903c2-cae8-497b-9d67-48428c203c83@app.fastmail.com \
--to=arnd@arndb$(echo .)de \
--cc=ardb@kernel$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/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