| Message ID | 20231024095234.1118e7dd@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1596980vqx;
Mon, 23 Oct 2023 15:53:12 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IHjTrxELa/i9tJHqlcAzaZTfuLULIA0vqRPJfmg0Hh3CS1yPGJwYS7jvYEvszamu3OMBoEw
X-Received: by 2002:a05:6a00:14c4:b0:68a:4d66:caf with SMTP id
w4-20020a056a0014c400b0068a4d660cafmr8711981pfu.34.1698101592014;
Mon, 23 Oct 2023 15:53:12 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1698101591; cv=none;
d=google.com; s=arc-20160816;
b=QFhrvgNUce/o8vtbEAvOUCfsKquRDOwisIygsOt2XjMwBVD9ANB75nrbmBFC074wKr
PZr0smZqQZuea1Dx/VzLp/LrBIOntfZeIohftOU3seNHXEfz/RwN73NGooFjJhke/m68
+/IKiJC3K6c9Mtz6iJq+wP/+8bBmZh/YRDDyI+Mjw0EqiZi6Z28VE9rbGON24z0bMBNU
VnD8Hzb6q8ca7wvDDnUzSiCpey9FsvVLCt3c2hOUbpCh/XGHaFCsfaAjmqDSor1YHSoH
C7VuJPDazM/jWaxJJYC+B2DD96CNxwpvf/rhVVgjjWpkFrBDF2HWmbeqvUvJgyK2IaJ2
FTJA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date
:dkim-signature;
bh=uDVePNwDDTDbRfzsnprDIRxTsgybIzbMUcsoxUeD4DA=;
fh=8TY20gvgOUSlXeC0H+Igc5Acd35pjWmKn1MMe4iO3hA=;
b=CU6eujI92fB/+rQWkGkJF/hT5tKgHICyngQ8Z2RI28E8qhkH1NkD5iEVL6nE2zMVOI
+jyBvsVxxoc/pfdY0vqi3s8Iz3zGevrH/436cZ2u6FxME08FtC0c5rdWQjcYDYUFJ+s7
aEPkTFmF13f/Fp+h1uHtuxRFHuSRAn9SpqzOXpYDQz4E9f4C0WCt6fCUmU+Ay24AWxd4
9LNz5Tmxpr2wlFxSrbMntxYJ/j50KacDf2msim+FcomfGsLBrY3a6Cc5dYzXAxGpvXSf
2LTGJH5QULWZezwJt4uJ9uVvJSUTShBu/NpGE7+TzrP7X3GnE2sqCcLwjNPAS+HJzsHu
ilgg==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=mtvtjRr4;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.31 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from morse.vger.email (morse.vger.email. [23.128.96.31])
by mx.google.com with ESMTPS id
bd33-20020a056a0027a100b006bdb7c5f75dsi7307553pfb.357.2023.10.23.15.53.11
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 23 Oct 2023 15:53:11 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=mtvtjRr4;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.31 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0])
by morse.vger.email (Postfix) with ESMTP id D79E6803F8C9;
Mon, 23 Oct 2023 15:53:09 -0700 (PDT)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S229903AbjJWWwn (ORCPT <rfc822;aposhian.dev@gmail.com>
+ 27 others); Mon, 23 Oct 2023 18:52:43 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51730 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229552AbjJWWwm (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Mon, 23 Oct 2023 18:52:42 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7E4B10C;
Mon, 23 Oct 2023 15:52:39 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1698101558;
bh=uDVePNwDDTDbRfzsnprDIRxTsgybIzbMUcsoxUeD4DA=;
h=Date:From:To:Cc:Subject:From;
b=mtvtjRr4cfCweGeA12ZgyrGJVcu2ItsR7BSMXijZUjDFLkpPrxyfuyU5b1flh9qfX
HZAj4tcHsn19PtIWpJbcf2pVfThPHzBZ/02Ifo833bB33pNSeqh1QZ91kBHgjH/xwK
S0yH1rde7Eb3ifAxGRlv4mlrJIZsllbP7xMRnqzS4OiGbJ9UfgjIXNfaSeveQPJxfH
AHbME5kS24wdI0N64BeXr0vG5ZEVPM19YWV2ZS3E89JhW8Wi8kObdIIDjVUXqYm2XW
qcXoS6+EfJeWwTojLmh47iSY8S7Cpf9tedgde9QXrwg/jthsLM4etLzxRYBmdArRzQ
kF/81Ngh+VCzA==
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits)
server-digest SHA256)
(No client certificate requested)
by mail.ozlabs.org (Postfix) with ESMTPSA id 4SDr793ZDWz4wcZ;
Tue, 24 Oct 2023 09:52:37 +1100 (AEDT)
Date: Tue, 24 Oct 2023 09:52:34 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Ard Biesheuvel <ardb@kernel.org>,
Baolin Wang <baolin.wang@linux.alibaba.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the arm64 tree with the mm-stable tree
Message-ID: <20231024095234.1118e7dd@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/FWjhNS95tLJHwMn92jYguN3";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test,
not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]);
Mon, 23 Oct 2023 15:53:09 -0700 (PDT)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1780588574501101608
X-GMAIL-MSGID: 1780588574501101608
|
| Series |
linux-next: manual merge of the arm64 tree with the mm-stable tree
|
|
Commit Message
Stephen Rothwell
Oct. 23, 2023, 10:52 p.m. UTC
Hi all,
Today's linux-next merge of the arm64 tree got a conflict in:
arch/arm64/include/asm/tlb.h
between commit:
55d2a0bd5ead ("mm: add statistics for PUD level pagetable")
from the mm-stable tree and commit:
3399ee709734 ("arm64: mm: Add support for folding PUDs at runtime")
from the arm64 tree.
Thanks, Catalin for the heads up, I just used your resolution.
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/tlb.h index 846c563689a8,771077f34a6c..000000000000 --- a/arch/arm64/include/asm/tlb.h