| Message ID | 20240301153807.796a3a28@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel+bounces-87892-ouuuleilei=gmail.com@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:7301:2097:b0:108:e6aa:91d0 with SMTP id
gs23csp857476dyb;
Thu, 29 Feb 2024 20:38:28 -0800 (PST)
X-Forwarded-Encrypted: i=3;
AJvYcCWBlIJOiUozCoHySljS93G5upAzaEE+wDcyWoi/BpfvxvTtG1MaO6zdvMFCcnl1jSb4rmFpm87vUnxqrcWxSOFSV5VBvQ==
X-Google-Smtp-Source:
AGHT+IEpaWSTtoLZ8KQdPs0COKImdtw2wvmOo8v9ZHiEq1gMjzGEuibSWEO+fezrrHnvHf/domCr
X-Received: by 2002:a05:6a20:8e0b:b0:1a0:dfd4:a558 with SMTP id
y11-20020a056a208e0b00b001a0dfd4a558mr542162pzj.18.1709267908520;
Thu, 29 Feb 2024 20:38:28 -0800 (PST)
ARC-Seal: i=2; a=rsa-sha256; t=1709267908; cv=pass;
d=google.com; s=arc-20160816;
b=UKkZTekphBRuoIUd04cy1GJ7WGwR2Mh4bC/r68RB7iCSiKFf7xC046y6LazzhMjmv2
uFeIb9rckGVg7qphu59kL5a6jQkPBbGSgypMlzbZlImbHqodak/rt0eKUZNn345D0Z3a
ZDcbJQ+hTSvx2/rUTBSuxpfE7IwwUMnd/IaNFwLY5WtR6ZqGpuYi3HitKd7R9LuRlCbl
mZgwp96ehm9FkXZDqonPFl72dzkYSXZdhubiwLJ6quvs5sJyYjfOooRBJ89BOMwrMzWn
nP3jRMaEVLx9wP1z86OQtYg7t2Yds7FibK0J4VV1CLUXkGUubEyD5c6wvsmSclE7P9+F
vF/w==
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=F77xY+9qqb1mR0bwmOtlNnouwx91f9f018ulkOph5ik=;
fh=ouno2VVfalOjeizdzsucr4yGs1sKDK8BYXKrRbSvnMU=;
b=SVO29ZCOtPAy68Jc+Tv9Eg5IvoDvBIpy0KbhYXDvtCHDF1kDxdaJD1jYOlXWhdNJiB
xSsVMlb99cl2OEEBzj614stH9w5H56hFhzKRENf8IKT72SWc/sRdFZGAKmVPGCFQ3isX
YOR+Igf01F9FQELC4kF5AbDiLIK8IenCcBk/SJvYD13RGPTX2lprPlZva/affr2XFXLC
9wozQl24IHw4dDmj+N7LyA19lVyqtS1OsL3ReEDspcWFHdrEJozBIyp5waHLXNZT7Cyd
PUuaCJcvffA69bMSxXSfnR+JU+3hyfYSb57wyQdk4k1csX+CyAP+JMU9LRcH9u/MIdBV
zLxw==;
dara=google.com
ARC-Authentication-Results: i=2; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=GqugR3BQ;
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-87892-ouuuleilei=gmail.com@vger.kernel.org designates
139.178.88.99 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-87892-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99])
by mx.google.com with ESMTPS id
ot15-20020a17090b3b4f00b0029b2679cd51si280365pjb.105.2024.02.29.20.38.28
for <ouuuleilei@gmail.com>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 29 Feb 2024 20:38:28 -0800 (PST)
Received-SPF: pass (google.com: domain of
linux-kernel+bounces-87892-ouuuleilei=gmail.com@vger.kernel.org designates
139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=GqugR3BQ;
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-87892-ouuuleilei=gmail.com@vger.kernel.org designates
139.178.88.99 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-87892-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 581EA28450A
for <ouuuleilei@gmail.com>; Fri, 1 Mar 2024 04:38:28 +0000 (UTC)
Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
by smtp.subspace.kernel.org (Postfix) with ESMTP id AF7DD50276;
Fri, 1 Mar 2024 04:38:14 +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="GqugR3BQ"
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 1C98346425;
Fri, 1 Mar 2024 04:38:09 +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=1709267892; cv=none;
b=NQZG3+xA3k1u0Ur0/bWrbRZCCTUBvZAxFHzpDbELEv7d9f7eQ4RMej6xgSFEfIx4ZOdm7EEPQL0ZoG6Dva5IOsMH/XtocX0dATElBlTrYICsA2jAZaFOdHMU9OZDoU0pfvkuwbpcPFsNPXVu5OqsE139BPXl3sPN4CiKYqwMdnE=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1709267892; c=relaxed/simple;
bh=yCx6g2n76XZ+RlK7e7HSEMhl1xCxf1kYvZuF4riZm1A=;
h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type;
b=D4zoCaaRlju4zyParOGKvj540z5Zp/i+YiLoJZxrqW93C8XBUWwy5Z79HGtqGguEXsNhsQlaBDCdmuJi8eVj+dtjkJ8+cikfHiSovy4bfznzvyIwnWaUJupKGUI1EiQI9qvUnlj3dX/I18KMsjszyhyv+rMg+phakKDz2OhfXb8=
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=GqugR3BQ; 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=1709267888;
bh=F77xY+9qqb1mR0bwmOtlNnouwx91f9f018ulkOph5ik=;
h=Date:From:To:Cc:Subject:From;
b=GqugR3BQ3qU3YEhAtUA0zYVJWIpceIQnCJXyAkFa7rZHv2PpErRhg4gPy1JMveoDb
cAcPMAJ1O2lmejI9bpD6Vi8ZofR4DR49+oXkft8ZUevM+/YzlgMV5p7m6Wqw7tG18u
pMv/FkqY0DWuZCDI3g8FXHG9EHADTI6LG22ZrkTL3g350TRzAzv+OxNQkFh68HtBA+
BaMQSjikTMsQzm6jFfMO1b3u2txwV/2Es1X8GJXVuz52f33ouFHayKB5Ug7o0/bhsw
U34XP04YelFcme3y+AJWe3DKmjPrf5IrC+PSRRrtWxWvbCXIg2nrtj/P42Npfcr5bY
2bTlTymnQgAMw==
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 4TmFhH6KSwz4wcY;
Fri, 1 Mar 2024 15:38:07 +1100 (AEDT)
Date: Fri, 1 Mar 2024 15:38:07 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Miguel Ojeda <ojeda@kernel.org>, Catalin Marinas
<catalin.marinas@arm.com>, Will Deacon <will@kernel.org>
Cc: Jamie Cunliffe <Jamie.Cunliffe@arm.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 rust tree with the arm64 tree
Message-ID: <20240301153807.796a3a28@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_/.2pj11Q6FkPKN0uHRUIBq4B";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1792297306007757337
X-GMAIL-MSGID: 1792297306007757337
|
| Series |
linux-next: manual merge of the rust tree with the arm64 tree
|
|
Commit Message
Stephen Rothwell
March 1, 2024, 4:38 a.m. UTC
Hi all,
Today's linux-next merge of the rust tree got a conflict in:
rust/Makefile
between commit:
f82811e22b48 ("rust: Refactor the build target to allow the use of builtin targets")
from the arm64 tree and commit:
ecab4115c44c ("kbuild: mark `rustc` (and others) invocations as recursive")
from the rust 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.
Comments
On Fri, Mar 1, 2024 at 5:38 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > I fixed it up (see below) and can carry the fix as necessary. This The resolution looks good -- thanks! Cheers, Miguel
diff --cc rust/Makefile index fe045dbc701e,a78fcf4004b0..000000000000 --- a/rust/Makefile