From: John Audia Date: Tue, 12 Jul 2022 15:52:59 +0000 (-0400) Subject: kernel: bump 5.15 to 5.15.54 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e4af991220638d4bb32e4668435d140afe232b25;p=openwrt%2Fstaging%2Fthess.git kernel: bump 5.15 to 5.15.54 All patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia --- diff --git a/include/kernel-5.15 b/include/kernel-5.15 index 6f4d3057fb..3b3f0df3d8 100644 --- a/include/kernel-5.15 +++ b/include/kernel-5.15 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.15 = .53 -LINUX_KERNEL_HASH-5.15.53 = f3aa717243051f3fcca90ebfe26fe5c3a596c2f6047846e8d1724ea90df77b07 +LINUX_VERSION-5.15 = .54 +LINUX_KERNEL_HASH-5.15.54 = 594f548bb0a73e9c08deef838836c984666709687257a624c5ccaf9ae056ce4d diff --git a/target/linux/bcm27xx/patches-5.15/950-0067-fbdev-add-FBIOCOPYAREA-ioctl.patch b/target/linux/bcm27xx/patches-5.15/950-0067-fbdev-add-FBIOCOPYAREA-ioctl.patch index 5f2a237e2b..2b2a5f50ff 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0067-fbdev-add-FBIOCOPYAREA-ioctl.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0067-fbdev-add-FBIOCOPYAREA-ioctl.patch @@ -244,7 +244,7 @@ Signed-off-by: Dave Stevenson static int bcm2708_fb_register(struct bcm2708_fb *fb) --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c -@@ -1086,6 +1086,30 @@ fb_blank(struct fb_info *info, int blank +@@ -1096,6 +1096,30 @@ fb_blank(struct fb_info *info, int blank } EXPORT_SYMBOL(fb_blank); @@ -275,7 +275,7 @@ Signed-off-by: Dave Stevenson static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) { -@@ -1094,6 +1118,7 @@ static long do_fb_ioctl(struct fb_info * +@@ -1104,6 +1128,7 @@ static long do_fb_ioctl(struct fb_info * struct fb_fix_screeninfo fix; struct fb_cmap cmap_from; struct fb_cmap_user cmap; @@ -283,7 +283,7 @@ Signed-off-by: Dave Stevenson void __user *argp = (void __user *)arg; long ret = 0; -@@ -1169,6 +1194,15 @@ static long do_fb_ioctl(struct fb_info * +@@ -1181,6 +1206,15 @@ static long do_fb_ioctl(struct fb_info * unlock_fb_info(info); console_unlock(); break; @@ -299,7 +299,7 @@ Signed-off-by: Dave Stevenson default: lock_fb_info(info); fb = info->fbops; -@@ -1308,6 +1342,7 @@ static long fb_compat_ioctl(struct file +@@ -1320,6 +1354,7 @@ static long fb_compat_ioctl(struct file case FBIOPAN_DISPLAY: case FBIOGET_CON2FBMAP: case FBIOPUT_CON2FBMAP: diff --git a/target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch b/target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch index 67e8731f67..4f94a9f11d 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch @@ -25,7 +25,7 @@ Signed-off-by: Naushir Patuck --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -17525,6 +17525,14 @@ T: git git://linuxtv.org/media_tree.git +@@ -17526,6 +17526,14 @@ T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml F: drivers/media/i2c/imx412.c diff --git a/target/linux/bcm27xx/patches-5.15/950-0413-Documentation-devicetree-Add-documentation-for-imx37.patch b/target/linux/bcm27xx/patches-5.15/950-0413-Documentation-devicetree-Add-documentation-for-imx37.patch index a62b97f70d..8c75f80baa 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0413-Documentation-devicetree-Add-documentation-for-imx37.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0413-Documentation-devicetree-Add-documentation-for-imx37.patch @@ -132,7 +132,7 @@ Signed-off-by: David Plowman +... --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -17539,6 +17539,7 @@ M: Raspberry Pi Kernel Maintenance --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c -@@ -1908,6 +1908,8 @@ static const struct usb_audio_quirk_flag +@@ -1912,6 +1912,8 @@ static const struct usb_audio_quirk_flag QUIRK_FLAG_ALIGN_TRANSFER), DEVICE_FLG(0x1224, 0x2a25, /* Jieli Technology USB PHY 2.0 */ QUIRK_FLAG_GET_SAMPLE_RATE), diff --git a/target/linux/bcm27xx/patches-5.15/950-0520-dt-bindings-media-i2c-Add-IMX519-CMOS-sensor-binding.patch b/target/linux/bcm27xx/patches-5.15/950-0520-dt-bindings-media-i2c-Add-IMX519-CMOS-sensor-binding.patch index 54a751c654..53c6646cab 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0520-dt-bindings-media-i2c-Add-IMX519-CMOS-sensor-binding.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0520-dt-bindings-media-i2c-Add-IMX519-CMOS-sensor-binding.patch @@ -132,7 +132,7 @@ Signed-off-by: Lee Jackson +... --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -17543,6 +17543,14 @@ F: Documentation/devicetree/bindings/med +@@ -17544,6 +17544,14 @@ F: Documentation/devicetree/bindings/med F: Documentation/devicetree/bindings/media/i2c/imx477.yaml F: drivers/media/i2c/imx477.c diff --git a/target/linux/bcm27xx/patches-5.15/950-0880-Revert-fbdev-Fix-unregistering-of-framebuffers-witho.patch b/target/linux/bcm27xx/patches-5.15/950-0880-Revert-fbdev-Fix-unregistering-of-framebuffers-witho.patch index 66412360bf..b609b65246 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0880-Revert-fbdev-Fix-unregistering-of-framebuffers-witho.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0880-Revert-fbdev-Fix-unregistering-of-framebuffers-witho.patch @@ -11,7 +11,7 @@ This reverts commit 2388f826cdc9af2651991adc0feb79de9bdf2232. --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c -@@ -1616,14 +1616,7 @@ static void do_remove_conflicting_frameb +@@ -1628,14 +1628,7 @@ static void do_remove_conflicting_frameb * If it's not a platform device, at least print a warning. A * fix would add code to remove the device from the system. */ diff --git a/target/linux/bcm27xx/patches-5.15/950-0881-Revert-fbdev-Hot-unplug-firmware-fb-devices-on-force.patch b/target/linux/bcm27xx/patches-5.15/950-0881-Revert-fbdev-Hot-unplug-firmware-fb-devices-on-force.patch index b28d29cc89..870e59a6a5 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0881-Revert-fbdev-Hot-unplug-firmware-fb-devices-on-force.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0881-Revert-fbdev-Hot-unplug-firmware-fb-devices-on-force.patch @@ -20,7 +20,7 @@ This reverts commit c894ac44786cfed383a6c6b20c1bfb12eb96018a. #include #include #include -@@ -1593,36 +1592,18 @@ static void do_remove_conflicting_frameb +@@ -1605,36 +1604,18 @@ static void do_remove_conflicting_frameb /* check all firmware fbs and kick off if the base addr overlaps */ for_each_registered_fb(i) { struct apertures_struct *gen_aper; @@ -58,7 +58,7 @@ This reverts commit c894ac44786cfed383a6c6b20c1bfb12eb96018a. } } } -@@ -1949,13 +1930,9 @@ EXPORT_SYMBOL(register_framebuffer); +@@ -1961,13 +1942,9 @@ EXPORT_SYMBOL(register_framebuffer); void unregister_framebuffer(struct fb_info *fb_info) { diff --git a/target/linux/generic/backport-5.15/747-v5.16-12-net-dsa-qca8k-add-support-for-QCA8328.patch b/target/linux/generic/backport-5.15/747-v5.16-12-net-dsa-qca8k-add-support-for-QCA8328.patch index 70f227fb69..b300621e63 100644 --- a/target/linux/generic/backport-5.15/747-v5.16-12-net-dsa-qca8k-add-support-for-QCA8328.patch +++ b/target/linux/generic/backport-5.15/747-v5.16-12-net-dsa-qca8k-add-support-for-QCA8328.patch @@ -42,7 +42,7 @@ Signed-off-by: David S. Miller if (ret) return ret; } -@@ -2105,7 +2112,12 @@ static int qca8k_resume(struct device *d +@@ -2124,7 +2131,12 @@ static int qca8k_resume(struct device *d static SIMPLE_DEV_PM_OPS(qca8k_pm_ops, qca8k_suspend, qca8k_resume); @@ -56,7 +56,7 @@ Signed-off-by: David S. Miller .id = QCA8K_ID_QCA8327, }; -@@ -2114,7 +2126,8 @@ static const struct qca8k_match_data qca +@@ -2133,7 +2145,8 @@ static const struct qca8k_match_data qca }; static const struct of_device_id qca8k_of_match[] = { diff --git a/target/linux/generic/backport-5.15/754-net-next-net-dsa-qca8k-convert-to-GENMASK_FIELD_PREP_FIELD_GET.patch b/target/linux/generic/backport-5.15/754-net-next-net-dsa-qca8k-convert-to-GENMASK_FIELD_PREP_FIELD_GET.patch index 408a59df85..2cea88089d 100644 --- a/target/linux/generic/backport-5.15/754-net-next-net-dsa-qca8k-convert-to-GENMASK_FIELD_PREP_FIELD_GET.patch +++ b/target/linux/generic/backport-5.15/754-net-next-net-dsa-qca8k-convert-to-GENMASK_FIELD_PREP_FIELD_GET.patch @@ -218,7 +218,7 @@ Signed-off-by: David S. Miller mask); } -@@ -1916,11 +1911,11 @@ qca8k_port_vlan_filtering(struct dsa_swi +@@ -1935,11 +1930,11 @@ qca8k_port_vlan_filtering(struct dsa_swi if (vlan_filtering) { ret = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port), @@ -232,7 +232,7 @@ Signed-off-by: David S. Miller QCA8K_PORT_LOOKUP_VLAN_MODE_NONE); } -@@ -1944,10 +1939,9 @@ qca8k_port_vlan_add(struct dsa_switch *d +@@ -1963,10 +1958,9 @@ qca8k_port_vlan_add(struct dsa_switch *d } if (pvid) { @@ -245,7 +245,7 @@ Signed-off-by: David S. Miller if (ret) return ret; -@@ -2041,7 +2035,7 @@ static int qca8k_read_switch_id(struct q +@@ -2060,7 +2054,7 @@ static int qca8k_read_switch_id(struct q if (ret < 0) return -ENODEV; @@ -254,7 +254,7 @@ Signed-off-by: David S. Miller if (id != data->id) { dev_err(priv->dev, "Switch id detected %x but expected %x", id, data->id); return -ENODEV; -@@ -2050,7 +2044,7 @@ static int qca8k_read_switch_id(struct q +@@ -2069,7 +2063,7 @@ static int qca8k_read_switch_id(struct q priv->switch_id = id; /* Save revision to communicate to the internal PHY driver */ diff --git a/target/linux/generic/backport-5.15/756-net-next-net-dsa-qca8k-move-regmap-init-in-probe-and-set-it.patch b/target/linux/generic/backport-5.15/756-net-next-net-dsa-qca8k-move-regmap-init-in-probe-and-set-it.patch index f873b70d0f..44d938c53e 100644 --- a/target/linux/generic/backport-5.15/756-net-next-net-dsa-qca8k-move-regmap-init-in-probe-and-set-it.patch +++ b/target/linux/generic/backport-5.15/756-net-next-net-dsa-qca8k-move-regmap-init-in-probe-and-set-it.patch @@ -29,7 +29,7 @@ Signed-off-by: David S. Miller ret = qca8k_setup_mdio_bus(priv); if (ret) return ret; -@@ -2077,6 +2071,14 @@ qca8k_sw_probe(struct mdio_device *mdiod +@@ -2096,6 +2090,14 @@ qca8k_sw_probe(struct mdio_device *mdiod gpiod_set_value_cansleep(priv->reset_gpio, 0); } diff --git a/target/linux/generic/backport-5.15/758-net-next-net-dsa-qca8k-add-additional-MIB-counter-and-.patch b/target/linux/generic/backport-5.15/758-net-next-net-dsa-qca8k-add-additional-MIB-counter-and-.patch index 1465d1f35d..c8c050933b 100644 --- a/target/linux/generic/backport-5.15/758-net-next-net-dsa-qca8k-add-additional-MIB-counter-and-.patch +++ b/target/linux/generic/backport-5.15/758-net-next-net-dsa-qca8k-add-additional-MIB-counter-and-.patch @@ -80,7 +80,7 @@ Signed-off-by: David S. Miller } static int -@@ -2154,14 +2168,17 @@ static SIMPLE_DEV_PM_OPS(qca8k_pm_ops, +@@ -2173,14 +2187,17 @@ static SIMPLE_DEV_PM_OPS(qca8k_pm_ops, static const struct qca8k_match_data qca8327 = { .id = QCA8K_ID_QCA8327, .reduced_package = true, diff --git a/target/linux/generic/backport-5.15/759-net-next-net-dsa-qca8k-add-support-for-port-fast-aging.patch b/target/linux/generic/backport-5.15/759-net-next-net-dsa-qca8k-add-support-for-port-fast-aging.patch index 973446ec57..8ad7ab472d 100644 --- a/target/linux/generic/backport-5.15/759-net-next-net-dsa-qca8k-add-support-for-port-fast-aging.patch +++ b/target/linux/generic/backport-5.15/759-net-next-net-dsa-qca8k-add-support-for-port-fast-aging.patch @@ -33,7 +33,7 @@ Signed-off-by: David S. Miller static int qca8k_port_enable(struct dsa_switch *ds, int port, struct phy_device *phy) -@@ -1998,6 +2008,7 @@ static const struct dsa_switch_ops qca8k +@@ -2017,6 +2027,7 @@ static const struct dsa_switch_ops qca8k .port_stp_state_set = qca8k_port_stp_state_set, .port_bridge_join = qca8k_port_bridge_join, .port_bridge_leave = qca8k_port_bridge_leave, diff --git a/target/linux/generic/backport-5.15/760-net-next-net-dsa-qca8k-add-set_ageing_time-support.patch b/target/linux/generic/backport-5.15/760-net-next-net-dsa-qca8k-add-set_ageing_time-support.patch index 29530065a1..659e482405 100644 --- a/target/linux/generic/backport-5.15/760-net-next-net-dsa-qca8k-add-set_ageing_time-support.patch +++ b/target/linux/generic/backport-5.15/760-net-next-net-dsa-qca8k-add-set_ageing_time-support.patch @@ -56,7 +56,7 @@ Signed-off-by: David S. Miller qca8k_port_enable(struct dsa_switch *ds, int port, struct phy_device *phy) { -@@ -1999,6 +2023,7 @@ static const struct dsa_switch_ops qca8k +@@ -2018,6 +2042,7 @@ static const struct dsa_switch_ops qca8k .get_strings = qca8k_get_strings, .get_ethtool_stats = qca8k_get_ethtool_stats, .get_sset_count = qca8k_get_sset_count, diff --git a/target/linux/generic/backport-5.15/761-net-next-net-dsa-qca8k-add-support-for-mdb_add-del.patch b/target/linux/generic/backport-5.15/761-net-next-net-dsa-qca8k-add-support-for-mdb_add-del.patch index fa022d7ae6..8b97939ecb 100644 --- a/target/linux/generic/backport-5.15/761-net-next-net-dsa-qca8k-add-support-for-mdb_add-del.patch +++ b/target/linux/generic/backport-5.15/761-net-next-net-dsa-qca8k-add-support-for-mdb_add-del.patch @@ -102,7 +102,7 @@ Signed-off-by: David S. Miller qca8k_vlan_access(struct qca8k_priv *priv, enum qca8k_vlan_cmd cmd, u16 vid) { u32 reg; -@@ -1930,6 +2005,28 @@ qca8k_port_fdb_dump(struct dsa_switch *d +@@ -1949,6 +2024,28 @@ qca8k_port_fdb_dump(struct dsa_switch *d } static int @@ -131,7 +131,7 @@ Signed-off-by: David S. Miller qca8k_port_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering, struct netlink_ext_ack *extack) { -@@ -2037,6 +2134,8 @@ static const struct dsa_switch_ops qca8k +@@ -2056,6 +2153,8 @@ static const struct dsa_switch_ops qca8k .port_fdb_add = qca8k_port_fdb_add, .port_fdb_del = qca8k_port_fdb_del, .port_fdb_dump = qca8k_port_fdb_dump, diff --git a/target/linux/generic/backport-5.15/762-net-next-net-dsa-qca8k-add-support-for-mirror-mode.patch b/target/linux/generic/backport-5.15/762-net-next-net-dsa-qca8k-add-support-for-mirror-mode.patch index 69e9b381c2..dc5a22935f 100644 --- a/target/linux/generic/backport-5.15/762-net-next-net-dsa-qca8k-add-support-for-mirror-mode.patch +++ b/target/linux/generic/backport-5.15/762-net-next-net-dsa-qca8k-add-support-for-mirror-mode.patch @@ -17,7 +17,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/dsa/qca8k.c +++ b/drivers/net/dsa/qca8k.c -@@ -2027,6 +2027,99 @@ qca8k_port_mdb_del(struct dsa_switch *ds +@@ -2046,6 +2046,99 @@ qca8k_port_mdb_del(struct dsa_switch *ds } static int @@ -117,7 +117,7 @@ Signed-off-by: David S. Miller qca8k_port_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering, struct netlink_ext_ack *extack) { -@@ -2136,6 +2229,8 @@ static const struct dsa_switch_ops qca8k +@@ -2155,6 +2248,8 @@ static const struct dsa_switch_ops qca8k .port_fdb_dump = qca8k_port_fdb_dump, .port_mdb_add = qca8k_port_mdb_add, .port_mdb_del = qca8k_port_mdb_del, diff --git a/target/linux/generic/backport-5.15/763-net-next-net-dsa-qca8k-add-LAG-support.patch b/target/linux/generic/backport-5.15/763-net-next-net-dsa-qca8k-add-LAG-support.patch index bfc77db184..b53f1288d5 100644 --- a/target/linux/generic/backport-5.15/763-net-next-net-dsa-qca8k-add-LAG-support.patch +++ b/target/linux/generic/backport-5.15/763-net-next-net-dsa-qca8k-add-LAG-support.patch @@ -35,7 +35,7 @@ Signed-off-by: David S. Miller return 0; } -@@ -2207,6 +2210,178 @@ qca8k_get_tag_protocol(struct dsa_switch +@@ -2226,6 +2229,178 @@ qca8k_get_tag_protocol(struct dsa_switch return DSA_TAG_PROTO_QCA; } @@ -214,7 +214,7 @@ Signed-off-by: David S. Miller static const struct dsa_switch_ops qca8k_switch_ops = { .get_tag_protocol = qca8k_get_tag_protocol, .setup = qca8k_setup, -@@ -2240,6 +2415,8 @@ static const struct dsa_switch_ops qca8k +@@ -2259,6 +2434,8 @@ static const struct dsa_switch_ops qca8k .phylink_mac_link_down = qca8k_phylink_mac_link_down, .phylink_mac_link_up = qca8k_phylink_mac_link_up, .get_phy_flags = qca8k_get_phy_flags, diff --git a/target/linux/generic/backport-5.15/764-net-next-net-dsa-qca8k-fix-warning-in-LAG-feature.patch b/target/linux/generic/backport-5.15/764-net-next-net-dsa-qca8k-fix-warning-in-LAG-feature.patch index 8c0a990b0d..7d811be11c 100644 --- a/target/linux/generic/backport-5.15/764-net-next-net-dsa-qca8k-fix-warning-in-LAG-feature.patch +++ b/target/linux/generic/backport-5.15/764-net-next-net-dsa-qca8k-fix-warning-in-LAG-feature.patch @@ -19,7 +19,7 @@ Signed-off-by: Jakub Kicinski --- a/drivers/net/dsa/qca8k.c +++ b/drivers/net/dsa/qca8k.c -@@ -2232,7 +2232,7 @@ qca8k_lag_can_offload(struct dsa_switch +@@ -2251,7 +2251,7 @@ qca8k_lag_can_offload(struct dsa_switch if (info->tx_type != NETDEV_LAG_TX_TYPE_HASH) return false; @@ -28,7 +28,7 @@ Signed-off-by: Jakub Kicinski info->hash_type != NETDEV_LAG_HASH_L23) return false; -@@ -2246,8 +2246,8 @@ qca8k_lag_setup_hash(struct dsa_switch * +@@ -2265,8 +2265,8 @@ qca8k_lag_setup_hash(struct dsa_switch * { struct qca8k_priv *priv = ds->priv; bool unique_lag = true; diff --git a/target/linux/generic/backport-5.15/766-09-net-dsa-qca8k-add-tracking-state-of-master-port.patch b/target/linux/generic/backport-5.15/766-09-net-dsa-qca8k-add-tracking-state-of-master-port.patch index ff8fdca512..eb21cc3912 100644 --- a/target/linux/generic/backport-5.15/766-09-net-dsa-qca8k-add-tracking-state-of-master-port.patch +++ b/target/linux/generic/backport-5.15/766-09-net-dsa-qca8k-add-tracking-state-of-master-port.patch @@ -26,7 +26,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/dsa/qca8k.c +++ b/drivers/net/dsa/qca8k.c -@@ -2382,6 +2382,20 @@ qca8k_port_lag_leave(struct dsa_switch * +@@ -2401,6 +2401,20 @@ qca8k_port_lag_leave(struct dsa_switch * return qca8k_lag_refresh_portmap(ds, port, lag, true); } @@ -47,7 +47,7 @@ Signed-off-by: David S. Miller static const struct dsa_switch_ops qca8k_switch_ops = { .get_tag_protocol = qca8k_get_tag_protocol, .setup = qca8k_setup, -@@ -2417,6 +2431,7 @@ static const struct dsa_switch_ops qca8k +@@ -2436,6 +2450,7 @@ static const struct dsa_switch_ops qca8k .get_phy_flags = qca8k_get_phy_flags, .port_lag_join = qca8k_port_lag_join, .port_lag_leave = qca8k_port_lag_leave, diff --git a/target/linux/generic/backport-5.15/766-10-net-dsa-qca8k-add-support-for-mgmt-read-write-in-Eth.patch b/target/linux/generic/backport-5.15/766-10-net-dsa-qca8k-add-support-for-mgmt-read-write-in-Eth.patch index 43656ad79d..07c5ba4621 100644 --- a/target/linux/generic/backport-5.15/766-10-net-dsa-qca8k-add-support-for-mgmt-read-write-in-Eth.patch +++ b/target/linux/generic/backport-5.15/766-10-net-dsa-qca8k-add-support-for-mgmt-read-write-in-Eth.patch @@ -276,7 +276,7 @@ Signed-off-by: David S. Miller qca8k_split_addr(reg, &r1, &r2, &page); mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED); -@@ -2393,7 +2591,30 @@ qca8k_master_change(struct dsa_switch *d +@@ -2412,7 +2610,30 @@ qca8k_master_change(struct dsa_switch *d if (dp->index != 0) return; @@ -307,7 +307,7 @@ Signed-off-by: David S. Miller } static const struct dsa_switch_ops qca8k_switch_ops = { -@@ -2432,6 +2653,7 @@ static const struct dsa_switch_ops qca8k +@@ -2451,6 +2672,7 @@ static const struct dsa_switch_ops qca8k .port_lag_join = qca8k_port_lag_join, .port_lag_leave = qca8k_port_lag_leave, .master_state_change = qca8k_master_change, @@ -315,7 +315,7 @@ Signed-off-by: David S. Miller }; static int qca8k_read_switch_id(struct qca8k_priv *priv) -@@ -2511,6 +2733,9 @@ qca8k_sw_probe(struct mdio_device *mdiod +@@ -2530,6 +2752,9 @@ qca8k_sw_probe(struct mdio_device *mdiod if (!priv->ds) return -ENOMEM; diff --git a/target/linux/generic/backport-5.15/766-11-net-dsa-qca8k-add-support-for-mib-autocast-in-Ethern.patch b/target/linux/generic/backport-5.15/766-11-net-dsa-qca8k-add-support-for-mib-autocast-in-Ethern.patch index c4bc2b3646..0dcf279433 100644 --- a/target/linux/generic/backport-5.15/766-11-net-dsa-qca8k-add-support-for-mib-autocast-in-Ethern.patch +++ b/target/linux/generic/backport-5.15/766-11-net-dsa-qca8k-add-support-for-mib-autocast-in-Ethern.patch @@ -147,7 +147,7 @@ Signed-off-by: David S. Miller match_data = of_device_get_match_data(priv->dev); for (i = 0; i < match_data->mib_count; i++) { -@@ -2592,9 +2690,11 @@ qca8k_master_change(struct dsa_switch *d +@@ -2611,9 +2709,11 @@ qca8k_master_change(struct dsa_switch *d return; mutex_lock(&priv->mgmt_eth_data.mutex); @@ -159,7 +159,7 @@ Signed-off-by: David S. Miller mutex_unlock(&priv->mgmt_eth_data.mutex); } -@@ -2608,6 +2708,7 @@ static int qca8k_connect_tag_protocol(st +@@ -2627,6 +2727,7 @@ static int qca8k_connect_tag_protocol(st tagger_data = ds->tagger_data; tagger_data->rw_reg_ack_handler = qca8k_rw_reg_ack_handler; @@ -167,7 +167,7 @@ Signed-off-by: David S. Miller break; default: -@@ -2736,6 +2837,9 @@ qca8k_sw_probe(struct mdio_device *mdiod +@@ -2755,6 +2856,9 @@ qca8k_sw_probe(struct mdio_device *mdiod mutex_init(&priv->mgmt_eth_data.mutex); init_completion(&priv->mgmt_eth_data.rw_done); diff --git a/target/linux/generic/backport-5.15/766-13-net-dsa-qca8k-move-page-cache-to-driver-priv.patch b/target/linux/generic/backport-5.15/766-13-net-dsa-qca8k-move-page-cache-to-driver-priv.patch index dc8160966c..4ac0bc32fd 100644 --- a/target/linux/generic/backport-5.15/766-13-net-dsa-qca8k-move-page-cache-to-driver-priv.patch +++ b/target/linux/generic/backport-5.15/766-13-net-dsa-qca8k-move-page-cache-to-driver-priv.patch @@ -172,7 +172,7 @@ Signed-off-by: David S. Miller if (ret < 0) return 0xffff; -@@ -3041,6 +3037,8 @@ qca8k_sw_probe(struct mdio_device *mdiod +@@ -3060,6 +3056,8 @@ qca8k_sw_probe(struct mdio_device *mdiod return PTR_ERR(priv->regmap); } diff --git a/target/linux/generic/backport-5.15/766-14-net-dsa-qca8k-cache-lo-and-hi-for-mdio-write.patch b/target/linux/generic/backport-5.15/766-14-net-dsa-qca8k-cache-lo-and-hi-for-mdio-write.patch index 2d483730c9..e2cb2721ce 100644 --- a/target/linux/generic/backport-5.15/766-14-net-dsa-qca8k-cache-lo-and-hi-for-mdio-write.patch +++ b/target/linux/generic/backport-5.15/766-14-net-dsa-qca8k-cache-lo-and-hi-for-mdio-write.patch @@ -139,7 +139,7 @@ Signed-off-by: David S. Miller mutex_unlock(&bus->mdio_lock); -@@ -3038,6 +3073,8 @@ qca8k_sw_probe(struct mdio_device *mdiod +@@ -3057,6 +3092,8 @@ qca8k_sw_probe(struct mdio_device *mdiod } priv->mdio_cache.page = 0xffff; diff --git a/target/linux/generic/hack-5.15/204-module_strip.patch b/target/linux/generic/hack-5.15/204-module_strip.patch index bd7fc71060..dee240d9f9 100644 --- a/target/linux/generic/hack-5.15/204-module_strip.patch +++ b/target/linux/generic/hack-5.15/204-module_strip.patch @@ -120,7 +120,7 @@ Signed-off-by: Felix Fietkau #ifdef CONFIG_MODVERSIONS -@@ -3227,9 +3229,11 @@ static int setup_load_info(struct load_i +@@ -3266,9 +3268,11 @@ static int setup_load_info(struct load_i static int check_modinfo(struct module *mod, struct load_info *info, int flags) { @@ -133,7 +133,7 @@ Signed-off-by: Felix Fietkau if (flags & MODULE_INIT_IGNORE_VERMAGIC) modmagic = NULL; -@@ -3250,6 +3254,7 @@ static int check_modinfo(struct module * +@@ -3289,6 +3293,7 @@ static int check_modinfo(struct module * mod->name); add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK); } diff --git a/target/linux/generic/hack-5.15/904-debloat_dma_buf.patch b/target/linux/generic/hack-5.15/904-debloat_dma_buf.patch index 1f4d2fd394..a685c429c4 100644 --- a/target/linux/generic/hack-5.15/904-debloat_dma_buf.patch +++ b/target/linux/generic/hack-5.15/904-debloat_dma_buf.patch @@ -63,7 +63,7 @@ Signed-off-by: Felix Fietkau +dma-shared-buffer-objs := $(dma-buf-objs-y) --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c -@@ -1506,4 +1506,5 @@ static void __exit dma_buf_deinit(void) +@@ -1513,4 +1513,5 @@ static void __exit dma_buf_deinit(void) kern_unmount(dma_buf_mnt); dma_buf_uninit_sysfs_statistics(); } diff --git a/target/linux/ipq806x/patches-5.15/102-mtd-rootfs-conflicts-with-OpenWrt-auto-mounting.patch b/target/linux/ipq806x/patches-5.15/102-mtd-rootfs-conflicts-with-OpenWrt-auto-mounting.patch index 673c66ae84..e0c195f1ab 100644 --- a/target/linux/ipq806x/patches-5.15/102-mtd-rootfs-conflicts-with-OpenWrt-auto-mounting.patch +++ b/target/linux/ipq806x/patches-5.15/102-mtd-rootfs-conflicts-with-OpenWrt-auto-mounting.patch @@ -10,7 +10,7 @@ Signed-off-by: John Crispin --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -50,7 +50,11 @@ static struct mtd_info *allocate_partiti +@@ -51,7 +51,11 @@ static struct mtd_info *allocate_partiti /* allocate the partition structure */ child = kzalloc(sizeof(*child), GFP_KERNEL);