Sync with kernel-6.0

Fix conflicts when rebasing after tmb changes

5 files changed, 12 insertions, 4 deletions

diff --git a/images/NEWS b/images/NEWS
index 9061b7bd6..841f2c127 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,5 @@
+- Sync with kernel 6.0
+
 Version 2.88 -  9 February 2023 by Thomas Backlund
 
 - Sync with kernel 5.19
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index 712b479b3..3c4241a89 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -23,17 +23,17 @@ our %l = (
         qw(iph5526), #- fibre channel
         qw(i40evf jme lance ne nfp ni5010 ni52 ni65 mv88e6060 nvnet),
         qw(prism2_plx qlge r6040 rcpci realtek-smi rhineget),
-        qw(sb1000 sc92031 sh_eth smc-ultra smsc911x smc9194 smsc9420 smsc95xx),
+        qw(sb1000 sc92031 sfc-siena sh_eth smc-ultra smsc911x smc9194 smsc9420 smsc95xx),
         qw(tc35815 tlan uli526x ),
         qw(b44 com20020-pci de2104x),
         qw(defxx), # most unused
         qw(dgrs e100 eepro100 epic100 fealnx hamachi mana mlx5_core mlxsw_pci natsemi),
         qw(ne2k-pci pcnet32 plip qede sis900 skfp starfire stmmac-platform tulip),
-        qw(typhoon via-rhine winbond-840 xgene-enet xilinx_emac forcedeth),
+        qw(txgbe typhoon via-rhine winbond-840 xgene-enet xilinx_emac forcedeth),
         qw(sungem sunhme), # drivers for ultrasparc, but compiled in ix86 kernels...
       qw(3c59x 8139too 8139cp cpmac niu sundance), #rtl8139
       # add all phys
-      qw(adin adin1100 amd aquantia at803x ax88796b bcm7xxx bcm87xx broadcom cicada cortina davicom dp83848 dp83867 dp83869 et1011c fixed_phy icplus intel-xway),
+      qw(adin adin1100 amd aquantia at803x ax88796b bcm7xxx bcm87xx broadcom cicada cortina davicom dp83848 dp83867 dp83869 dp83td510 et1011c fixed_phy icplus intel-xway),
       qw(lxt marwell macb macb_pci marwell10g marvell-88x2222 mdio-bcm-unimac mdio-bitbang mdio-cavium mdio_devres mdio-gpio mdio-i2c),
       qw(mdio-mscc-mii mdio-thunder mdio-xpcs mediatek-ge micrel microchip microchip_t1 motorcomm mscc national nxp-tja11xx phylink),
       qw(phy-bcm-kona-usb2 phy-cpcap-usb phy-exynos-usb2 phy-intel-emmc phy-intel-lgm-emmc phy-can-transceiver phy-lgm-usb phy-pxa-28nm-hsic),
@@ -176,7 +176,7 @@ our %l = (
 	    hid-cherry hid-chicony hid-cmedia hid-corsair hid-cougar hid-cp2112 hid-creative-sb0540 hid-cypress hid-dr hid-drff hid-elan hid-elecom hid-elo hid-emsff
 	    hid-ezkey hid-gaff hid-gembird hid-generic hid-gfrm hid-google-hammer hid-gt683r hid-gyration hid-holtek-kbd hid-holtekff hid-holtek-mouse
 	    hid-hyperv hid-icade hid-ite hid-jabra hid-kensington hid-keytouch hid-kye hid-lcpower hid-led hid-lenovo hid-lenovo-tpkbd hid-lg-g15
-	    hid-logitech hid-logitech-dj hid-logitech-hidpp hid-macally hid-magicmouse hid-mf hid-microsoft hid-monterey
+	    hid-logitech hid-logitech-dj hid-logitech-hidpp hid-macally hid-magicmouse hid-megaworld hid-mf hid-microsoft hid-monterey
 	    hid-multilaser hid-multitouch hid-nintendo hid-ntrig hid-ortek hid-penmount hid-petalynx hid-picolcd
 	    hid-pl hid-plantronics hid-playstation hid-primax hid-prodikeys hid_razer hid_redragon hid-retrode hid-roccat hid-roccat-arvo hid-roccat-common hid-rmi
 	    hid-roccat-isku hid-roccat-kone hid-roccat-koneplus hid-roccat-konepure hid-roccat-kovaplus hid-roccat-lua
diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS
index 5c3bd3ec2..f6ff20a3e 100644
--- a/mdk-stage1/NEWS
+++ b/mdk-stage1/NEWS
@@ -1,3 +1,5 @@
+- Sync with kernel 6.0
+
 2.60
 
 - Sync with kernel 5.17
diff --git a/perl-install/NEWS b/perl-install/NEWS
index a941e5a7e..a6c2b74dd 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- Recognize new kernel 6.0 drivers
+
 Version 18.56 -  9 February 2023
 
 - update list of kernel modules needing firmware
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index e5405a4ff..78f46304b 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- Recognize new kernel 6.0 drivers
+
 Version 18.56 -  9 February 2023
 
 - Recognize new kernel 5.19 drivers