Message ID | 20240301153347.3b909702@canb.auug.org.au |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-87891-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2097:b0:108:e6aa:91d0 with SMTP id gs23csp856177dyb; Thu, 29 Feb 2024 20:34:10 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVA+Hdo37a5imrh+qhwEebw2NsAMxMcrXqwKEzdraUOL/L1UCc178bIuS9BLnVzNWfwj4gGQC6w5DGkZNnq37FVurdv2w== X-Google-Smtp-Source: AGHT+IHqZ48PjGiuxGm29Rq65nc5mB1Ih/MECh++dfKriLjwBeigKYQYL1K4mHABRWZNTyFycb0b X-Received: by 2002:a0d:cc96:0:b0:609:35f6:7f5 with SMTP id o144-20020a0dcc96000000b0060935f607f5mr609526ywd.2.1709267649867; Thu, 29 Feb 2024 20:34:09 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709267649; cv=pass; d=google.com; s=arc-20160816; b=Sjp0TuqrgMjxQdh999QQXq0YiYh13YUaNa9AIZTH5qCeGFR+gO/LpmbDrPvw79zSCt 4b3YyUbia6hQKOGyH+n2BYN46Ch4DfTEh8gmn8oIV5s8MdmQz87X+CKC7vB/XI+oGMzv vwaLa/f6FuXSaj+9CQ8u3I6iQGyXH7A3v0X8giSwJ8SBsPOS1rOdGnDhz1gh/lSbbGWe IE6FsOQWQhQmMeAga1TrxEXLg5o+9AU+Vc1VjP4J2vvO5J4Zf4sp+wRfPnjByo3890Pt uFpChdQ15WLkoGgO165bp4iDYvpUholyq3XXmQ+B4Hln0OsRm+0eb3E5ysVHymCZJzzh TFvA== 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=1++E/15N/FxTk8AT4mXPL0CthCu9aWjZIor9HqJA8Pc=; fh=ap0nFUNNHKO97rdQr6JuY+5zkDYUWFQ6FwFNgmSfihg=; b=RHLEfnTTn11TqsJBtFxZSOK4f8vGN/PFif82Yt+umYH/m7QmvVAAi7LqZdwxjQ2FKx u3x4KN4D5pbpAYzTz4uFDGEpRhnlTM2OQmUTIktcOFayk5QmYkOkkRB5vT9IMoAN/oV1 X6FEn42WnBBcCNMS4epLRkhGOY1fVh88iUhzok2H6VRoCiqrm+tOaA0sXHd2u0/YbTBG poWGJekwzCBME6V+nTG2VhnV0xofAoIL5T9Msbb9gys+ihj3B5fPwsdSPSGVfzeO29Bz 1zPtr4CgWSneDEqeBtDglV8Js+o+O6L2psWwOTtjMGAJQNUHtE11iPkuU0HCIFNuHM5X n5OA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=kygsMw65; 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-87891-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-87891-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 fh7-20020a056a00390700b006e2a6c63114si2866327pfb.98.2024.02.29.20.34.09 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Feb 2024 20:34:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-87891-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=kygsMw65; 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-87891-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-87891-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 5019A2858DB for <ouuuleilei@gmail.com>; Fri, 1 Mar 2024 04:34:09 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 06AAC5026D; Fri, 1 Mar 2024 04:33:58 +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="kygsMw65" 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 203BD446C8; Fri, 1 Mar 2024 04:33:50 +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=1709267635; cv=none; b=NQmgf1xN/qdBvuwEpLjVjZjJh9wNBiHggLqWlbPLRSAVUNpq3/MD9fwWrc0Jfrc52MLN8KNEGe429CyX8/xolWyOdV8wIibcCsq5kmK0XGCG7wZ2MpPtZDIszf+O2i8aD6Uzhvmj5Vhz4v7JlzFQYPMIs+RGDR04o/X/0vjY5jo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709267635; c=relaxed/simple; bh=q54LLk6cJTXWRuTNz6wuLM7DWgrZHo0ZxWgCn8HoNSo=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=I1PGbv3xnoYsJcNSgCvSi57YAkFylsppbuxkBEaS5/vVzRUY40QeXz7E8RBG/RbiJQYXnWO8MEe7QP8X69AgnV5JYzWyNLuqljwzRl4ihrdbXkgRcvXnehk2GTrx3qpWuUAFnbhOzUU8YnePBNEmiteSwSUjRxPuOEoU9KjUQXM= 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=kygsMw65; 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=1709267629; bh=1++E/15N/FxTk8AT4mXPL0CthCu9aWjZIor9HqJA8Pc=; h=Date:From:To:Cc:Subject:From; b=kygsMw65PLP1TYBycNVEb99J9XTd0wzZRKYfcEjndf8ANE7VmmTKXBb4L48GCI5Dd Of0P8SGE20dpaABxuhTIwTYHtc77TMTHOAWahiatVR7Zbg7YguuQKAM3/n/NuZ5pYy 4+ZMEVkv1/+0DytjflwGXPhJ/QFQNJoAL82S4A5JoqUGqT0p+xMtwhHVqiSWWbHeEF o77iBmq+asp5nruRGYDdwdgzwZSG8tQE+mz9vPVNxPIyra/5S9cXFuCsNh13kzLBuz p2dWjO1oZjIEck3sRAcQtHty9u7Zw6qFO0gBg4asEsmJ0XNUSiUKB0FKD2mptGqHFr jV2lIOc3m2/Zg== 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 4TmFbJ49Gcz4wcb; Fri, 1 Mar 2024 15:33:48 +1100 (AEDT) Date: Fri, 1 Mar 2024 15:33:47 +1100 From: Stephen Rothwell <sfr@canb.auug.org.au> To: Miguel Ojeda <ojeda@kernel.org>, Andrew Morton <akpm@linux-foundation.org> Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org>, Nathan Chancellor <nathan@kernel.org> Subject: linux-next: manual merge of the rust tree with the mm-nonmm-stable tree Message-ID: <20240301153347.3b909702@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_/UR_NI7OB_9s80.hdc8rCoJ5"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792297035091939564 X-GMAIL-MSGID: 1792297035091939564 |
Series |
linux-next: manual merge of the rust tree with the mm-nonmm-stable tree
|
|
Commit Message
Stephen Rothwell
March 1, 2024, 4:33 a.m. UTC
Hi all, Today's linux-next merge of the rust tree got a conflict in: Documentation/process/changes.rst between commit: 9c1b86f8ce04 ("kbuild: raise the minimum supported version of LLVM to 13.0.1") from the mm-nonmm-stable tree and commits: c5fed8ce6549 ("rust: upgrade to Rust 1.75.0") 768409cff6cc ("rust: upgrade to Rust 1.76.0") 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:33 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 Documentation/process/changes.rst index 6391e7805355,c78ecc1e176f..000000000000 --- a/Documentation/process/changes.rst