From patchwork Mon Dec 18 05:17:04 2023
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Stephen Rothwell <sfr@canb.auug.org.au>
X-Patchwork-Id: 13496211
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 67AB663A3;
	Mon, 18 Dec 2023 05:17:07 +0000 (UTC)
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
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="i1Gn4axe"
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
	s=201702; t=1702876626;
	bh=LWVOdWD/fLbAF9XWd/EZxP0KqVqq36W6xaUInLOkyI4=;
	h=Date:From:To:Cc:Subject:From;
	b=i1Gn4axeu1xP1TncM7AA8O75dLhftWe69pSXlvBmz8zeAVAM1pfvYyUkSyTA23jPF
	 jqEU4lTDMTJ1eV9z66yLosr2bTAHiCvU4c+hKd1d2liFyVuHZmFHTWxiVloOM4/4so
	 LXkTqH+xLOxopmWP4W6eda3qo/Gsn0QiLlfx/NytEtFggGSq9kae9uHubRy/EdHISj
	 ukS3lzB78tUsAjWa79VHs1Hv0MFUBL/SMOp9RgXWU0kHhNyFwspm8mAS+tLztQbwFh
	 PuEowwiomaAvt8q1WAwozbTUdvkBnvelPmsl89HZF5sW/OB65M76gKSBvWd58PefOv
	 gDmhvABmyZMug==
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 4Stp3P38L7z4xR5;
	Mon, 18 Dec 2023 16:17:05 +1100 (AEDT)
Date: Mon, 18 Dec 2023 16:17:04 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kees Cook <keescook@chromium.org>, David Miller <davem@davemloft.net>,
 Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: Networking <netdev@vger.kernel.org>, Alexey Dobriyan
 <adobriyan@gmail.com>, FUJITA Tomonori <fujita.tomonori@gmail.com>, Linux
 Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Trevor Gross <tmgross@umich.edu>
Subject: linux-next: manual merge of the execve tree with the net-next tree
Message-ID: <20231218161704.05c25766@canb.auug.org.au>
Precedence: bulk
X-Mailing-List: netdev@vger.kernel.org
List-Id: <netdev.vger.kernel.org>
List-Subscribe: <mailto:netdev+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:netdev+unsubscribe@vger.kernel.org>
MIME-Version: 1.0

Hi all,

Today's linux-next merge of the execve tree got a conflict in:

  MAINTAINERS

between commit:

  cbaa28f970a1 ("MAINTAINERS: add Rust PHY abstractions for ETHERNET PHY LIBRARY")

from the net-next tree and commit:

  0a8a952a75f2 ("ELF, MAINTAINERS: specifically mention ELF")

from the execve 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 MAINTAINERS
index 1f53b4c593dd,08278b9ede48..000000000000
--- a/MAINTAINERS