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.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable 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 6DCF1C433FE for ; Thu, 3 Dec 2020 15:58:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1492C20674 for ; Thu, 3 Dec 2020 15:58:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2436494AbgLCP6m (ORCPT ); Thu, 3 Dec 2020 10:58:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731086AbgLCP6l (ORCPT ); Thu, 3 Dec 2020 10:58:41 -0500 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C8ABC061A51 for ; Thu, 3 Dec 2020 07:58:01 -0800 (PST) Received: by mail-pf1-x436.google.com with SMTP id b10so1567971pfo.4 for ; Thu, 03 Dec 2020 07:58:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=LvgUdjvKhTgEmbR96saiQbXiMEKKGZO1Yra/8ik4nsg=; b=hCtqNIT7+vOjRc9P3r35rSSirYGzaEVY+vXwcQHD85+7S1aXs6mkVGlt7ifDfn/H6N nYKekPtUjZDr0XO3FiUCrx9YEjHtgql2gfgD0xpEKai5xc0ZH9p0DSJyakLl/gdyUw08 HFTOJ6bJRMSGx8wbAhLcEkgcIvQHAvB5ppgO4rfzibQRiHohca+spoAVrfq202jBTmyD YANyLUXndcH6v4xwIdNMk9HUqux163jLPf11K1YeobELeV77qgMq8vOYGiVakZ9G62Bv fsv2a8qJwzUaVRGG/d0pHJWRbdK3F7FNgPVeqZFEp8oGJfJ7Th1jI5oJGyZor1cKWE5I H8Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=LvgUdjvKhTgEmbR96saiQbXiMEKKGZO1Yra/8ik4nsg=; b=WjCNlN+iVi7Rb7WeNnDj6CMTo4tX8SEZs07eKDalzVgbNqAFTmiP+JhzsvfuFdjrfq JNbpvxLj3P7C3fps9ISV+DQSywVuJAKcPjCEtglwRXo5xdtRNzfGAwsyWNhemG/b3mYd r08QHsPcKVIEi5U755LobSS9rqK9V9f/0txL+wO3zk7yWmfkGDbPbujmwMUTxIbo7q7F KhO5D4v2ZwPJAUasi+AcRNCxunmpe+TpCDwTs2UcQaLMutQ0yCXkxf+UL+4/I1UZvsq1 idFDyKiMPEMaEFXR3yajh98iXfE50GTT5XC3Rskr48+vnPp3QnnnS6OTJPeF4AoHvKzg s42w== X-Gm-Message-State: AOAM532QDuRW3D83sN48eYoUnyeRAwvY5deop3anzdRCf1iJciCilgsF 1MFoCmrEIeHlnuDwwk6qa3AO0Q== X-Google-Smtp-Source: ABdhPJxLT5q/O3TiH6M6tsnszW/NzpamyVvmGiZ6heumzEUDZrfNeBqaW3RKLiIelRMkKuMWZ5bq9Q== X-Received: by 2002:a63:2045:: with SMTP id r5mr3641085pgm.6.1607011081077; Thu, 03 Dec 2020 07:58:01 -0800 (PST) Received: from [192.168.1.134] ([66.219.217.173]) by smtp.gmail.com with ESMTPSA id d25sm2180530pfo.172.2020.12.03.07.57.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 03 Dec 2020 07:58:00 -0800 (PST) Subject: Re: linux-next: manual merge of the block tree with the arm64 tree To: Catalin Marinas Cc: Stephen Rothwell , Will Deacon , Linux Kernel Mailing List , Linux Next Mailing List , Mark Rutland References: <20201203142530.4d962ea5@canb.auug.org.au> <20201203110122.GC2224@gaia> <52116588-c870-27e2-4b8f-873d3393553c@kernel.dk> <20201203150502.GC2830@gaia> From: Jens Axboe Message-ID: Date: Thu, 3 Dec 2020 08:58:02 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20201203150502.GC2830@gaia> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12/3/20 8:05 AM, Catalin Marinas wrote: > 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). Ah indeed, I saw some changes come in yesterday for mainline and assumed it was those. > 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). Right, not an issue, it's a trivial resolve anyway. That branch is dependent on an x86/core branch, so I'll push it out when that goes in. But Linus usually pulls those early, so don't think we'll have much of an issue there. -- Jens Axboe