From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 40144353A63; Thu, 2 Jul 2026 15:33:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783006439; cv=none; b=HtMNBBoPYWEJa5s17E0QrvbhpPIhqmbO0Nej75kbpO9ZZL10ffNSH0z0AJw0QHqBuqchdy+VjQ8wQFUdwUTfeBfwE/NxWlZHVD6UBDPzVmC/qiq/+INCD05rNxQzlxZORcB2ZsvYFzwguKjQ8B96GbZwkJdjmFcNE2QHkMV/Ee8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783006439; c=relaxed/simple; bh=8J7w6KtvUb8J1E7AFJuEuF9F19XQEBruHwij1pMuyQA=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=AXmlVpxyvx0ip8f3ulfvpOpMd0nU6DdGoKR3+WpjNPBq2hIqlU5dPa0+gRL2pJ99Ed6p72IFPJVzNbvHh7yPrtXv7CD7kbh3Ahe8RTNvfr0ysNjJb8FCa2rqS3F/HfdJJYdwkZCXmKJxDBXr5KraRSdLb/R3DVGaQiKiC1SP9aw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QtkK/2ff; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="QtkK/2ff" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E62C41F000E9; Thu, 2 Jul 2026 15:33:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783006437; bh=51rouF56EmU1j9L8gb1If6ofMiucZZpjzo+NCXwNTJw=; h=Date:From:To:Cc:Subject; b=QtkK/2ffNtrEZJFd/RL+k7BkglsnSrZMu4Ab9zAfyDzxoRt9EYyKBUpc0Mz1+Q5v3 Ng/ApS9bP44iUSP4e/Ty+xu5pEGJ+SV6mgbly9LA8Qk01uIA3RceGiLSMRAjEYM5c4 vuJWX0j0pCMAED4QXGE30pd/Bx4D09/3y+QqfX32wYV0nhFansq8QojwPJ2Pcbs69V 9wkSJ2vK/9L+IaXrmcGGU43oT58PuUik1F04lb+l3nUHa1INZhF1G0t7urSypJ2Q0R 32xWBXHgkWvAkY3eYI8r3zBSKscG4nOsxmhpbPBQqgUZe7yNrP/aCn8+vAj6gPs9as 5nEjUkZKSXHgQ== Date: Thu, 2 Jul 2026 16:33:53 +0100 From: Mark Brown To: David Miller , Jakub Kicinski , Paolo Abeni , Networking Cc: Christian Brauner , David Christensen , Linux Kernel Mailing List , Linux Next Mailing List , Matthew Wilcox Subject: linux-next: manual merge of the net-next tree with the vfs-brauner tree Message-ID: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="ifnVYB9nS3UqU3Vx" Content-Disposition: inline --ifnVYB9nS3UqU3Vx Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the net-next tree got a conflict in: MAINTAINERS between commit: 969076f31bf63 ("efs: Remove EFS") =66rom the vfs-brauner tree and commit: eb56577ae9a5a ("ehea: remove the ehea driver") =66rom the net-next 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 801a4809b918a,ee4ee7b8e9470..0000000000000 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -9495,11 -9493,11 +9495,6 @@@ L: linux-fbdev@vger.kernel.or S: Maintained F: drivers/video/fbdev/efifb.c =20 - EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER - L: netdev@vger.kernel.org -EFS FILESYSTEM --S: Orphan - F: drivers/net/ethernet/ibm/ehea/ -W: http://aeschi.ch.eu.org/efs/ -F: fs/efs/ -- ELM327 CAN NETWORK DRIVER M: Max Staudt L: linux-can@vger.kernel.org --ifnVYB9nS3UqU3Vx Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmpGhOAACgkQJNaLcl1U h9AwDAgAhD92WOcGeyi+KeFhancmA8auGHar+qpwCDfZkJFTgIuggEKbGA0jkcum 4YrhDI1QqySzpxs58wiutqF/mU4BUl8pjcQfXQzuKcgqHWH+lG4LCe3uVjQ34L+4 dqjKb6kGtt8ZnltOVuWQHcUfZWYmyK5fa2Q/IZuMyzgiJRAPKNK3gu7QTMVz7drl YS526zmQjWB+L4XAH51aQiiGHHp9arvmtvtpGYTSNhu3Wsj/3lwUgiFmABBs2Oi2 NXghZO3+HIOIw3+BmiF0cED927o+y2sEudnjY6XxT01vVxJNEUC7vIY+2EIYoN3y D2HB8pgPxWHe//VY7htjlJ8ILrETAQ== =UVzZ -----END PGP SIGNATURE----- --ifnVYB9nS3UqU3Vx--