Jakub Kicinski b568d3072a Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicts: drivers/net/ethernet/intel/ice/ice_main.c 418e53401e ("ice: move devlink port creation/deletion") 643ef23bd9 ("ice: Introduce local var for readability") https://lore.kernel.org/all/20230127124025.0dacef40@canb.auug.org.au/ https://lore.kernel.org/all/20230124005714.3996270-1-anthony.l.nguyen@intel.com/ drivers/net/ethernet/engleder/tsnep_main.c 3d53aaef43 ("tsnep: Fix TX queue stop/wake for multiple queues") 25faa6a4c5 ("tsnep: Replace TX spin_lock with __netif_tx_lock") https://lore.kernel.org/all/20230127123604.36bb3e99@canb.auug.org.au/ net/netfilter/nf_conntrack_proto_sctp.c 13bd9b31a9 ("Revert "netfilter: conntrack: add sctp DATA_SENT state"") a44b765148 ("netfilter: conntrack: unify established states for SCTP paths") f71cb8f45d ("netfilter: conntrack: sctp: use nf log infrastructure for invalid packets") https://lore.kernel.org/all/20230127125052.674281f9@canb.auug.org.au/ https://lore.kernel.org/all/d36076f3-6add-a442-6d4b-ead9f7ffff86@tessares.net/ Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2023-01-27 22:56:18 -08:00
..
netxen	net: drop the weight argument from netif_napi_add	2022-09-28 18:57:14 -07:00
qed	qed: remove pointless call to devlink_param_driverinit_value_set()	2023-01-27 12:32:02 +00:00
qede	qede: execute xdp_do_flush() before napi_complete_done()	2023-01-27 22:27:59 -08:00
qlcnic	qlcnic: prevent ->dcb use-after-free on qlcnic_dcb_enable() failure	2022-12-26 09:01:36 +00:00
Kconfig	ethernet: fix PTP_1588_CLOCK dependencies	2021-08-13 17:49:05 -07:00
Makefile
qla3xxx.c	net/qla3xxx: fix potential memleak in ql3xxx_send()	2022-11-18 19:39:05 -08:00
qla3xxx.h	net/qla3xxx: Convert to SPDX license identifiers	2020-09-16 14:32:31 +02:00