From 3cc681542a475cc1cc8b3d7cd47d854616d55859 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 18 Jul 2024 11:40:04 +0200 Subject: [PATCH] Linux 4.19.318 --- ...et-dsa-introduce-dsa_phylink_to_port.patch | 103 -------------- queue-6.6/series | 1 - ...mapping-between-dsa-port-number-and-.patch | 18 +-- ...a-switch-drivers-to-provide-their-ow.patch | 134 ------------------ ...et-dsa-introduce-dsa_phylink_to_port.patch | 103 -------------- ...3-provide-own-phylink-mac-operations.patch | 92 ------------ queue-6.9/series | 3 - ...m-davinci-convert-comma-to-semicolon.patch | 0 ...compat-types-to-asm-generic-compat.h.patch | 0 ...ter-arithmatic-in-ext_adv_report_evt.patch | 0 ...iple-ubsan-array-index-out-of-bounds.patch | 0 ...of-bounds-read-in-bond_option_arp_ip.patch | 0 ...family-in-leafimx-driver_info-struct.patch | 0 ...skip-finding-free-audio-for-unknown-.patch | 0 ...u-atomfirmware-silence-ubsan-warning.patch | 0 ...-find_fw_domain-work-on-intel_uncore.patch | 0 ...rence-in-nouveau_connector_get_modes.patch | 0 ...re-dmi-stop-decoding-on-broken-entry.patch | 0 ...e-events-for-o_path-file-descriptors.patch | 0 .../hpet-support-32-bit-userspace.patch | 0 ...otate-apanel_addr-as-__ro_after_init.patch | 0 ...ntial-deadlock-warning-from-del_time.patch | 0 ...hardware-to-known-state-when-probing.patch | 0 ...plement-a-limit-on-umad-receive-list.patch | 0 ...lize-pad-field-in-struct-inet_diag_r.patch | 0 ...efer-struct_size-over-open-coded-ari.patch | 0 ...ial-illegal-address-access-in-jffs2_.patch | 0 ...ween-delayed_work-and-ceph_monc_stop.patch | 0 ...2-fe-fix-as10x_register_addr-packing.patch | 0 ...ntends-tda10048-fix-integer-overflow.patch | 0 ...nds-tda18271c2dd-remove-casting-duri.patch | 0 ...b0700_devices-add-missing-release_fi.patch | 0 ...-don-t-translate-i2c-read-into-write.patch | 0 ...2102-fix-a-potential-buffer-overflow.patch | 0 ...refcount_t-instead-of-atomic_t-for-n.patch | 0 ...dundant-loop-of-mm_update_owner_next.patch | 0 ...88e6xxx-correct-check-for-empty-list.patch | 0 ...antiq_etop-fix-double-free-in-detach.patch | 0 ...top-add-blank-line-after-declaration.patch | 0 ...andling-of-reordering-then-loss-case.patch | 0 ...xcepted-socket-die-when-snd_wnd-is-0.patch | 0 ...r-inode-numbers-on-directory-entries.patch | 0 ...node-allocation-from-reserved-inodes.patch | 0 ...nilfs2-fix-inode-number-range-checks.patch | 0 ...rename-operation-of-broken-directory.patch | 0 ...angefs-fix-out-of-bounds-fsid-access.patch | 0 ...io_base-to-poison_pointer_delta-not-.patch | 0 ...check-cpu-id-in-commands-c-dp-and-dx.patch | 0 ...ed-as-lcp-but-actually-malformed-pac.patch | 0 ...ide-by-zero-in-wb_dirty_limits-again.patch | 0 ...-pkey-wipe-sensitive-data-on-failure.patch | 0 ...ruct_size-over-open-coded-arithmetic.patch | 0 ...sts-fix-oom-in-msg_zerocopy-selftest.patch | 0 ...rder-checking-verbose-in-msg_zerocop.patch | 0 {queue-4.19 => releases/4.19.318}/series | 0 ...cleaned-up-the-freed-pipefs-dentries.patch | 0 ...-ece_ack-flag-to-reno-sack-functions.patch | 0 ...cp-avoid-too-many-retransmit-packets.patch | 0 ...t-undo-caused-by-dsack-of-tlp-retran.patch | 0 .../tcp-refactor-tcp_retransmit_timer.patch | 0 ...-compressed-acks-in-tcp_add_reno_sac.patch | 0 ...head_lost-is-only-valid-for-sack-tcp.patch | 0 ...ithmetic-in-tcp_rtx_probe0_timed_out.patch | 0 ..._metrics-validate-source-addr-length.patch | 0 ...-dsack-undo-in-fast-recovery-to-call.patch | 0 ..._no_set_intf-quirk-for-start-bp-850k.patch | 0 ...ring-reserved-bits-in-the-descriptor.patch | 0 ...nt-oob-read-write-in-usb_string_copy.patch | 0 ...b-serial-option-add-fibocom-fm350-gl.patch | 0 ...-add-netprisma-lcuk54-series-modules.patch | 0 ...option-add-rolling-rw350-gl-variants.patch | 0 ...tion-add-support-for-foxconn-t99w651.patch | 0 ...n-add-telit-fn912-rmnet-compositions.patch | 0 ...-telit-generic-core-dump-composition.patch | 0 74 files changed, 7 insertions(+), 447 deletions(-) delete mode 100644 queue-6.6/net-dsa-introduce-dsa_phylink_to_port.patch delete mode 100644 queue-6.9/net-dsa-allow-dsa-switch-drivers-to-provide-their-ow.patch delete mode 100644 queue-6.9/net-dsa-introduce-dsa_phylink_to_port.patch delete mode 100644 queue-6.9/net-dsa-lan9303-provide-own-phylink-mac-operations.patch rename {queue-4.19 => releases/4.19.318}/arm-davinci-convert-comma-to-semicolon.patch (100%) rename {queue-4.19 => releases/4.19.318}/asm-generic-move-common-compat-types-to-asm-generic-compat.h.patch (100%) rename {queue-4.19 => releases/4.19.318}/bluetooth-fix-incorrect-pointer-arithmatic-in-ext_adv_report_evt.patch (100%) rename {queue-4.19 => releases/4.19.318}/bnx2x-fix-multiple-ubsan-array-index-out-of-bounds.patch (100%) rename {queue-4.19 => releases/4.19.318}/bonding-fix-out-of-bounds-read-in-bond_option_arp_ip.patch (100%) rename {queue-4.19 => releases/4.19.318}/can-kvaser_usb-explicitly-initialize-family-in-leafimx-driver_info-struct.patch (100%) rename {queue-4.19 => releases/4.19.318}/drm-amd-display-skip-finding-free-audio-for-unknown-.patch (100%) rename {queue-4.19 => releases/4.19.318}/drm-amdgpu-atomfirmware-silence-ubsan-warning.patch (100%) rename {queue-4.19 => releases/4.19.318}/drm-i915-make-find_fw_domain-work-on-intel_uncore.patch (100%) rename {queue-4.19 => releases/4.19.318}/drm-nouveau-fix-null-pointer-dereference-in-nouveau_connector_get_modes.patch (100%) rename {queue-4.19 => releases/4.19.318}/firmware-dmi-stop-decoding-on-broken-entry.patch (100%) rename {queue-4.19 => releases/4.19.318}/fsnotify-do-not-generate-events-for-o_path-file-descriptors.patch (100%) rename {queue-4.19 => releases/4.19.318}/hpet-support-32-bit-userspace.patch (100%) rename {queue-4.19 => releases/4.19.318}/i2c-i801-annotate-apanel_addr-as-__ro_after_init.patch (100%) rename {queue-4.19 => releases/4.19.318}/i2c-pnx-fix-potential-deadlock-warning-from-del_time.patch (100%) rename {queue-4.19 => releases/4.19.318}/i2c-rcar-bring-hardware-to-known-state-when-probing.patch (100%) rename {queue-4.19 => releases/4.19.318}/ib-core-implement-a-limit-on-umad-receive-list.patch (100%) rename {queue-4.19 => releases/4.19.318}/inet_diag-initialize-pad-field-in-struct-inet_diag_r.patch (100%) rename {queue-4.19 => releases/4.19.318}/input-ff-core-prefer-struct_size-over-open-coded-ari.patch (100%) rename {queue-4.19 => releases/4.19.318}/jffs2-fix-potential-illegal-address-access-in-jffs2_.patch (100%) rename {queue-4.19 => releases/4.19.318}/libceph-fix-race-between-delayed_work-and-ceph_monc_stop.patch (100%) rename {queue-4.19 => releases/4.19.318}/media-dvb-as102-fe-fix-as10x_register_addr-packing.patch (100%) rename {queue-4.19 => releases/4.19.318}/media-dvb-frontends-tda10048-fix-integer-overflow.patch (100%) rename {queue-4.19 => releases/4.19.318}/media-dvb-frontends-tda18271c2dd-remove-casting-duri.patch (100%) rename {queue-4.19 => releases/4.19.318}/media-dvb-usb-dib0700_devices-add-missing-release_fi.patch (100%) rename {queue-4.19 => releases/4.19.318}/media-dw2102-don-t-translate-i2c-read-into-write.patch (100%) rename {queue-4.19 => releases/4.19.318}/media-dw2102-fix-a-potential-buffer-overflow.patch (100%) rename {queue-4.19 => releases/4.19.318}/media-s2255-use-refcount_t-instead-of-atomic_t-for-n.patch (100%) rename {queue-4.19 => releases/4.19.318}/mm-optimize-the-redundant-loop-of-mm_update_owner_next.patch (100%) rename {queue-4.19 => releases/4.19.318}/net-dsa-mv88e6xxx-correct-check-for-empty-list.patch (100%) rename {queue-4.19 => releases/4.19.318}/net-ethernet-lantiq_etop-fix-double-free-in-detach.patch (100%) rename {queue-4.19 => releases/4.19.318}/net-lantiq_etop-add-blank-line-after-declaration.patch (100%) rename {queue-4.19 => releases/4.19.318}/net-tcp-better-handling-of-reordering-then-loss-case.patch (100%) rename {queue-4.19 => releases/4.19.318}/net-tcp-fix-unexcepted-socket-die-when-snd_wnd-is-0.patch (100%) rename {queue-4.19 => releases/4.19.318}/nilfs2-add-missing-check-for-inode-numbers-on-directory-entries.patch (100%) rename {queue-4.19 => releases/4.19.318}/nilfs2-fix-incorrect-inode-allocation-from-reserved-inodes.patch (100%) rename {queue-4.19 => releases/4.19.318}/nilfs2-fix-inode-number-range-checks.patch (100%) rename {queue-4.19 => releases/4.19.318}/nilfs2-fix-kernel-bug-on-rename-operation-of-broken-directory.patch (100%) rename {queue-4.19 => releases/4.19.318}/orangefs-fix-out-of-bounds-fsid-access.patch (100%) rename {queue-4.19 => releases/4.19.318}/powerpc-64-set-_io_base-to-poison_pointer_delta-not-.patch (100%) rename {queue-4.19 => releases/4.19.318}/powerpc-xmon-check-cpu-id-in-commands-c-dp-and-dx.patch (100%) rename {queue-4.19 => releases/4.19.318}/ppp-reject-claimed-as-lcp-but-actually-malformed-pac.patch (100%) rename {queue-4.19 => releases/4.19.318}/revert-mm-writeback-fix-possible-divide-by-zero-in-wb_dirty_limits-again.patch (100%) rename {queue-4.19 => releases/4.19.318}/s390-pkey-wipe-sensitive-data-on-failure.patch (100%) rename {queue-4.19 => releases/4.19.318}/sctp-prefer-struct_size-over-open-coded-arithmetic.patch (100%) rename {queue-4.19 => releases/4.19.318}/selftests-fix-oom-in-msg_zerocopy-selftest.patch (100%) rename {queue-4.19 => releases/4.19.318}/selftests-make-order-checking-verbose-in-msg_zerocop.patch (100%) rename {queue-4.19 => releases/4.19.318}/series (100%) rename {queue-4.19 => releases/4.19.318}/sunrpc-fix-rpc-client-cleaned-up-the-freed-pipefs-dentries.patch (100%) rename {queue-4.19 => releases/4.19.318}/tcp-add-ece_ack-flag-to-reno-sack-functions.patch (100%) rename {queue-4.19 => releases/4.19.318}/tcp-avoid-too-many-retransmit-packets.patch (100%) rename {queue-4.19 => releases/4.19.318}/tcp-fix-incorrect-undo-caused-by-dsack-of-tlp-retran.patch (100%) rename {queue-4.19 => releases/4.19.318}/tcp-refactor-tcp_retransmit_timer.patch (100%) rename {queue-4.19 => releases/4.19.318}/tcp-take-care-of-compressed-acks-in-tcp_add_reno_sac.patch (100%) rename {queue-4.19 => releases/4.19.318}/tcp-tcp_mark_head_lost-is-only-valid-for-sack-tcp.patch (100%) rename {queue-4.19 => releases/4.19.318}/tcp-use-signed-arithmetic-in-tcp_rtx_probe0_timed_out.patch (100%) rename {queue-4.19 => releases/4.19.318}/tcp_metrics-validate-source-addr-length.patch (100%) rename {queue-4.19 => releases/4.19.318}/upstream-tcp-fix-dsack-undo-in-fast-recovery-to-call.patch (100%) rename {queue-4.19 => releases/4.19.318}/usb-add-usb_quirk_no_set_intf-quirk-for-start-bp-850k.patch (100%) rename {queue-4.19 => releases/4.19.318}/usb-core-fix-duplicate-endpoint-bug-by-clearing-reserved-bits-in-the-descriptor.patch (100%) rename {queue-4.19 => releases/4.19.318}/usb-gadget-configfs-prevent-oob-read-write-in-usb_string_copy.patch (100%) rename {queue-4.19 => releases/4.19.318}/usb-serial-option-add-fibocom-fm350-gl.patch (100%) rename {queue-4.19 => releases/4.19.318}/usb-serial-option-add-netprisma-lcuk54-series-modules.patch (100%) rename {queue-4.19 => releases/4.19.318}/usb-serial-option-add-rolling-rw350-gl-variants.patch (100%) rename {queue-4.19 => releases/4.19.318}/usb-serial-option-add-support-for-foxconn-t99w651.patch (100%) rename {queue-4.19 => releases/4.19.318}/usb-serial-option-add-telit-fn912-rmnet-compositions.patch (100%) rename {queue-4.19 => releases/4.19.318}/usb-serial-option-add-telit-generic-core-dump-composition.patch (100%) diff --git a/queue-6.6/net-dsa-introduce-dsa_phylink_to_port.patch b/queue-6.6/net-dsa-introduce-dsa_phylink_to_port.patch deleted file mode 100644 index d911edb49a9..00000000000 --- a/queue-6.6/net-dsa-introduce-dsa_phylink_to_port.patch +++ /dev/null @@ -1,103 +0,0 @@ -From b6e5b828dc3ddb8c66890eb0f341b231cd3a3c9d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 10 Apr 2024 20:42:38 +0100 -Subject: net: dsa: introduce dsa_phylink_to_port() - -From: Russell King (Oracle) - -[ Upstream commit dd0c9855b41310470086500c9963bbb64bb90dd0 ] - -We convert from a phylink_config struct to a dsa_port struct in many -places, let's provide a helper for this. - -Reviewed-by: Andrew Lunn -Reviewed-by: Florian Fainelli -Signed-off-by: Russell King (Oracle) -Reviewed-by: Vladimir Oltean -Link: https://lore.kernel.org/r/E1rudqA-006K9B-85@rmk-PC.armlinux.org.uk -Signed-off-by: Jakub Kicinski -Stable-dep-of: 0005b2dc43f9 ("dsa: lan9303: Fix mapping between DSA port number and PHY address") -Signed-off-by: Sasha Levin ---- - include/net/dsa.h | 6 ++++++ - net/dsa/port.c | 12 ++++++------ - 2 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/include/net/dsa.h b/include/net/dsa.h -index 0b9c6aa270474..f643866300ed3 100644 ---- a/include/net/dsa.h -+++ b/include/net/dsa.h -@@ -327,6 +327,12 @@ struct dsa_port { - }; - }; - -+static inline struct dsa_port * -+dsa_phylink_to_port(struct phylink_config *config) -+{ -+ return container_of(config, struct dsa_port, pl_config); -+} -+ - /* TODO: ideally DSA ports would have a single dp->link_dp member, - * and no dst->rtable nor this struct dsa_link would be needed, - * but this would require some more complex tree walking, -diff --git a/net/dsa/port.c b/net/dsa/port.c -index 37ab238e83042..c5e7b12aff5bf 100644 ---- a/net/dsa/port.c -+++ b/net/dsa/port.c -@@ -1572,7 +1572,7 @@ static struct phylink_pcs * - dsa_port_phylink_mac_select_pcs(struct phylink_config *config, - phy_interface_t interface) - { -- struct dsa_port *dp = container_of(config, struct dsa_port, pl_config); -+ struct dsa_port *dp = dsa_phylink_to_port(config); - struct phylink_pcs *pcs = ERR_PTR(-EOPNOTSUPP); - struct dsa_switch *ds = dp->ds; - -@@ -1586,7 +1586,7 @@ static int dsa_port_phylink_mac_prepare(struct phylink_config *config, - unsigned int mode, - phy_interface_t interface) - { -- struct dsa_port *dp = container_of(config, struct dsa_port, pl_config); -+ struct dsa_port *dp = dsa_phylink_to_port(config); - struct dsa_switch *ds = dp->ds; - int err = 0; - -@@ -1601,7 +1601,7 @@ static void dsa_port_phylink_mac_config(struct phylink_config *config, - unsigned int mode, - const struct phylink_link_state *state) - { -- struct dsa_port *dp = container_of(config, struct dsa_port, pl_config); -+ struct dsa_port *dp = dsa_phylink_to_port(config); - struct dsa_switch *ds = dp->ds; - - if (!ds->ops->phylink_mac_config) -@@ -1614,7 +1614,7 @@ static int dsa_port_phylink_mac_finish(struct phylink_config *config, - unsigned int mode, - phy_interface_t interface) - { -- struct dsa_port *dp = container_of(config, struct dsa_port, pl_config); -+ struct dsa_port *dp = dsa_phylink_to_port(config); - struct dsa_switch *ds = dp->ds; - int err = 0; - -@@ -1629,7 +1629,7 @@ static void dsa_port_phylink_mac_link_down(struct phylink_config *config, - unsigned int mode, - phy_interface_t interface) - { -- struct dsa_port *dp = container_of(config, struct dsa_port, pl_config); -+ struct dsa_port *dp = dsa_phylink_to_port(config); - struct phy_device *phydev = NULL; - struct dsa_switch *ds = dp->ds; - -@@ -1652,7 +1652,7 @@ static void dsa_port_phylink_mac_link_up(struct phylink_config *config, - int speed, int duplex, - bool tx_pause, bool rx_pause) - { -- struct dsa_port *dp = container_of(config, struct dsa_port, pl_config); -+ struct dsa_port *dp = dsa_phylink_to_port(config); - struct dsa_switch *ds = dp->ds; - - if (!ds->ops->phylink_mac_link_up) { --- -2.43.0 - diff --git a/queue-6.6/series b/queue-6.6/series index 27746382352..b3be44ff7dd 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -10,7 +10,6 @@ cachefiles-cancel-all-requests-for-the-object-that-i.patch cachefiles-wait-for-ondemand_object_worker-to-finish.patch cachefiles-cyclic-allocation-of-msg_id-to-avoid-reus.patch cachefiles-add-missing-lock-protection-when-polling.patch -net-dsa-introduce-dsa_phylink_to_port.patch dsa-lan9303-fix-mapping-between-dsa-port-number-and-.patch filelock-fix-potential-use-after-free-in-posix_lock_.patch fs-dcache-re-use-value-stored-to-dentry-d_flags-inst.patch diff --git a/queue-6.9/dsa-lan9303-fix-mapping-between-dsa-port-number-and-.patch b/queue-6.9/dsa-lan9303-fix-mapping-between-dsa-port-number-and-.patch index 79dda496464..da61c3d7cfc 100644 --- a/queue-6.9/dsa-lan9303-fix-mapping-between-dsa-port-number-and-.patch +++ b/queue-6.9/dsa-lan9303-fix-mapping-between-dsa-port-number-and-.patch @@ -22,15 +22,14 @@ Reviewed-by: Vladimir Oltean Link: https://patch.msgid.link/20240703145718.19951-1-ceggers@arri.de Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - drivers/net/dsa/lan9303-core.c | 23 ++++++++++------------- + drivers/net/dsa/lan9303-core.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) -diff --git a/drivers/net/dsa/lan9303-core.c b/drivers/net/dsa/lan9303-core.c -index 666b4d766c005..1f7000f90bb78 100644 --- a/drivers/net/dsa/lan9303-core.c +++ b/drivers/net/dsa/lan9303-core.c -@@ -1048,31 +1048,31 @@ static int lan9303_get_sset_count(struct dsa_switch *ds, int port, int sset) +@@ -1048,31 +1048,31 @@ static int lan9303_get_sset_count(struct return ARRAY_SIZE(lan9303_mib); } @@ -70,7 +69,7 @@ index 666b4d766c005..1f7000f90bb78 100644 } static int lan9303_port_enable(struct dsa_switch *ds, int port, -@@ -1100,7 +1100,7 @@ static void lan9303_port_disable(struct dsa_switch *ds, int port) +@@ -1100,7 +1100,7 @@ static void lan9303_port_disable(struct vlan_vid_del(dsa_port_to_conduit(dp), htons(ETH_P_8021Q), port); lan9303_disable_processing_port(chip, port); @@ -79,7 +78,7 @@ index 666b4d766c005..1f7000f90bb78 100644 } static int lan9303_port_bridge_join(struct dsa_switch *ds, int port, -@@ -1375,8 +1375,6 @@ static const struct dsa_switch_ops lan9303_switch_ops = { +@@ -1355,8 +1355,6 @@ static const struct dsa_switch_ops lan93 static int lan9303_register_switch(struct lan9303 *chip) { @@ -88,16 +87,13 @@ index 666b4d766c005..1f7000f90bb78 100644 chip->ds = devm_kzalloc(chip->dev, sizeof(*chip->ds), GFP_KERNEL); if (!chip->ds) return -ENOMEM; -@@ -1386,8 +1384,7 @@ static int lan9303_register_switch(struct lan9303 *chip) +@@ -1365,8 +1363,7 @@ static int lan9303_register_switch(struc + chip->ds->num_ports = LAN9303_NUM_PORTS; chip->ds->priv = chip; chip->ds->ops = &lan9303_switch_ops; - chip->ds->phylink_mac_ops = &lan9303_phylink_mac_ops; - base = chip->phy_addr_base; - chip->ds->phys_mii_mask = GENMASK(LAN9303_NUM_PORTS - 1 + base, base); + chip->ds->phys_mii_mask = GENMASK(LAN9303_NUM_PORTS - 1, 0); return dsa_register_switch(chip->ds); } --- -2.43.0 - diff --git a/queue-6.9/net-dsa-allow-dsa-switch-drivers-to-provide-their-ow.patch b/queue-6.9/net-dsa-allow-dsa-switch-drivers-to-provide-their-ow.patch deleted file mode 100644 index 11a81181f88..00000000000 --- a/queue-6.9/net-dsa-allow-dsa-switch-drivers-to-provide-their-ow.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 2cf66bca77e312bf1604c5451dfc2fe43ce59ed8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 10 Apr 2024 20:42:43 +0100 -Subject: net: dsa: allow DSA switch drivers to provide their own phylink mac - ops - -From: Russell King (Oracle) - -[ Upstream commit cae425cb43feddd9fd62fc1b25567f9463da4915 ] - -Rather than having a shim for each and every phylink MAC operation, -allow DSA switch drivers to provide their own ops structure. When a -DSA driver provides the phylink MAC operations, the shimmed ops must -not be provided, so fail an attempt to register a switch with both -the phylink_mac_ops in struct dsa_switch and the phylink_mac_* -operations populated in dsa_switch_ops populated. - -Signed-off-by: Russell King (Oracle) -Reviewed-by: Vladimir Oltean -Reviewed-by: Florian Fainelli -Link: https://lore.kernel.org/r/E1rudqF-006K9H-Cc@rmk-PC.armlinux.org.uk -Signed-off-by: Jakub Kicinski -Stable-dep-of: 0005b2dc43f9 ("dsa: lan9303: Fix mapping between DSA port number and PHY address") -Signed-off-by: Sasha Levin ---- - include/net/dsa.h | 5 +++++ - net/dsa/dsa.c | 11 +++++++++++ - net/dsa/port.c | 26 ++++++++++++++++++++------ - 3 files changed, 36 insertions(+), 6 deletions(-) - -diff --git a/include/net/dsa.h b/include/net/dsa.h -index f228b479a5fd2..7edfd8de8882f 100644 ---- a/include/net/dsa.h -+++ b/include/net/dsa.h -@@ -457,6 +457,11 @@ struct dsa_switch { - */ - const struct dsa_switch_ops *ops; - -+ /* -+ * Allow a DSA switch driver to override the phylink MAC ops -+ */ -+ const struct phylink_mac_ops *phylink_mac_ops; -+ - /* - * User mii_bus and devices for the individual ports. - */ -diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c -index 09d2f5d4b3dd4..2f347cd373162 100644 ---- a/net/dsa/dsa.c -+++ b/net/dsa/dsa.c -@@ -1505,6 +1505,17 @@ static int dsa_switch_probe(struct dsa_switch *ds) - if (!ds->num_ports) - return -EINVAL; - -+ if (ds->phylink_mac_ops) { -+ if (ds->ops->phylink_mac_select_pcs || -+ ds->ops->phylink_mac_prepare || -+ ds->ops->phylink_mac_config || -+ ds->ops->phylink_mac_finish || -+ ds->ops->phylink_mac_link_down || -+ ds->ops->phylink_mac_link_up || -+ ds->ops->adjust_link) -+ return -EINVAL; -+ } -+ - if (np) { - err = dsa_switch_parse_of(ds, np); - if (err) -diff --git a/net/dsa/port.c b/net/dsa/port.c -index 02bf1c306bdca..c6febc3d96d9b 100644 ---- a/net/dsa/port.c -+++ b/net/dsa/port.c -@@ -1662,6 +1662,7 @@ static const struct phylink_mac_ops dsa_port_phylink_mac_ops = { - - int dsa_port_phylink_create(struct dsa_port *dp) - { -+ const struct phylink_mac_ops *mac_ops; - struct dsa_switch *ds = dp->ds; - phy_interface_t mode; - struct phylink *pl; -@@ -1685,8 +1686,12 @@ int dsa_port_phylink_create(struct dsa_port *dp) - } - } - -- pl = phylink_create(&dp->pl_config, of_fwnode_handle(dp->dn), -- mode, &dsa_port_phylink_mac_ops); -+ mac_ops = &dsa_port_phylink_mac_ops; -+ if (ds->phylink_mac_ops) -+ mac_ops = ds->phylink_mac_ops; -+ -+ pl = phylink_create(&dp->pl_config, of_fwnode_handle(dp->dn), mode, -+ mac_ops); - if (IS_ERR(pl)) { - pr_err("error creating PHYLINK: %ld\n", PTR_ERR(pl)); - return PTR_ERR(pl); -@@ -1952,12 +1957,23 @@ static void dsa_shared_port_validate_of(struct dsa_port *dp, - dn, dsa_port_is_cpu(dp) ? "CPU" : "DSA", dp->index); - } - -+static void dsa_shared_port_link_down(struct dsa_port *dp) -+{ -+ struct dsa_switch *ds = dp->ds; -+ -+ if (ds->phylink_mac_ops && ds->phylink_mac_ops->mac_link_down) -+ ds->phylink_mac_ops->mac_link_down(&dp->pl_config, MLO_AN_FIXED, -+ PHY_INTERFACE_MODE_NA); -+ else if (ds->ops->phylink_mac_link_down) -+ ds->ops->phylink_mac_link_down(ds, dp->index, MLO_AN_FIXED, -+ PHY_INTERFACE_MODE_NA); -+} -+ - int dsa_shared_port_link_register_of(struct dsa_port *dp) - { - struct dsa_switch *ds = dp->ds; - bool missing_link_description; - bool missing_phy_mode; -- int port = dp->index; - - dsa_shared_port_validate_of(dp, &missing_phy_mode, - &missing_link_description); -@@ -1973,9 +1989,7 @@ int dsa_shared_port_link_register_of(struct dsa_port *dp) - "Skipping phylink registration for %s port %d\n", - dsa_port_is_cpu(dp) ? "CPU" : "DSA", dp->index); - } else { -- if (ds->ops->phylink_mac_link_down) -- ds->ops->phylink_mac_link_down(ds, port, -- MLO_AN_FIXED, PHY_INTERFACE_MODE_NA); -+ dsa_shared_port_link_down(dp); - - return dsa_shared_port_phylink_register(dp); - } --- -2.43.0 - diff --git a/queue-6.9/net-dsa-introduce-dsa_phylink_to_port.patch b/queue-6.9/net-dsa-introduce-dsa_phylink_to_port.patch deleted file mode 100644 index 71ed0073bcb..00000000000 --- a/queue-6.9/net-dsa-introduce-dsa_phylink_to_port.patch +++ /dev/null @@ -1,103 +0,0 @@ -From a578bfc5658fe19e87f8b0d4304bfba5e0bcf5c4 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 10 Apr 2024 20:42:38 +0100 -Subject: net: dsa: introduce dsa_phylink_to_port() - -From: Russell King (Oracle) - -[ Upstream commit dd0c9855b41310470086500c9963bbb64bb90dd0 ] - -We convert from a phylink_config struct to a dsa_port struct in many -places, let's provide a helper for this. - -Reviewed-by: Andrew Lunn -Reviewed-by: Florian Fainelli -Signed-off-by: Russell King (Oracle) -Reviewed-by: Vladimir Oltean -Link: https://lore.kernel.org/r/E1rudqA-006K9B-85@rmk-PC.armlinux.org.uk -Signed-off-by: Jakub Kicinski -Stable-dep-of: 0005b2dc43f9 ("dsa: lan9303: Fix mapping between DSA port number and PHY address") -Signed-off-by: Sasha Levin ---- - include/net/dsa.h | 6 ++++++ - net/dsa/port.c | 12 ++++++------ - 2 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/include/net/dsa.h b/include/net/dsa.h -index 7c0da9effe4e9..f228b479a5fd2 100644 ---- a/include/net/dsa.h -+++ b/include/net/dsa.h -@@ -327,6 +327,12 @@ struct dsa_port { - }; - }; - -+static inline struct dsa_port * -+dsa_phylink_to_port(struct phylink_config *config) -+{ -+ return container_of(config, struct dsa_port, pl_config); -+} -+ - /* TODO: ideally DSA ports would have a single dp->link_dp member, - * and no dst->rtable nor this struct dsa_link would be needed, - * but this would require some more complex tree walking, -diff --git a/net/dsa/port.c b/net/dsa/port.c -index c42dac87671b1..02bf1c306bdca 100644 ---- a/net/dsa/port.c -+++ b/net/dsa/port.c -@@ -1558,7 +1558,7 @@ static struct phylink_pcs * - dsa_port_phylink_mac_select_pcs(struct phylink_config *config, - phy_interface_t interface) - { -- struct dsa_port *dp = container_of(config, struct dsa_port, pl_config); -+ struct dsa_port *dp = dsa_phylink_to_port(config); - struct phylink_pcs *pcs = ERR_PTR(-EOPNOTSUPP); - struct dsa_switch *ds = dp->ds; - -@@ -1572,7 +1572,7 @@ static int dsa_port_phylink_mac_prepare(struct phylink_config *config, - unsigned int mode, - phy_interface_t interface) - { -- struct dsa_port *dp = container_of(config, struct dsa_port, pl_config); -+ struct dsa_port *dp = dsa_phylink_to_port(config); - struct dsa_switch *ds = dp->ds; - int err = 0; - -@@ -1587,7 +1587,7 @@ static void dsa_port_phylink_mac_config(struct phylink_config *config, - unsigned int mode, - const struct phylink_link_state *state) - { -- struct dsa_port *dp = container_of(config, struct dsa_port, pl_config); -+ struct dsa_port *dp = dsa_phylink_to_port(config); - struct dsa_switch *ds = dp->ds; - - if (!ds->ops->phylink_mac_config) -@@ -1600,7 +1600,7 @@ static int dsa_port_phylink_mac_finish(struct phylink_config *config, - unsigned int mode, - phy_interface_t interface) - { -- struct dsa_port *dp = container_of(config, struct dsa_port, pl_config); -+ struct dsa_port *dp = dsa_phylink_to_port(config); - struct dsa_switch *ds = dp->ds; - int err = 0; - -@@ -1615,7 +1615,7 @@ static void dsa_port_phylink_mac_link_down(struct phylink_config *config, - unsigned int mode, - phy_interface_t interface) - { -- struct dsa_port *dp = container_of(config, struct dsa_port, pl_config); -+ struct dsa_port *dp = dsa_phylink_to_port(config); - struct phy_device *phydev = NULL; - struct dsa_switch *ds = dp->ds; - -@@ -1638,7 +1638,7 @@ static void dsa_port_phylink_mac_link_up(struct phylink_config *config, - int speed, int duplex, - bool tx_pause, bool rx_pause) - { -- struct dsa_port *dp = container_of(config, struct dsa_port, pl_config); -+ struct dsa_port *dp = dsa_phylink_to_port(config); - struct dsa_switch *ds = dp->ds; - - if (!ds->ops->phylink_mac_link_up) { --- -2.43.0 - diff --git a/queue-6.9/net-dsa-lan9303-provide-own-phylink-mac-operations.patch b/queue-6.9/net-dsa-lan9303-provide-own-phylink-mac-operations.patch deleted file mode 100644 index 74a49e9a411..00000000000 --- a/queue-6.9/net-dsa-lan9303-provide-own-phylink-mac-operations.patch +++ /dev/null @@ -1,92 +0,0 @@ -From a4a7537a9af06d98efcd54ac125675ffcaf4b2c2 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 16 Apr 2024 11:19:14 +0100 -Subject: net: dsa: lan9303: provide own phylink MAC operations - -From: Russell King (Oracle) - -[ Upstream commit 855b4ac06e46eaaf0f28484863e55d23fee89a0c ] - -Convert lan9303 to provide its own phylink MAC operations, thus -avoiding the shim layer in DSA's port.c. We need to provide stubs for -the mac_link_down() and mac_config() methods which are mandatory. - -Signed-off-by: Russell King (Oracle) -Link: https://lore.kernel.org/r/E1rwfuE-007537-1u@rmk-PC.armlinux.org.uk -Signed-off-by: Jakub Kicinski -Stable-dep-of: 0005b2dc43f9 ("dsa: lan9303: Fix mapping between DSA port number and PHY address") -Signed-off-by: Sasha Levin ---- - drivers/net/dsa/lan9303-core.c | 31 ++++++++++++++++++++++++++----- - 1 file changed, 26 insertions(+), 5 deletions(-) - -diff --git a/drivers/net/dsa/lan9303-core.c b/drivers/net/dsa/lan9303-core.c -index fcb20eac332a6..666b4d766c005 100644 ---- a/drivers/net/dsa/lan9303-core.c -+++ b/drivers/net/dsa/lan9303-core.c -@@ -1293,14 +1293,29 @@ static void lan9303_phylink_get_caps(struct dsa_switch *ds, int port, - } - } - --static void lan9303_phylink_mac_link_up(struct dsa_switch *ds, int port, -+static void lan9303_phylink_mac_config(struct phylink_config *config, -+ unsigned int mode, -+ const struct phylink_link_state *state) -+{ -+} -+ -+static void lan9303_phylink_mac_link_down(struct phylink_config *config, -+ unsigned int mode, -+ phy_interface_t interface) -+{ -+} -+ -+static void lan9303_phylink_mac_link_up(struct phylink_config *config, -+ struct phy_device *phydev, - unsigned int mode, - phy_interface_t interface, -- struct phy_device *phydev, int speed, -- int duplex, bool tx_pause, -+ int speed, int duplex, bool tx_pause, - bool rx_pause) - { -- struct lan9303 *chip = ds->priv; -+ struct dsa_port *dp = dsa_phylink_to_port(config); -+ struct lan9303 *chip = dp->ds->priv; -+ struct dsa_switch *ds = dp->ds; -+ int port = dp->index; - u32 ctl; - u32 reg; - -@@ -1330,6 +1345,12 @@ static void lan9303_phylink_mac_link_up(struct dsa_switch *ds, int port, - regmap_write(chip->regmap, flow_ctl_reg[port], reg); - } - -+static const struct phylink_mac_ops lan9303_phylink_mac_ops = { -+ .mac_config = lan9303_phylink_mac_config, -+ .mac_link_down = lan9303_phylink_mac_link_down, -+ .mac_link_up = lan9303_phylink_mac_link_up, -+}; -+ - static const struct dsa_switch_ops lan9303_switch_ops = { - .get_tag_protocol = lan9303_get_tag_protocol, - .setup = lan9303_setup, -@@ -1337,7 +1358,6 @@ static const struct dsa_switch_ops lan9303_switch_ops = { - .phy_read = lan9303_phy_read, - .phy_write = lan9303_phy_write, - .phylink_get_caps = lan9303_phylink_get_caps, -- .phylink_mac_link_up = lan9303_phylink_mac_link_up, - .get_ethtool_stats = lan9303_get_ethtool_stats, - .get_sset_count = lan9303_get_sset_count, - .port_enable = lan9303_port_enable, -@@ -1365,6 +1385,7 @@ static int lan9303_register_switch(struct lan9303 *chip) - chip->ds->num_ports = LAN9303_NUM_PORTS; - chip->ds->priv = chip; - chip->ds->ops = &lan9303_switch_ops; -+ chip->ds->phylink_mac_ops = &lan9303_phylink_mac_ops; - base = chip->phy_addr_base; - chip->ds->phys_mii_mask = GENMASK(LAN9303_NUM_PORTS - 1 + base, base); - --- -2.43.0 - diff --git a/queue-6.9/series b/queue-6.9/series index 18bd1abdbcd..92468adfa35 100644 --- a/queue-6.9/series +++ b/queue-6.9/series @@ -9,9 +9,6 @@ cachefiles-cancel-all-requests-for-the-object-that-i.patch cachefiles-wait-for-ondemand_object_worker-to-finish.patch cachefiles-cyclic-allocation-of-msg_id-to-avoid-reus.patch cachefiles-add-missing-lock-protection-when-polling.patch -net-dsa-introduce-dsa_phylink_to_port.patch -net-dsa-allow-dsa-switch-drivers-to-provide-their-ow.patch -net-dsa-lan9303-provide-own-phylink-mac-operations.patch dsa-lan9303-fix-mapping-between-dsa-port-number-and-.patch filelock-fix-potential-use-after-free-in-posix_lock_.patch fs-dcache-re-use-value-stored-to-dentry-d_flags-inst.patch diff --git a/queue-4.19/arm-davinci-convert-comma-to-semicolon.patch b/releases/4.19.318/arm-davinci-convert-comma-to-semicolon.patch similarity index 100% rename from queue-4.19/arm-davinci-convert-comma-to-semicolon.patch rename to releases/4.19.318/arm-davinci-convert-comma-to-semicolon.patch diff --git a/queue-4.19/asm-generic-move-common-compat-types-to-asm-generic-compat.h.patch b/releases/4.19.318/asm-generic-move-common-compat-types-to-asm-generic-compat.h.patch similarity index 100% rename from queue-4.19/asm-generic-move-common-compat-types-to-asm-generic-compat.h.patch rename to releases/4.19.318/asm-generic-move-common-compat-types-to-asm-generic-compat.h.patch diff --git a/queue-4.19/bluetooth-fix-incorrect-pointer-arithmatic-in-ext_adv_report_evt.patch b/releases/4.19.318/bluetooth-fix-incorrect-pointer-arithmatic-in-ext_adv_report_evt.patch similarity index 100% rename from queue-4.19/bluetooth-fix-incorrect-pointer-arithmatic-in-ext_adv_report_evt.patch rename to releases/4.19.318/bluetooth-fix-incorrect-pointer-arithmatic-in-ext_adv_report_evt.patch diff --git a/queue-4.19/bnx2x-fix-multiple-ubsan-array-index-out-of-bounds.patch b/releases/4.19.318/bnx2x-fix-multiple-ubsan-array-index-out-of-bounds.patch similarity index 100% rename from queue-4.19/bnx2x-fix-multiple-ubsan-array-index-out-of-bounds.patch rename to releases/4.19.318/bnx2x-fix-multiple-ubsan-array-index-out-of-bounds.patch diff --git a/queue-4.19/bonding-fix-out-of-bounds-read-in-bond_option_arp_ip.patch b/releases/4.19.318/bonding-fix-out-of-bounds-read-in-bond_option_arp_ip.patch similarity index 100% rename from queue-4.19/bonding-fix-out-of-bounds-read-in-bond_option_arp_ip.patch rename to releases/4.19.318/bonding-fix-out-of-bounds-read-in-bond_option_arp_ip.patch diff --git a/queue-4.19/can-kvaser_usb-explicitly-initialize-family-in-leafimx-driver_info-struct.patch b/releases/4.19.318/can-kvaser_usb-explicitly-initialize-family-in-leafimx-driver_info-struct.patch similarity index 100% rename from queue-4.19/can-kvaser_usb-explicitly-initialize-family-in-leafimx-driver_info-struct.patch rename to releases/4.19.318/can-kvaser_usb-explicitly-initialize-family-in-leafimx-driver_info-struct.patch diff --git a/queue-4.19/drm-amd-display-skip-finding-free-audio-for-unknown-.patch b/releases/4.19.318/drm-amd-display-skip-finding-free-audio-for-unknown-.patch similarity index 100% rename from queue-4.19/drm-amd-display-skip-finding-free-audio-for-unknown-.patch rename to releases/4.19.318/drm-amd-display-skip-finding-free-audio-for-unknown-.patch diff --git a/queue-4.19/drm-amdgpu-atomfirmware-silence-ubsan-warning.patch b/releases/4.19.318/drm-amdgpu-atomfirmware-silence-ubsan-warning.patch similarity index 100% rename from queue-4.19/drm-amdgpu-atomfirmware-silence-ubsan-warning.patch rename to releases/4.19.318/drm-amdgpu-atomfirmware-silence-ubsan-warning.patch diff --git a/queue-4.19/drm-i915-make-find_fw_domain-work-on-intel_uncore.patch b/releases/4.19.318/drm-i915-make-find_fw_domain-work-on-intel_uncore.patch similarity index 100% rename from queue-4.19/drm-i915-make-find_fw_domain-work-on-intel_uncore.patch rename to releases/4.19.318/drm-i915-make-find_fw_domain-work-on-intel_uncore.patch diff --git a/queue-4.19/drm-nouveau-fix-null-pointer-dereference-in-nouveau_connector_get_modes.patch b/releases/4.19.318/drm-nouveau-fix-null-pointer-dereference-in-nouveau_connector_get_modes.patch similarity index 100% rename from queue-4.19/drm-nouveau-fix-null-pointer-dereference-in-nouveau_connector_get_modes.patch rename to releases/4.19.318/drm-nouveau-fix-null-pointer-dereference-in-nouveau_connector_get_modes.patch diff --git a/queue-4.19/firmware-dmi-stop-decoding-on-broken-entry.patch b/releases/4.19.318/firmware-dmi-stop-decoding-on-broken-entry.patch similarity index 100% rename from queue-4.19/firmware-dmi-stop-decoding-on-broken-entry.patch rename to releases/4.19.318/firmware-dmi-stop-decoding-on-broken-entry.patch diff --git a/queue-4.19/fsnotify-do-not-generate-events-for-o_path-file-descriptors.patch b/releases/4.19.318/fsnotify-do-not-generate-events-for-o_path-file-descriptors.patch similarity index 100% rename from queue-4.19/fsnotify-do-not-generate-events-for-o_path-file-descriptors.patch rename to releases/4.19.318/fsnotify-do-not-generate-events-for-o_path-file-descriptors.patch diff --git a/queue-4.19/hpet-support-32-bit-userspace.patch b/releases/4.19.318/hpet-support-32-bit-userspace.patch similarity index 100% rename from queue-4.19/hpet-support-32-bit-userspace.patch rename to releases/4.19.318/hpet-support-32-bit-userspace.patch diff --git a/queue-4.19/i2c-i801-annotate-apanel_addr-as-__ro_after_init.patch b/releases/4.19.318/i2c-i801-annotate-apanel_addr-as-__ro_after_init.patch similarity index 100% rename from queue-4.19/i2c-i801-annotate-apanel_addr-as-__ro_after_init.patch rename to releases/4.19.318/i2c-i801-annotate-apanel_addr-as-__ro_after_init.patch diff --git a/queue-4.19/i2c-pnx-fix-potential-deadlock-warning-from-del_time.patch b/releases/4.19.318/i2c-pnx-fix-potential-deadlock-warning-from-del_time.patch similarity index 100% rename from queue-4.19/i2c-pnx-fix-potential-deadlock-warning-from-del_time.patch rename to releases/4.19.318/i2c-pnx-fix-potential-deadlock-warning-from-del_time.patch diff --git a/queue-4.19/i2c-rcar-bring-hardware-to-known-state-when-probing.patch b/releases/4.19.318/i2c-rcar-bring-hardware-to-known-state-when-probing.patch similarity index 100% rename from queue-4.19/i2c-rcar-bring-hardware-to-known-state-when-probing.patch rename to releases/4.19.318/i2c-rcar-bring-hardware-to-known-state-when-probing.patch diff --git a/queue-4.19/ib-core-implement-a-limit-on-umad-receive-list.patch b/releases/4.19.318/ib-core-implement-a-limit-on-umad-receive-list.patch similarity index 100% rename from queue-4.19/ib-core-implement-a-limit-on-umad-receive-list.patch rename to releases/4.19.318/ib-core-implement-a-limit-on-umad-receive-list.patch diff --git a/queue-4.19/inet_diag-initialize-pad-field-in-struct-inet_diag_r.patch b/releases/4.19.318/inet_diag-initialize-pad-field-in-struct-inet_diag_r.patch similarity index 100% rename from queue-4.19/inet_diag-initialize-pad-field-in-struct-inet_diag_r.patch rename to releases/4.19.318/inet_diag-initialize-pad-field-in-struct-inet_diag_r.patch diff --git a/queue-4.19/input-ff-core-prefer-struct_size-over-open-coded-ari.patch b/releases/4.19.318/input-ff-core-prefer-struct_size-over-open-coded-ari.patch similarity index 100% rename from queue-4.19/input-ff-core-prefer-struct_size-over-open-coded-ari.patch rename to releases/4.19.318/input-ff-core-prefer-struct_size-over-open-coded-ari.patch diff --git a/queue-4.19/jffs2-fix-potential-illegal-address-access-in-jffs2_.patch b/releases/4.19.318/jffs2-fix-potential-illegal-address-access-in-jffs2_.patch similarity index 100% rename from queue-4.19/jffs2-fix-potential-illegal-address-access-in-jffs2_.patch rename to releases/4.19.318/jffs2-fix-potential-illegal-address-access-in-jffs2_.patch diff --git a/queue-4.19/libceph-fix-race-between-delayed_work-and-ceph_monc_stop.patch b/releases/4.19.318/libceph-fix-race-between-delayed_work-and-ceph_monc_stop.patch similarity index 100% rename from queue-4.19/libceph-fix-race-between-delayed_work-and-ceph_monc_stop.patch rename to releases/4.19.318/libceph-fix-race-between-delayed_work-and-ceph_monc_stop.patch diff --git a/queue-4.19/media-dvb-as102-fe-fix-as10x_register_addr-packing.patch b/releases/4.19.318/media-dvb-as102-fe-fix-as10x_register_addr-packing.patch similarity index 100% rename from queue-4.19/media-dvb-as102-fe-fix-as10x_register_addr-packing.patch rename to releases/4.19.318/media-dvb-as102-fe-fix-as10x_register_addr-packing.patch diff --git a/queue-4.19/media-dvb-frontends-tda10048-fix-integer-overflow.patch b/releases/4.19.318/media-dvb-frontends-tda10048-fix-integer-overflow.patch similarity index 100% rename from queue-4.19/media-dvb-frontends-tda10048-fix-integer-overflow.patch rename to releases/4.19.318/media-dvb-frontends-tda10048-fix-integer-overflow.patch diff --git a/queue-4.19/media-dvb-frontends-tda18271c2dd-remove-casting-duri.patch b/releases/4.19.318/media-dvb-frontends-tda18271c2dd-remove-casting-duri.patch similarity index 100% rename from queue-4.19/media-dvb-frontends-tda18271c2dd-remove-casting-duri.patch rename to releases/4.19.318/media-dvb-frontends-tda18271c2dd-remove-casting-duri.patch diff --git a/queue-4.19/media-dvb-usb-dib0700_devices-add-missing-release_fi.patch b/releases/4.19.318/media-dvb-usb-dib0700_devices-add-missing-release_fi.patch similarity index 100% rename from queue-4.19/media-dvb-usb-dib0700_devices-add-missing-release_fi.patch rename to releases/4.19.318/media-dvb-usb-dib0700_devices-add-missing-release_fi.patch diff --git a/queue-4.19/media-dw2102-don-t-translate-i2c-read-into-write.patch b/releases/4.19.318/media-dw2102-don-t-translate-i2c-read-into-write.patch similarity index 100% rename from queue-4.19/media-dw2102-don-t-translate-i2c-read-into-write.patch rename to releases/4.19.318/media-dw2102-don-t-translate-i2c-read-into-write.patch diff --git a/queue-4.19/media-dw2102-fix-a-potential-buffer-overflow.patch b/releases/4.19.318/media-dw2102-fix-a-potential-buffer-overflow.patch similarity index 100% rename from queue-4.19/media-dw2102-fix-a-potential-buffer-overflow.patch rename to releases/4.19.318/media-dw2102-fix-a-potential-buffer-overflow.patch diff --git a/queue-4.19/media-s2255-use-refcount_t-instead-of-atomic_t-for-n.patch b/releases/4.19.318/media-s2255-use-refcount_t-instead-of-atomic_t-for-n.patch similarity index 100% rename from queue-4.19/media-s2255-use-refcount_t-instead-of-atomic_t-for-n.patch rename to releases/4.19.318/media-s2255-use-refcount_t-instead-of-atomic_t-for-n.patch diff --git a/queue-4.19/mm-optimize-the-redundant-loop-of-mm_update_owner_next.patch b/releases/4.19.318/mm-optimize-the-redundant-loop-of-mm_update_owner_next.patch similarity index 100% rename from queue-4.19/mm-optimize-the-redundant-loop-of-mm_update_owner_next.patch rename to releases/4.19.318/mm-optimize-the-redundant-loop-of-mm_update_owner_next.patch diff --git a/queue-4.19/net-dsa-mv88e6xxx-correct-check-for-empty-list.patch b/releases/4.19.318/net-dsa-mv88e6xxx-correct-check-for-empty-list.patch similarity index 100% rename from queue-4.19/net-dsa-mv88e6xxx-correct-check-for-empty-list.patch rename to releases/4.19.318/net-dsa-mv88e6xxx-correct-check-for-empty-list.patch diff --git a/queue-4.19/net-ethernet-lantiq_etop-fix-double-free-in-detach.patch b/releases/4.19.318/net-ethernet-lantiq_etop-fix-double-free-in-detach.patch similarity index 100% rename from queue-4.19/net-ethernet-lantiq_etop-fix-double-free-in-detach.patch rename to releases/4.19.318/net-ethernet-lantiq_etop-fix-double-free-in-detach.patch diff --git a/queue-4.19/net-lantiq_etop-add-blank-line-after-declaration.patch b/releases/4.19.318/net-lantiq_etop-add-blank-line-after-declaration.patch similarity index 100% rename from queue-4.19/net-lantiq_etop-add-blank-line-after-declaration.patch rename to releases/4.19.318/net-lantiq_etop-add-blank-line-after-declaration.patch diff --git a/queue-4.19/net-tcp-better-handling-of-reordering-then-loss-case.patch b/releases/4.19.318/net-tcp-better-handling-of-reordering-then-loss-case.patch similarity index 100% rename from queue-4.19/net-tcp-better-handling-of-reordering-then-loss-case.patch rename to releases/4.19.318/net-tcp-better-handling-of-reordering-then-loss-case.patch diff --git a/queue-4.19/net-tcp-fix-unexcepted-socket-die-when-snd_wnd-is-0.patch b/releases/4.19.318/net-tcp-fix-unexcepted-socket-die-when-snd_wnd-is-0.patch similarity index 100% rename from queue-4.19/net-tcp-fix-unexcepted-socket-die-when-snd_wnd-is-0.patch rename to releases/4.19.318/net-tcp-fix-unexcepted-socket-die-when-snd_wnd-is-0.patch diff --git a/queue-4.19/nilfs2-add-missing-check-for-inode-numbers-on-directory-entries.patch b/releases/4.19.318/nilfs2-add-missing-check-for-inode-numbers-on-directory-entries.patch similarity index 100% rename from queue-4.19/nilfs2-add-missing-check-for-inode-numbers-on-directory-entries.patch rename to releases/4.19.318/nilfs2-add-missing-check-for-inode-numbers-on-directory-entries.patch diff --git a/queue-4.19/nilfs2-fix-incorrect-inode-allocation-from-reserved-inodes.patch b/releases/4.19.318/nilfs2-fix-incorrect-inode-allocation-from-reserved-inodes.patch similarity index 100% rename from queue-4.19/nilfs2-fix-incorrect-inode-allocation-from-reserved-inodes.patch rename to releases/4.19.318/nilfs2-fix-incorrect-inode-allocation-from-reserved-inodes.patch diff --git a/queue-4.19/nilfs2-fix-inode-number-range-checks.patch b/releases/4.19.318/nilfs2-fix-inode-number-range-checks.patch similarity index 100% rename from queue-4.19/nilfs2-fix-inode-number-range-checks.patch rename to releases/4.19.318/nilfs2-fix-inode-number-range-checks.patch diff --git a/queue-4.19/nilfs2-fix-kernel-bug-on-rename-operation-of-broken-directory.patch b/releases/4.19.318/nilfs2-fix-kernel-bug-on-rename-operation-of-broken-directory.patch similarity index 100% rename from queue-4.19/nilfs2-fix-kernel-bug-on-rename-operation-of-broken-directory.patch rename to releases/4.19.318/nilfs2-fix-kernel-bug-on-rename-operation-of-broken-directory.patch diff --git a/queue-4.19/orangefs-fix-out-of-bounds-fsid-access.patch b/releases/4.19.318/orangefs-fix-out-of-bounds-fsid-access.patch similarity index 100% rename from queue-4.19/orangefs-fix-out-of-bounds-fsid-access.patch rename to releases/4.19.318/orangefs-fix-out-of-bounds-fsid-access.patch diff --git a/queue-4.19/powerpc-64-set-_io_base-to-poison_pointer_delta-not-.patch b/releases/4.19.318/powerpc-64-set-_io_base-to-poison_pointer_delta-not-.patch similarity index 100% rename from queue-4.19/powerpc-64-set-_io_base-to-poison_pointer_delta-not-.patch rename to releases/4.19.318/powerpc-64-set-_io_base-to-poison_pointer_delta-not-.patch diff --git a/queue-4.19/powerpc-xmon-check-cpu-id-in-commands-c-dp-and-dx.patch b/releases/4.19.318/powerpc-xmon-check-cpu-id-in-commands-c-dp-and-dx.patch similarity index 100% rename from queue-4.19/powerpc-xmon-check-cpu-id-in-commands-c-dp-and-dx.patch rename to releases/4.19.318/powerpc-xmon-check-cpu-id-in-commands-c-dp-and-dx.patch diff --git a/queue-4.19/ppp-reject-claimed-as-lcp-but-actually-malformed-pac.patch b/releases/4.19.318/ppp-reject-claimed-as-lcp-but-actually-malformed-pac.patch similarity index 100% rename from queue-4.19/ppp-reject-claimed-as-lcp-but-actually-malformed-pac.patch rename to releases/4.19.318/ppp-reject-claimed-as-lcp-but-actually-malformed-pac.patch diff --git a/queue-4.19/revert-mm-writeback-fix-possible-divide-by-zero-in-wb_dirty_limits-again.patch b/releases/4.19.318/revert-mm-writeback-fix-possible-divide-by-zero-in-wb_dirty_limits-again.patch similarity index 100% rename from queue-4.19/revert-mm-writeback-fix-possible-divide-by-zero-in-wb_dirty_limits-again.patch rename to releases/4.19.318/revert-mm-writeback-fix-possible-divide-by-zero-in-wb_dirty_limits-again.patch diff --git a/queue-4.19/s390-pkey-wipe-sensitive-data-on-failure.patch b/releases/4.19.318/s390-pkey-wipe-sensitive-data-on-failure.patch similarity index 100% rename from queue-4.19/s390-pkey-wipe-sensitive-data-on-failure.patch rename to releases/4.19.318/s390-pkey-wipe-sensitive-data-on-failure.patch diff --git a/queue-4.19/sctp-prefer-struct_size-over-open-coded-arithmetic.patch b/releases/4.19.318/sctp-prefer-struct_size-over-open-coded-arithmetic.patch similarity index 100% rename from queue-4.19/sctp-prefer-struct_size-over-open-coded-arithmetic.patch rename to releases/4.19.318/sctp-prefer-struct_size-over-open-coded-arithmetic.patch diff --git a/queue-4.19/selftests-fix-oom-in-msg_zerocopy-selftest.patch b/releases/4.19.318/selftests-fix-oom-in-msg_zerocopy-selftest.patch similarity index 100% rename from queue-4.19/selftests-fix-oom-in-msg_zerocopy-selftest.patch rename to releases/4.19.318/selftests-fix-oom-in-msg_zerocopy-selftest.patch diff --git a/queue-4.19/selftests-make-order-checking-verbose-in-msg_zerocop.patch b/releases/4.19.318/selftests-make-order-checking-verbose-in-msg_zerocop.patch similarity index 100% rename from queue-4.19/selftests-make-order-checking-verbose-in-msg_zerocop.patch rename to releases/4.19.318/selftests-make-order-checking-verbose-in-msg_zerocop.patch diff --git a/queue-4.19/series b/releases/4.19.318/series similarity index 100% rename from queue-4.19/series rename to releases/4.19.318/series diff --git a/queue-4.19/sunrpc-fix-rpc-client-cleaned-up-the-freed-pipefs-dentries.patch b/releases/4.19.318/sunrpc-fix-rpc-client-cleaned-up-the-freed-pipefs-dentries.patch similarity index 100% rename from queue-4.19/sunrpc-fix-rpc-client-cleaned-up-the-freed-pipefs-dentries.patch rename to releases/4.19.318/sunrpc-fix-rpc-client-cleaned-up-the-freed-pipefs-dentries.patch diff --git a/queue-4.19/tcp-add-ece_ack-flag-to-reno-sack-functions.patch b/releases/4.19.318/tcp-add-ece_ack-flag-to-reno-sack-functions.patch similarity index 100% rename from queue-4.19/tcp-add-ece_ack-flag-to-reno-sack-functions.patch rename to releases/4.19.318/tcp-add-ece_ack-flag-to-reno-sack-functions.patch diff --git a/queue-4.19/tcp-avoid-too-many-retransmit-packets.patch b/releases/4.19.318/tcp-avoid-too-many-retransmit-packets.patch similarity index 100% rename from queue-4.19/tcp-avoid-too-many-retransmit-packets.patch rename to releases/4.19.318/tcp-avoid-too-many-retransmit-packets.patch diff --git a/queue-4.19/tcp-fix-incorrect-undo-caused-by-dsack-of-tlp-retran.patch b/releases/4.19.318/tcp-fix-incorrect-undo-caused-by-dsack-of-tlp-retran.patch similarity index 100% rename from queue-4.19/tcp-fix-incorrect-undo-caused-by-dsack-of-tlp-retran.patch rename to releases/4.19.318/tcp-fix-incorrect-undo-caused-by-dsack-of-tlp-retran.patch diff --git a/queue-4.19/tcp-refactor-tcp_retransmit_timer.patch b/releases/4.19.318/tcp-refactor-tcp_retransmit_timer.patch similarity index 100% rename from queue-4.19/tcp-refactor-tcp_retransmit_timer.patch rename to releases/4.19.318/tcp-refactor-tcp_retransmit_timer.patch diff --git a/queue-4.19/tcp-take-care-of-compressed-acks-in-tcp_add_reno_sac.patch b/releases/4.19.318/tcp-take-care-of-compressed-acks-in-tcp_add_reno_sac.patch similarity index 100% rename from queue-4.19/tcp-take-care-of-compressed-acks-in-tcp_add_reno_sac.patch rename to releases/4.19.318/tcp-take-care-of-compressed-acks-in-tcp_add_reno_sac.patch diff --git a/queue-4.19/tcp-tcp_mark_head_lost-is-only-valid-for-sack-tcp.patch b/releases/4.19.318/tcp-tcp_mark_head_lost-is-only-valid-for-sack-tcp.patch similarity index 100% rename from queue-4.19/tcp-tcp_mark_head_lost-is-only-valid-for-sack-tcp.patch rename to releases/4.19.318/tcp-tcp_mark_head_lost-is-only-valid-for-sack-tcp.patch diff --git a/queue-4.19/tcp-use-signed-arithmetic-in-tcp_rtx_probe0_timed_out.patch b/releases/4.19.318/tcp-use-signed-arithmetic-in-tcp_rtx_probe0_timed_out.patch similarity index 100% rename from queue-4.19/tcp-use-signed-arithmetic-in-tcp_rtx_probe0_timed_out.patch rename to releases/4.19.318/tcp-use-signed-arithmetic-in-tcp_rtx_probe0_timed_out.patch diff --git a/queue-4.19/tcp_metrics-validate-source-addr-length.patch b/releases/4.19.318/tcp_metrics-validate-source-addr-length.patch similarity index 100% rename from queue-4.19/tcp_metrics-validate-source-addr-length.patch rename to releases/4.19.318/tcp_metrics-validate-source-addr-length.patch diff --git a/queue-4.19/upstream-tcp-fix-dsack-undo-in-fast-recovery-to-call.patch b/releases/4.19.318/upstream-tcp-fix-dsack-undo-in-fast-recovery-to-call.patch similarity index 100% rename from queue-4.19/upstream-tcp-fix-dsack-undo-in-fast-recovery-to-call.patch rename to releases/4.19.318/upstream-tcp-fix-dsack-undo-in-fast-recovery-to-call.patch diff --git a/queue-4.19/usb-add-usb_quirk_no_set_intf-quirk-for-start-bp-850k.patch b/releases/4.19.318/usb-add-usb_quirk_no_set_intf-quirk-for-start-bp-850k.patch similarity index 100% rename from queue-4.19/usb-add-usb_quirk_no_set_intf-quirk-for-start-bp-850k.patch rename to releases/4.19.318/usb-add-usb_quirk_no_set_intf-quirk-for-start-bp-850k.patch diff --git a/queue-4.19/usb-core-fix-duplicate-endpoint-bug-by-clearing-reserved-bits-in-the-descriptor.patch b/releases/4.19.318/usb-core-fix-duplicate-endpoint-bug-by-clearing-reserved-bits-in-the-descriptor.patch similarity index 100% rename from queue-4.19/usb-core-fix-duplicate-endpoint-bug-by-clearing-reserved-bits-in-the-descriptor.patch rename to releases/4.19.318/usb-core-fix-duplicate-endpoint-bug-by-clearing-reserved-bits-in-the-descriptor.patch diff --git a/queue-4.19/usb-gadget-configfs-prevent-oob-read-write-in-usb_string_copy.patch b/releases/4.19.318/usb-gadget-configfs-prevent-oob-read-write-in-usb_string_copy.patch similarity index 100% rename from queue-4.19/usb-gadget-configfs-prevent-oob-read-write-in-usb_string_copy.patch rename to releases/4.19.318/usb-gadget-configfs-prevent-oob-read-write-in-usb_string_copy.patch diff --git a/queue-4.19/usb-serial-option-add-fibocom-fm350-gl.patch b/releases/4.19.318/usb-serial-option-add-fibocom-fm350-gl.patch similarity index 100% rename from queue-4.19/usb-serial-option-add-fibocom-fm350-gl.patch rename to releases/4.19.318/usb-serial-option-add-fibocom-fm350-gl.patch diff --git a/queue-4.19/usb-serial-option-add-netprisma-lcuk54-series-modules.patch b/releases/4.19.318/usb-serial-option-add-netprisma-lcuk54-series-modules.patch similarity index 100% rename from queue-4.19/usb-serial-option-add-netprisma-lcuk54-series-modules.patch rename to releases/4.19.318/usb-serial-option-add-netprisma-lcuk54-series-modules.patch diff --git a/queue-4.19/usb-serial-option-add-rolling-rw350-gl-variants.patch b/releases/4.19.318/usb-serial-option-add-rolling-rw350-gl-variants.patch similarity index 100% rename from queue-4.19/usb-serial-option-add-rolling-rw350-gl-variants.patch rename to releases/4.19.318/usb-serial-option-add-rolling-rw350-gl-variants.patch diff --git a/queue-4.19/usb-serial-option-add-support-for-foxconn-t99w651.patch b/releases/4.19.318/usb-serial-option-add-support-for-foxconn-t99w651.patch similarity index 100% rename from queue-4.19/usb-serial-option-add-support-for-foxconn-t99w651.patch rename to releases/4.19.318/usb-serial-option-add-support-for-foxconn-t99w651.patch diff --git a/queue-4.19/usb-serial-option-add-telit-fn912-rmnet-compositions.patch b/releases/4.19.318/usb-serial-option-add-telit-fn912-rmnet-compositions.patch similarity index 100% rename from queue-4.19/usb-serial-option-add-telit-fn912-rmnet-compositions.patch rename to releases/4.19.318/usb-serial-option-add-telit-fn912-rmnet-compositions.patch diff --git a/queue-4.19/usb-serial-option-add-telit-generic-core-dump-composition.patch b/releases/4.19.318/usb-serial-option-add-telit-generic-core-dump-composition.patch similarity index 100% rename from queue-4.19/usb-serial-option-add-telit-generic-core-dump-composition.patch rename to releases/4.19.318/usb-serial-option-add-telit-generic-core-dump-composition.patch -- 2.47.3