[openwrt/openwrt] kernel: bump 5.10 to 5.10.127
LEDE Commits
lede-commits at lists.infradead.org
Wed Jun 29 15:37:00 PDT 2022
hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/433dc5892a60003753655aac6e6a4b59fb13b2e4
commit 433dc5892a60003753655aac6e6a4b59fb13b2e4
Author: John Audia <therealgraysky at proton.me>
AuthorDate: Wed Jun 29 04:22:49 2022 -0400
kernel: bump 5.10 to 5.10.127
All patches automatically rebased.
Signed-off-by: John Audia <therealgraysky at proton.me>
---
include/kernel-5.10 | 4 ++--
.../patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch | 2 +-
...-netfilter-nftables-update-table-flags-from-the-commi.patch | 4 ++--
target/linux/generic/hack-5.10/720-net-phy-add-aqr-phys.patch | 10 +++++-----
.../722-net-phy-aquantia-enable-AQR112-and-AQR412.patch | 8 ++++----
.../723-net-phy-aquantia-fix-system-side-protocol-mi.patch | 2 +-
.../724-net-phy-aquantia-Add-AQR113-driver-support.patch | 4 ++--
.../725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch | 4 ++--
.../generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch | 2 +-
9 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/include/kernel-5.10 b/include/kernel-5.10
index da4b922966..658767af33 100644
--- a/include/kernel-5.10
+++ b/include/kernel-5.10
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .126
-LINUX_KERNEL_HASH-5.10.126 = 91054369e893ffc5ddab5c9e2470f31631924eab1a8faff56a3d04bc7b2d4f63
+LINUX_VERSION-5.10 = .127
+LINUX_KERNEL_HASH-5.10.127 = 419233ee0b1ee1dc2be8abf1b241545d10dad19d95f237180d6ccdc0cd221580
diff --git a/target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch b/target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch
index bdf484c4e4..e2b864df99 100644
--- a/target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch
+++ b/target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch
@@ -13,7 +13,7 @@ produce a noisy warning.
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
-@@ -283,6 +283,7 @@ static void xhci_pci_quirks(struct devic
+@@ -287,6 +287,7 @@ static void xhci_pci_quirks(struct devic
pdev->device == 0x0015) {
xhci->quirks |= XHCI_RESET_ON_RESUME;
xhci->quirks |= XHCI_ZERO_64B_REGS;
diff --git a/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch b/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch
index 9a42cb12d3..e32bcfa4a7 100644
--- a/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch
+++ b/target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch
@@ -70,7 +70,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
nft_trans_table_update(trans) = true;
list_add_tail(&trans->list, &ctx->net->nft.commit_list);
return 0;
-@@ -7910,11 +7914,10 @@ static int nf_tables_commit(struct net *
+@@ -7916,11 +7920,10 @@ static int nf_tables_commit(struct net *
switch (trans->msg_type) {
case NFT_MSG_NEWTABLE:
if (nft_trans_table_update(trans)) {
@@ -86,7 +86,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
} else {
nft_clear(net, trans->ctx.table);
}
-@@ -8127,11 +8130,9 @@ static int __nf_tables_abort(struct net
+@@ -8133,11 +8136,9 @@ static int __nf_tables_abort(struct net
switch (trans->msg_type) {
case NFT_MSG_NEWTABLE:
if (nft_trans_table_update(trans)) {
diff --git a/target/linux/generic/hack-5.10/720-net-phy-add-aqr-phys.patch b/target/linux/generic/hack-5.10/720-net-phy-add-aqr-phys.patch
index 4d4420aa2f..f7dd2f7187 100644
--- a/target/linux/generic/hack-5.10/720-net-phy-add-aqr-phys.patch
+++ b/target/linux/generic/hack-5.10/720-net-phy-add-aqr-phys.patch
@@ -20,7 +20,7 @@ Signed-off-by: Birger Koblitz <git at birger-koblitz.de>
#define MDIO_PHYXS_VEND_IF_STATUS 0xe812
#define MDIO_PHYXS_VEND_IF_STATUS_TYPE_MASK GENMASK(7, 3)
-@@ -330,6 +332,49 @@ static int aqr107_read_rate(struct phy_d
+@@ -343,6 +345,49 @@ static int aqr107_read_rate(struct phy_d
return 0;
}
@@ -70,7 +70,7 @@ Signed-off-by: Birger Koblitz <git at birger-koblitz.de>
static int aqr107_read_status(struct phy_device *phydev)
{
int val, ret;
-@@ -460,7 +505,7 @@ static void aqr107_chip_info(struct phy_
+@@ -473,7 +518,7 @@ static void aqr107_chip_info(struct phy_
build_id = FIELD_GET(VEND1_GLOBAL_RSVD_STAT1_FW_BUILD_ID, val);
prov_id = FIELD_GET(VEND1_GLOBAL_RSVD_STAT1_PROV_ID, val);
@@ -79,7 +79,7 @@ Signed-off-by: Birger Koblitz <git at birger-koblitz.de>
fw_major, fw_minor, build_id, prov_id);
}
-@@ -632,6 +677,24 @@ static struct phy_driver aqr_driver[] =
+@@ -645,6 +690,24 @@ static struct phy_driver aqr_driver[] =
.link_change_notify = aqr107_link_change_notify,
},
{
@@ -104,7 +104,7 @@ Signed-off-by: Birger Koblitz <git at birger-koblitz.de>
PHY_ID_MATCH_MODEL(PHY_ID_AQCS109),
.name = "Aquantia AQCS109",
.probe = aqr107_probe,
-@@ -657,6 +720,24 @@ static struct phy_driver aqr_driver[] =
+@@ -670,6 +733,24 @@ static struct phy_driver aqr_driver[] =
.ack_interrupt = aqr_ack_interrupt,
.read_status = aqr_read_status,
},
@@ -129,7 +129,7 @@ Signed-off-by: Birger Koblitz <git at birger-koblitz.de>
};
module_phy_driver(aqr_driver);
-@@ -667,8 +748,10 @@ static struct mdio_device_id __maybe_unu
+@@ -680,8 +761,10 @@ static struct mdio_device_id __maybe_unu
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR105) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR106) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR107) },
diff --git a/target/linux/generic/hack-5.10/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch b/target/linux/generic/hack-5.10/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch
index e3541400d7..ae85a21f97 100644
--- a/target/linux/generic/hack-5.10/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch
+++ b/target/linux/generic/hack-5.10/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch
@@ -27,7 +27,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean at nxp.com>
#define PHY_ID_AQR813 0x31c31cb2
#define MDIO_PHYXS_VEND_IF_STATUS 0xe812
-@@ -123,6 +125,29 @@
+@@ -125,6 +127,29 @@
#define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL2 BIT(1)
#define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL3 BIT(0)
@@ -57,7 +57,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean at nxp.com>
struct aqr107_hw_stat {
const char *name;
int reg;
-@@ -243,6 +268,51 @@ static int aqr_config_aneg(struct phy_de
+@@ -256,6 +281,51 @@ static int aqr_config_aneg(struct phy_de
return genphy_c45_check_and_restart_aneg(phydev, changed);
}
@@ -109,7 +109,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean at nxp.com>
static int aqr_config_intr(struct phy_device *phydev)
{
bool en = phydev->interrupts == PHY_INTERRUPT_ENABLED;
-@@ -738,6 +808,30 @@ static struct phy_driver aqr_driver[] =
+@@ -751,6 +821,30 @@ static struct phy_driver aqr_driver[] =
.get_stats = aqr107_get_stats,
.link_change_notify = aqr107_link_change_notify,
},
@@ -140,7 +140,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean at nxp.com>
};
module_phy_driver(aqr_driver);
-@@ -748,9 +842,11 @@ static struct mdio_device_id __maybe_unu
+@@ -761,9 +855,11 @@ static struct mdio_device_id __maybe_unu
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR105) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR106) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR107) },
diff --git a/target/linux/generic/hack-5.10/723-net-phy-aquantia-fix-system-side-protocol-mi.patch b/target/linux/generic/hack-5.10/723-net-phy-aquantia-fix-system-side-protocol-mi.patch
index 9c5df905bb..5ce07c9aa4 100644
--- a/target/linux/generic/hack-5.10/723-net-phy-aquantia-fix-system-side-protocol-mi.patch
+++ b/target/linux/generic/hack-5.10/723-net-phy-aquantia-fix-system-side-protocol-mi.patch
@@ -14,7 +14,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean at nxp.com>
--- a/drivers/net/phy/aquantia_main.c
+++ b/drivers/net/phy/aquantia_main.c
-@@ -301,10 +301,16 @@ static int aqr_config_aneg_set_prot(stru
+@@ -314,10 +314,16 @@ static int aqr_config_aneg_set_prot(stru
phy_write_mmd(phydev, MDIO_MMD_VEND1, AQUANTIA_VND1_GSTART_RATE,
aquantia_syscfg[if_type].start_rate);
diff --git a/target/linux/generic/hack-5.10/724-net-phy-aquantia-Add-AQR113-driver-support.patch b/target/linux/generic/hack-5.10/724-net-phy-aquantia-Add-AQR113-driver-support.patch
index 7a661309f9..5d7213957e 100644
--- a/target/linux/generic/hack-5.10/724-net-phy-aquantia-Add-AQR113-driver-support.patch
+++ b/target/linux/generic/hack-5.10/724-net-phy-aquantia-Add-AQR113-driver-support.patch
@@ -18,7 +18,7 @@ Add a new entry for AQR113 PHY_ID
#define PHY_ID_AQR113C 0x31c31c12
#define PHY_ID_AQCS109 0x03a1b5c2
#define PHY_ID_AQR405 0x03a1b4b0
-@@ -827,6 +828,14 @@ static struct phy_driver aqr_driver[] =
+@@ -840,6 +841,14 @@ static struct phy_driver aqr_driver[] =
.get_stats = aqr107_get_stats,
},
{
@@ -33,7 +33,7 @@ Add a new entry for AQR113 PHY_ID
PHY_ID_MATCH_MODEL(PHY_ID_AQR412),
.name = "Aquantia AQR412",
.probe = aqr107_probe,
-@@ -849,6 +858,7 @@ static struct mdio_device_id __maybe_unu
+@@ -862,6 +871,7 @@ static struct mdio_device_id __maybe_unu
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR106) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR107) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR112) },
diff --git a/target/linux/generic/hack-5.10/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch b/target/linux/generic/hack-5.10/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch
index 40ad0ff583..a307a8f399 100644
--- a/target/linux/generic/hack-5.10/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch
+++ b/target/linux/generic/hack-5.10/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch
@@ -21,7 +21,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
#define PHY_ID_AQR113 0x31c31c40
#define PHY_ID_AQR113C 0x31c31c12
#define PHY_ID_AQCS109 0x03a1b5c2
-@@ -828,6 +830,30 @@ static struct phy_driver aqr_driver[] =
+@@ -841,6 +843,30 @@ static struct phy_driver aqr_driver[] =
.get_stats = aqr107_get_stats,
},
{
@@ -52,7 +52,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
PHY_ID_MATCH_MODEL(PHY_ID_AQR113),
.name = "Aquantia AQR113",
.config_aneg = aqr_config_aneg,
-@@ -858,6 +884,8 @@ static struct mdio_device_id __maybe_unu
+@@ -871,6 +897,8 @@ static struct mdio_device_id __maybe_unu
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR106) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR107) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR112) },
diff --git a/target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch
index bdbab68ee1..344ba809a9 100644
--- a/target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch
+++ b/target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch
@@ -19,7 +19,7 @@
#define QUECTEL_VENDOR_ID 0x2c7c
/* These Quectel products use Quectel's vendor ID */
-@@ -1131,6 +1133,11 @@ static const struct usb_device_id option
+@@ -1133,6 +1135,11 @@ static const struct usb_device_id option
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0, 0) },
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
.driver_info = RSVD(4) },
More information about the lede-commits
mailing list