From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1DF9C4361A for ; Thu, 3 Dec 2020 15:05:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7FDF7207AB for ; Thu, 3 Dec 2020 15:05:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726636AbgLCPFs (ORCPT ); Thu, 3 Dec 2020 10:05:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:55170 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725899AbgLCPFr (ORCPT ); Thu, 3 Dec 2020 10:05:47 -0500 Date: Thu, 3 Dec 2020 15:05:03 +0000 From: Catalin Marinas To: Jens Axboe Cc: Stephen Rothwell , Will Deacon , Linux Kernel Mailing List , Linux Next Mailing List , Mark Rutland Subject: Re: linux-next: manual merge of the block tree with the arm64 tree Message-ID: <20201203150502.GC2830@gaia> References: <20201203142530.4d962ea5@canb.auug.org.au> <20201203110122.GC2224@gaia> <52116588-c870-27e2-4b8f-873d3393553c@kernel.dk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <52116588-c870-27e2-4b8f-873d3393553c@kernel.dk> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org 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