From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Arnd Bergmann <arnd@arndb•de>
Cc: Jens Axboe <axboe@kernel•dk>,
"Peter Zijlstra (Intel)" <peterz@infradead•org>,
Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@redhat•com>, "H. Peter Anvin" <hpa@zytor•com>,
Ard Biesheuvel <ardb@kernel•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 block tree with the asm-generic tree
Date: Wed, 1 Nov 2023 09:23:47 +1100 [thread overview]
Message-ID: <20231101092347.01bc2eec@canb.auug.org.au> (raw)
In-Reply-To: <20230925120908.4b15c44d@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 901 bytes --]
Hi all,
On Mon, 25 Sep 2023 12:09:08 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> On Mon, 25 Sep 2023 12:05:44 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > Today's linux-next merge of the block tree got a conflict in:
> >
> > arch/ia64/kernel/syscalls/syscall.tbl
> >
> > between commit:
> >
> > cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")
> >
> > from the asm-generic tree and commits:
> >
> > 9f6c532f59b2 ("futex: Add sys_futex_wake()")
> > cb8c4312afca ("futex: Add sys_futex_wait()")
> > 0f4b5f972216 ("futex: Add sys_futex_requeue()")
> >
> > from the block tree.
>
> These three commits are also in the tip tree.
>
> > I fixed it up (I just removed the file) and can carry the fix as
> > necessary.
This is now a conflict between the asm-generic tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-10-31 22:23 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-25 2:05 linux-next: manual merge of the block tree with the asm-generic tree Stephen Rothwell
2023-09-25 2:09 ` Stephen Rothwell
2023-10-31 22:23 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-09 1:31 Stephen Rothwell
2023-10-09 8:48 ` Peter Zijlstra
2023-10-09 9:00 ` Arnd Bergmann
2023-10-09 14:13 ` Peter Zijlstra
2023-10-09 14:16 ` Jens Axboe
2023-10-09 14:21 ` Arnd Bergmann
2023-10-11 16:21 ` Jens Axboe
2023-10-11 17:54 ` Peter Zijlstra
2023-10-11 21:32 ` Ingo Molnar
2023-10-11 21:42 ` Jens Axboe
2023-10-11 22:01 ` Ingo Molnar
2023-10-16 11:53 ` Ingo Molnar
2023-10-17 1:12 ` Stephen Rothwell
2023-10-09 9:33 ` Stephen Rothwell
2023-10-31 22:21 ` 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=20231101092347.01bc2eec@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ardb@kernel$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--cc=axboe@kernel$(echo .)dk \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@redhat$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/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