linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will@kernel.org>
Cc: 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: Tue, 15 Dec 2020 07:17:05 +1100	[thread overview]
Message-ID: <20201215071705.09df4f1a@canb.auug.org.au> (raw)
In-Reply-To: <20201203142530.4d962ea5@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 2410 bytes --]

Hi all,

On Thu, 3 Dec 2020 14:25:30 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the block tree got a conflict in:
> 
>   arch/arm64/include/asm/thread_info.h
> 
> between commit:
> 
>   b5a5a01d8e9a ("arm64: uaccess: remove addr_limit_user_check()")
> 
> from the arm64 tree and commit:
> 
>   192caabd4dd9 ("arm64: add support for TIF_NOTIFY_SIGNAL")
> 
> from the block tree.
> 
> I fixed it up (see below) 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.
> 
> 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)
>   
>   #define _TIF_SYSCALL_WORK	(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
>   				 _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \

Just a reminder that this conflict still exists.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

      parent reply	other threads:[~2020-12-14 20:18 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
2020-12-03 15:58       ` Jens Axboe
2020-12-14 20:17 ` Stephen Rothwell [this message]

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=20201215071705.09df4f1a@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=axboe@kernel.dk \
    --cc=catalin.marinas@arm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --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;
as well as URLs for NNTP newsgroup(s).