linux-kernel - linux-next: manual merge of the net-next tree with the s390 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: <aNKbgf7GyU5JP3Zh@finisterre.sirena.org.uk>
Date: Tue, 23 Sep 2025 15:07:13 +0200
From: Mark Brown <broonie@...nel.org>
To: David Miller <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>,
	Paolo Abeni <pabeni@...hat.com>,
	Networking <netdev@...r.kernel.org>
Cc: Alexander Gordeev <agordeev@...ux.ibm.com>,
	Alexandra Winter <wintera@...ux.ibm.com>,
	Hendrik Brueckner <brueckner@...ux.ibm.com>,
	Julian Ruess <julianr@...ux.ibm.com>,
	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 s390 tree

Hi all,

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

  arch/s390/configs/defconfig
  arch/s390/configs/debug_defconfig

between commit:

  e11727b2b0ca2 ("s390/configs: Enable additional network features")

from the s390 tree and commits:

  d324a2ca3f8ef ("dibs: Register smc as dibs_client")
  cb990a45d7f6e ("dibs: Define dibs loopback")
  69baaac9361ed ("dibs: Define dibs_client_ops and dibs_dev_ops")
  a612dbe8d04d4 ("dibs: Move event handling to dibs layer")

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.

diff --cc arch/s390/configs/debug_defconfig
index b692c95f8083a,fdde8ee0d7bdd..0000000000000
--- a/arch/s390/configs/debug_defconfig
+++ b/arch/s390/configs/debug_defconfig
@@@ -118,15 -118,12 +118,17 @@@ CONFIG_PACKET=
  CONFIG_PACKET_DIAG=m
  CONFIG_UNIX=y
  CONFIG_UNIX_DIAG=m
 +CONFIG_TLS=m
 +CONFIG_TLS_DEVICE=y
 +CONFIG_TLS_TOE=y
  CONFIG_XFRM_USER=m
  CONFIG_NET_KEY=m
 +CONFIG_XDP_SOCKETS=y
 +CONFIG_XDP_SOCKETS_DIAG=m
+ CONFIG_DIBS=y
+ CONFIG_DIBS_LO=y
+ CONFIG_SMC=m
  CONFIG_SMC_DIAG=m
- CONFIG_SMC_LO=y
  CONFIG_INET=y
  CONFIG_IP_MULTICAST=y
  CONFIG_IP_ADVANCED_ROUTER=y
diff --cc arch/s390/configs/defconfig
index 22c801449139c,bf9e7dbd4a895..0000000000000
--- a/arch/s390/configs/defconfig
+++ b/arch/s390/configs/defconfig
@@@ -109,15 -109,12 +109,17 @@@ CONFIG_PACKET=
  CONFIG_PACKET_DIAG=m
  CONFIG_UNIX=y
  CONFIG_UNIX_DIAG=m
 +CONFIG_TLS=m
 +CONFIG_TLS_DEVICE=y
 +CONFIG_TLS_TOE=y
  CONFIG_XFRM_USER=m
  CONFIG_NET_KEY=m
 +CONFIG_XDP_SOCKETS=y
 +CONFIG_XDP_SOCKETS_DIAG=m
+ CONFIG_DIBS=y
+ CONFIG_DIBS_LO=y
+ CONFIG_SMC=m
  CONFIG_SMC_DIAG=m
- CONFIG_SMC_LO=y
  CONFIG_INET=y
  CONFIG_IP_MULTICAST=y
  CONFIG_IP_ADVANCED_ROUTER=y

Download attachment "signature.asc" of type "application/pgp-signature" (485 bytes)