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
..
Kconfig	net: dsa: microchip: ptp: add the posix clock support	2023-01-13 08:40:40 +00:00
ksz8.h	net: dsa: microchip: ksz8: add MTU configuration support	2022-12-07 11:57:58 +01:00
ksz8795_reg.h	net: dsa: microchip: ksz8: add MTU configuration support	2022-12-07 11:57:58 +01:00
ksz8795.c	net: dsa: microchip: ksz8: move all DSA configurations to one location	2022-12-07 11:57:58 +01:00
ksz8863_smi.c	net: dsa: microchip: add dev_err_probe in probe functions	2022-11-09 13:06:01 +00:00
ksz9477_i2c.c	net: dsa: microchip: fix probe of I2C-connected KSZ8563	2023-01-23 21:40:54 -08:00
ksz9477_reg.h	net: dsa: microchip: add support for credit based shaper	2023-01-23 22:12:35 -08:00
ksz9477.c	net: dsa: microchip: add support for credit based shaper	2023-01-23 22:12:35 -08:00
ksz9477.h	net: dsa: microchip: add support for credit based shaper	2023-01-23 22:12:35 -08:00
ksz_common.c	net: dsa: microchip: add support for credit based shaper	2023-01-23 22:12:35 -08:00
ksz_common.h	net: dsa: microchip: add support for credit based shaper	2023-01-23 22:12:35 -08:00
ksz_ptp_reg.h	net: dsa: microchip: ptp: lan937x: Enable periodic output in LED pins	2023-01-13 08:40:41 +00:00
ksz_ptp.c	net: dsa: microchip: ptp: Fix error code in ksz_hwtstamp_set()	2023-01-19 18:57:16 -08:00
ksz_ptp.h	net: dsa: microchip: ptp: add support for perout programmable pins	2023-01-13 08:40:41 +00:00
ksz_spi.c	net: dsa: microchip: add dev_err_probe in probe functions	2022-11-09 13:06:01 +00:00
lan937x_main.c	net: dsa: microchip: add support for credit based shaper	2023-01-23 22:12:35 -08:00
lan937x_reg.h	net: dsa: microchip: add support for credit based shaper	2023-01-23 22:12:35 -08:00
lan937x.h	net: dsa: microchip: add support for credit based shaper	2023-01-23 22:12:35 -08:00
Makefile	net: dsa: microchip: ptp: add the posix clock support	2023-01-13 08:40:40 +00:00