From: Ingo Molnar <mingo@kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Peter Zijlstra <peterz@infradead.org>,
Arnd Bergmann <arnd@arndb.de>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
linux-next <linux-next@vger.kernel.org>,
Sohil Mehta <sohil.mehta@intel.com>
Subject: Re: linux-next: manual merge of the block tree with the asm-generic tree
Date: Thu, 12 Oct 2023 00:01:13 +0200 [thread overview]
Message-ID: <ZScbKPQur2qao5Gf@gmail.com> (raw)
In-Reply-To: <bf5ecd2d-06a7-4c51-a762-6fe3753044b6@kernel.dk>
* Jens Axboe <axboe@kernel.dk> wrote:
> >>> Peter, what's the verdict - do you want to rebase it, or leave it
> >>> as-is?
> >>
> >> Ah, I looked into doing this, but tip/locking/core has since grown a
> >> bunch of patches and has a merge commit -- I talked to Ingo yesterday
> >> and he proposed just queueing a fix on top instead of doing a full
> >> rebase.
> >>
> >> Ingo, that still your preferred solution?
> >
> > Yeah, that would be the best solution IMO - it's not like there's any
> > real prospect of someone bisecting futex2 patch-enablement commits on
> > Alpha ... and the bisection distance isn't particularly large either in
> > any case.
>
> OK, works for me. I'll keep my branch as-is, and just ensure it gets sent
> out after locking/core has been pulled by Linus.
Thank you!
Ingo
next prev parent reply other threads:[~2023-10-11 22:01 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-09 1:31 linux-next: manual merge of the block tree with the asm-generic tree 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 [this message]
2023-10-16 11:53 ` Ingo Molnar
2023-10-17 1:12 ` Stephen Rothwell
2023-10-16 11:31 ` [tip: locking/core] alpha: Fix up new futex syscall numbers tip-bot2 for Peter Zijlstra
2023-10-09 9:33 ` linux-next: manual merge of the block tree with the asm-generic tree Stephen Rothwell
2023-10-31 22:21 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-09-25 2:05 Stephen Rothwell
2023-09-25 2:09 ` Stephen Rothwell
2023-10-31 22:23 ` 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=ZScbKPQur2qao5Gf@gmail.com \
--to=mingo@kernel.org \
--cc=arnd@arndb.de \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=sohil.mehta@intel.com \
/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