From: Catalin Marinas <catalin.marinas@arm.com>
To: Jens Axboe <axboe@kernel.dk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Will Deacon <will@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Mark Rutland <mark.rutland@arm.com>
Subject: Re: linux-next: manual merge of the block tree with the arm64 tree
Date: Thu, 3 Dec 2020 15:05:03 +0000 [thread overview]
Message-ID: <20201203150502.GC2830@gaia> (raw)
In-Reply-To: <52116588-c870-27e2-4b8f-873d3393553c@kernel.dk>
On Thu, Dec 03, 2020 at 07:36:10AM -0700, Jens Axboe wrote:
> On 12/3/20 4:01 AM, Catalin Marinas wrote:
> > On Thu, Dec 03, 2020 at 02:25:30PM +1100, Stephen Rothwell wrote:
> >> diff --cc arch/arm64/include/asm/thread_info.h
> >> index 015beafe58f5,cdcf307764aa..000000000000
> >> --- a/arch/arm64/include/asm/thread_info.h
> >> +++ b/arch/arm64/include/asm/thread_info.h
> >> @@@ -63,7 -66,9 +63,8 @@@ void arch_release_task_struct(struct ta
> >> #define TIF_NOTIFY_RESUME 2 /* callback before returning to user */
> >> #define TIF_FOREIGN_FPSTATE 3 /* CPU's FP state is not current's */
> >> #define TIF_UPROBE 4 /* uprobe breakpoint or singlestep */
> >> - #define TIF_MTE_ASYNC_FAULT 5 /* MTE Asynchronous Tag Check Fault */
> >> -#define TIF_FSCHECK 5 /* Check FS is USER_DS on return */
> >> ++#define TIF_NOTIFY_SIGNAL 5 /* signal notifications exist */
> >> + #define TIF_MTE_ASYNC_FAULT 6 /* MTE Asynchronous Tag Check Fault */
> >> -#define TIF_NOTIFY_SIGNAL 7 /* signal notifications exist */
> >> #define TIF_SYSCALL_TRACE 8 /* syscall trace active */
> >> #define TIF_SYSCALL_AUDIT 9 /* syscall auditing */
> >> #define TIF_SYSCALL_TRACEPOINT 10 /* syscall tracepoint for ftrace */
> >> @@@ -96,7 -103,8 +98,8 @@@
> >>
> >> #define _TIF_WORK_MASK (_TIF_NEED_RESCHED | _TIF_SIGPENDING | \
> >> _TIF_NOTIFY_RESUME | _TIF_FOREIGN_FPSTATE | \
> >> - _TIF_UPROBE | _TIF_MTE_ASYNC_FAULT)
> >> - _TIF_UPROBE | _TIF_FSCHECK | _TIF_MTE_ASYNC_FAULT | \
> >> ++ _TIF_UPROBE | _TIF_MTE_ASYNC_FAULT | \
> >> + _TIF_NOTIFY_SIGNAL)
> >
> > Thanks Stephen. It looks alright to me.
>
> Agree - I'll rebase my tree when -rc7 is out so we won't have this issue once
> the 5.11 merge window opens.
I don't think rebasing on -rc7 will help since the arm64 commit
b5a5a01d8e9a is queued for 5.11 (so not in -rc7).
It shouldn't matter much, Linus likes the occasional conflict ;).
Anyway, I can wait for your pull request to go in if you'd prefer (and
if it happens in the first week of the merging window).
--
Catalin
next prev parent reply other threads:[~2020-12-03 15:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-03 3:25 linux-next: manual merge of the block tree with the arm64 tree Stephen Rothwell
2020-12-03 11:01 ` Catalin Marinas
2020-12-03 14:36 ` Jens Axboe
2020-12-03 15:05 ` Catalin Marinas [this message]
2020-12-03 15:58 ` Jens Axboe
2020-12-14 20:17 ` 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=20201203150502.GC2830@gaia \
--to=catalin.marinas@arm.com \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=sfr@canb.auug.org.au \
--cc=will@kernel.org \
/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