netdev - linux-next: manual merge of the block tree with the net-next 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20250228144916.3f5905cf@canb.auug.org.au>
Date: Fri, 28 Feb 2025 14:49:16 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jens Axboe <axboe@...nel.dk>, David Miller <davem@...emloft.net>, Jakub
 Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>
Cc: Networking <netdev@...r.kernel.org>, David Wei <dw@...idwei.uk>, 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 block tree with the net-next tree

Hi all,

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

  tools/testing/selftests/drivers/net/hw/Makefile

between commit:

  185646a8a0a8 ("selftests: drv-net: add tests for napi IRQ affinity notifiers")

from the net-next tree and commit:

  71082faa2c64 ("io_uring/zcrx: add selftest")

from the block 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 tools/testing/selftests/drivers/net/hw/Makefile
index cde5814ff9a7,7efc47c89463..000000000000
--- a/tools/testing/selftests/drivers/net/hw/Makefile
+++ b/tools/testing/selftests/drivers/net/hw/Makefile
@@@ -10,7 -12,7 +12,8 @@@ TEST_PROGS = 
  	ethtool_rmon.sh \
  	hw_stats_l3.sh \
  	hw_stats_l3_gre.sh \
+ 	iou-zcrx.py \
 +	irq.py \
  	loopback.sh \
  	nic_link_layer.py \
  	nic_performance.py \
@@@ -43,4 -42,4 +46,6 @@@ include ../../../lib.m
  YNL_GENS := ethtool netdev
  include ../../../net/ynl.mk
  
+ $(OUTPUT)/iou-zcrx: LDLIBS += -luring
++
 +include ../../../net/bpf.mk

Content of type "application/pgp-signature" skipped