| Message ID | 20240226092711.7985af2e@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel+bounces-80323-ouuuleilei=gmail.com@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id
bq27csp1763588dyb;
Sun, 25 Feb 2024 14:27:35 -0800 (PST)
X-Forwarded-Encrypted: i=3;
AJvYcCWVNp7uQxQS9GH9uGFsHrZmOc2duegW7YdaqGmYtbbmiOrVLPezSidB75jSpzVX9FtvVWDb9b0qpqKQrkatQlv/wyfEjg==
X-Google-Smtp-Source:
AGHT+IF95bVCSpBPXoSkSkmMBoo3G1GYzsBTX6Vy5BY0gJzLTY3pyT4jjVIyubv9KYKXD49BSfP8
X-Received: by 2002:a17:906:3c57:b0:a3f:a70a:d6c3 with SMTP id
i23-20020a1709063c5700b00a3fa70ad6c3mr4706818ejg.2.1708900054986;
Sun, 25 Feb 2024 14:27:34 -0800 (PST)
ARC-Seal: i=2; a=rsa-sha256; t=1708900054; cv=pass;
d=google.com; s=arc-20160816;
b=lljBwmGtB2OWV/xvLjcrppyCNi6HqWRdWGfdfUcIjnTEAxz2lZluD7o7QitqK48NjN
HQmk4BNagTcLZwDKVTcxQsx0Cz06EYgVddpGO2KctVyfw8Q8cKhU7EJgbuu/mVQ1NhKx
hWpCuODNloEUohBpTkBAsMlP+xTldIi/9H/FpFu5MB5Of8Ef46uMFVeWuQsJPeT5fk+q
TxF8Vy3vJ5BQ5oc9uzJ99UeB3Q4PwzuqINK0wGtsCQ+h+gcRhkrwmJPQqaU7fqhaj00+
A2dqLSFQADYsmLecEoaPgMDB6kWHnDyyO53WoekEgGYGKVmj2+wpfzbc6YJRpdI3qkGs
P4hQ==
ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence
:message-id:subject:cc:to:from:date:dkim-signature;
bh=50wi3HOWe5IN3zpn4H6jAsntjTCSdTrhMpYbEOU5cuI=;
fh=JOIMpYUB6756P8SP9uV/1xomIFYxmebVrtpAjiLVJys=;
b=jU9Ubl9MUyEKDALHtmi/XSNUc6vczCRm36crLBAlliW59Y83djl1CMnioz9Ibfm5mV
m/Kl06Li9zXN1YciuiDkglxT0fioE5lfxr/DpOPTvL9w9FoEPZFpxZBTz1H4pq5iGWdT
7HnzXnQiv044eZSHXAd+F4pl5JEk9BkX4C6IsvPW9vlFi0eS4gn9BKEPkV2cu7MLpQVa
rypFGTldOaNHfdZCvmsqkLsd3Rf+ENFqFLFUfqP/RXIcw2cWCNY79+E94uW2/v7aJrU+
6dwq5+qEAR6b52AICdgS3+lUXCbI0jFhr6N4AokWt2ZEfbQqg0GJDUGFbDZmGA3l96r/
BOXQ==;
dara=google.com
ARC-Authentication-Results: i=2; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=U7yM1PEb;
arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass
dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au);
spf=pass (google.com: domain of
linux-kernel+bounces-80323-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:4601:e00::3 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-80323-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from am.mirrors.kernel.org (am.mirrors.kernel.org.
[2604:1380:4601:e00::3])
by mx.google.com with ESMTPS id
lj24-20020a170906f9d800b00a3ed0661e04si1534714ejb.1039.2024.02.25.14.27.34
for <ouuuleilei@gmail.com>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 25 Feb 2024 14:27:34 -0800 (PST)
Received-SPF: pass (google.com: domain of
linux-kernel+bounces-80323-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=U7yM1PEb;
arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass
dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au);
spf=pass (google.com: domain of
linux-kernel+bounces-80323-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:4601:e00::3 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-80323-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org
[52.25.139.140])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by am.mirrors.kernel.org (Postfix) with ESMTPS id 990491F219EF
for <ouuuleilei@gmail.com>; Sun, 25 Feb 2024 22:27:34 +0000 (UTC)
Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
by smtp.subspace.kernel.org (Postfix) with ESMTP id E15C81BC4E;
Sun, 25 Feb 2024 22:27:21 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au
header.b="U7yM1PEb"
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.subspace.kernel.org (Postfix) with ESMTPS id 51AB11B951;
Sun, 25 Feb 2024 22:27:15 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=150.107.74.76
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1708900039; cv=none;
b=MBKMeh4eiESAllIWuE6hbV5qIkdRfOR+3zmpfbW2sHy9uqUBSg5ZUxA/4nb2kDBQPMorTzDU9imbL3AuaJuq5isj8hN900BCOrZmpgDABjQoPyskr5TBabV6pJeebntl/izZEhMmxVKt/+JII3rFTg/VfjQcBrt55XHE7rqIrPw=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1708900039; c=relaxed/simple;
bh=pb+HxfIZ3gglynzChQW2WPTybqDXwGbehB3zBJPZYCM=;
h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type;
b=jsNw1vQDJESF3THdDkas3ktGqm4S/MZZ/OTWOR6LV/f/kRJZoWyX1YhN65zdgdYFjaXdGBUa+0rdbzqOnvOXwn2fcGXXOYeLDmBWNVEiRWFF/XS8Es7c//r0Vddj5mM5UxmRKEgvv478lraaoTruH29dJOT2hI4no+Qc3t8a30E=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=canb.auug.org.au;
spf=pass smtp.mailfrom=canb.auug.org.au;
dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au
header.b=U7yM1PEb; arc=none smtp.client-ip=150.107.74.76
Authentication-Results: smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=canb.auug.org.au
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1708900034;
bh=50wi3HOWe5IN3zpn4H6jAsntjTCSdTrhMpYbEOU5cuI=;
h=Date:From:To:Cc:Subject:From;
b=U7yM1PEbW2o0t5QLajuo6dCvGQkVEV9q5vMcVT2JkjGFAs4KifL5jrw2/ZVAQCaSG
yKtDebuW0w9/mHVbBzC2O8KKxydMLLe0YFIbPxQLsgbJijaEMrlzm9MXKvgjuV5Yso
W1Uau7vFBvdznp2NpaPXlEpV7Led56ZQXOjzR0dihBmM0+YYNU+bDH36IcMzkPT38N
9RDIePVssrY4MQGz4AG8rEcU5OvJ++rFx3+AMR1YsawEm54UgRTe74CuOjYGTMjo0F
NhQzGBrTHfJ2GmiAwjiLsynQ6N5eU4T4YoI9/H+eiQ1Nh0zgth6F0wNp7mmndXXqIo
b++oDmejNE5OA==
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 4Tjdf91NCVz4wcr;
Mon, 26 Feb 2024 09:27:12 +1100 (AEDT)
Date: Mon, 26 Feb 2024 09:27:11 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>, Palmer Dabbelt
<palmer@dabbelt.com>, Paul Walmsley <paul.walmsley@sifive.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
Mailing List <linux-next@vger.kernel.org>, Nathan Chancellor
<nathan@kernel.org>, Palmer Dabbelt <palmer@rivosinc.com>, Zong Li
<zong.li@sifive.com>
Subject: linux-next: manual merge of the mm-nonmm-stable tree with the
risc-v-fixes tree
Message-ID: <20240226092711.7985af2e@canb.auug.org.au>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/cUSGj6cmxZg.4tY6SC_cXVH";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1791911583628419812
X-GMAIL-MSGID: 1791911583628419812
|
| Series |
linux-next: manual merge of the mm-nonmm-stable tree with the risc-v-fixes tree
|
|
Commit Message
Stephen Rothwell
Feb. 25, 2024, 10:27 p.m. UTC
Hi all,
Today's linux-next merge of the mm-nonmm-stable tree got a conflict in:
arch/riscv/include/asm/ftrace.h
between commit:
680341382da5 ("riscv: add CALLER_ADDRx support")
from the risc-v-fixes tree and commit:
de5f3984664e ("riscv: remove MCOUNT_NAME workaround")
from the mm-nonmm-stable 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/riscv/include/asm/ftrace.h index 15055f9df4da,cf5b63e789fa..000000000000 --- a/arch/riscv/include/asm/ftrace.h