netdev - linux-next: manual merge of the net-next tree with the rdma tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20250911122644.40124ffe@canb.auug.org.au>
Date: Thu, 11 Sep 2025 12:26:44 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: David Miller <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>,
 Paolo Abeni <pabeni@...hat.com>, Jason Gunthorpe <jgg@...dia.com>, Leon
 Romanovsky <leonro@...dia.com>
Cc: Abhijit Gangurde <abhijit.gangurde@....com>, Allen Hubbe
 <allen.hubbe@....com>, Lei Wei <quic_leiwei@...cinc.com>, Leon Romanovsky
 <leon@...nel.org>, Luo Jie <quic_luoj@...cinc.com>, Networking
 <netdev@...r.kernel.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the net-next tree with the rdma tree

Hi all,

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

  Documentation/networking/device_drivers/ethernet/index.rst

between commit:

  ff8862c9c609 ("RDMA/ionic: Add Makefile/Kconfig to kernel build environment")

from the rdma tree and commit:

  6b9f301985a3 ("docs: networking: Add PPE driver documentation for Qualcomm IPQ9574 SoC")

from 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.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/networking/device_drivers/ethernet/index.rst
index 1fabfe02eb12,0b0a3eef6aae..000000000000
--- a/Documentation/networking/device_drivers/ethernet/index.rst
+++ b/Documentation/networking/device_drivers/ethernet/index.rst
@@@ -50,7 -50,7 +50,8 @@@ Contents
     neterion/s2io
     netronome/nfp
     pensando/ionic
 +   pensando/ionic_rdma
+    qualcomm/ppe/ppe
     smsc/smc9
     stmicro/stmmac
     ti/cpsw

Content of type "application/pgp-signature" skipped