From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Ard Biesheuvel <ardb@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
"Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
Subject: Re: linux-next: manual merge of the tip tree with the asm-generic tree
Date: Mon, 16 Oct 2023 09:15:24 +1100 [thread overview]
Message-ID: <20231016091524.1c1cb83d@canb.auug.org.au> (raw)
In-Reply-To: <20231012134442.16f3f9f6@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 983 bytes --]
Hi all,
On Thu, 12 Oct 2023 13:44:42 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/ia64/include/asm/cpu.h
> arch/ia64/kernel/topology.c
>
> between commit:
>
> cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")
>
> from the asm-generic tree and commit:
>
> c4dd854f740c ("cpu-hotplug: Provide prototypes for arch CPU registration")
>
> from the tip 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.
This is now a conflict between Linus' tree and the asm-generic tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-10-15 22:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-12 2:44 linux-next: manual merge of the tip tree with the asm-generic tree Stephen Rothwell
2023-10-15 22:15 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-08-16 1:47 Stephen Rothwell
2021-09-01 3:20 ` Stephen Rothwell
2019-04-24 5:10 Stephen Rothwell
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=20231016091524.1c1cb83d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=ardb@kernel.org \
--cc=arnd@arndb.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=rmk+kernel@armlinux.org.uk \
--cc=tglx@linutronix.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).