linux-stable/drivers/net/ethernet/renesas
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: ethernet: renesas: rswitch: Fix build error about ptp 2022-11-14 18:37:20 -08:00
Makefile net: ethernet: renesas: rswitch: Add R-Car Gen4 gPTP support 2022-11-02 12:38:53 +00:00
ravb.h ravb: Add RZ/G2L MII interface support 2022-09-20 08:39:46 -07:00
ravb_main.c net: ravb: Fix possible hang if RIS2_QFF1 happen 2023-01-25 13:00:27 +00:00
ravb_ptp.c ptp: ravb: convert to .adjfine and adjust_by_scaled_ppm 2022-10-31 11:14:16 +00:00
rcar_gen4_ptp.c net: ethernet: renesas: rswitch: Add R-Car Gen4 gPTP support 2022-11-02 12:38:53 +00:00
rcar_gen4_ptp.h net: ethernet: renesas: rswitch: Add R-Car Gen4 gPTP support 2022-11-02 12:38:53 +00:00
rswitch.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2023-01-27 22:56:18 -08:00
rswitch.h net: ethernet: renesas: rswitch: Fix ethernet-ports handling 2023-01-20 18:18:44 -08:00
sh_eth.c net: mdio: mdio-bitbang: Separate C22 and C45 transactions 2023-01-10 15:53:36 -08:00
sh_eth.h sh_eth: place RX/TX descriptor *enum*s after their *struct*s 2021-03-12 17:50:42 -08:00