merge staging into queue: 7.1 6.18 6.12 6.6 6.1 5.15 5.10

diff --git a/staging-5.10/mount-honour-sb_nouser-in-the-new-mount-api.patch b/queue-5.10/mount-honour-sb_nouser-in-the-new-mount-api.patch
similarity index 100%
rename from staging-5.10/mount-honour-sb_nouser-in-the-new-mount-api.patch
rename to queue-5.10/mount-honour-sb_nouser-in-the-new-mount-api.patch

diff --git a/queue-5.10/series b/queue-5.10/series
index 87beecc2978a1d52916cb2cf33545c07bfd089e5..202f9c98395c051c9eca6533f38ceff12b2677be 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -306,3 +306,4 @@ bluetooth-sco-fix-use-after-free-in-sco_recv_frame-d.patch
 net-openvswitch-fix-skb-leak-on-flow-key-update-fail.patch
 firmware-stratix10-svc-fix-memory-leaks-and-list-cor.patch
 gpio-pch-use-raw_spinlock_t-for-the-register-lock.patch
+mount-honour-sb_nouser-in-the-new-mount-api.patch

diff --git a/staging-5.15/mount-honour-sb_nouser-in-the-new-mount-api.patch b/queue-5.15/mount-honour-sb_nouser-in-the-new-mount-api.patch
similarity index 100%
rename from staging-5.15/mount-honour-sb_nouser-in-the-new-mount-api.patch
rename to queue-5.15/mount-honour-sb_nouser-in-the-new-mount-api.patch

diff --git a/queue-5.15/series b/queue-5.15/series
index d9ae4cba124d789556e8350dd5181f4e1c6fe6f0..433b904705dc6257d893525fd181245d6615b620 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -363,3 +363,4 @@ mm-huge_memory-unlock-i_mmap_rwsem-before-releasing-.patch
 net-openvswitch-fix-skb-leak-on-flow-key-update-fail.patch
 firmware-stratix10-svc-fix-memory-leaks-and-list-cor.patch
 gpio-pch-use-raw_spinlock_t-for-the-register-lock.patch
+mount-honour-sb_nouser-in-the-new-mount-api.patch

diff --git a/staging-6.1/mount-honour-sb_nouser-in-the-new-mount-api.patch b/queue-6.1/mount-honour-sb_nouser-in-the-new-mount-api.patch
similarity index 100%
rename from staging-6.1/mount-honour-sb_nouser-in-the-new-mount-api.patch
rename to queue-6.1/mount-honour-sb_nouser-in-the-new-mount-api.patch

diff --git a/queue-6.1/series b/queue-6.1/series
index cf7b2c67267535cb4c83cd72c762b34453dcc04a..64c596a6e43854595ef467471bb6c6d871d8f143 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -483,3 +483,4 @@ gpio-pch-use-raw_spinlock_t-for-the-register-lock.patch
 bluetooth-l2cap-fix-uaf-in-channel-timeout-by-holdin.patch
 bluetooth-6lowpan-fix-using-chan-conn-as-indication-.patch
 bluetooth-hci_conn-fix-potential-uaf-in-create_big_s.patch
+mount-honour-sb_nouser-in-the-new-mount-api.patch

diff --git a/staging-6.12/mount-honour-sb_nouser-in-the-new-mount-api.patch b/queue-6.12/mount-honour-sb_nouser-in-the-new-mount-api.patch
similarity index 100%
rename from staging-6.12/mount-honour-sb_nouser-in-the-new-mount-api.patch
rename to queue-6.12/mount-honour-sb_nouser-in-the-new-mount-api.patch

diff --git a/staging-5.10/series b/queue-6.12/series
similarity index 100%
rename from staging-5.10/series
rename to queue-6.12/series

diff --git a/staging-6.18/kvm-s390-pci-fix-resource-leak-on-irq-registration-f.patch b/queue-6.18/kvm-s390-pci-fix-resource-leak-on-irq-registration-f.patch
similarity index 100%
rename from staging-6.18/kvm-s390-pci-fix-resource-leak-on-irq-registration-f.patch
rename to queue-6.18/kvm-s390-pci-fix-resource-leak-on-irq-registration-f.patch

diff --git a/staging-6.18/mount-honour-sb_nouser-in-the-new-mount-api.patch b/queue-6.18/mount-honour-sb_nouser-in-the-new-mount-api.patch
similarity index 100%
rename from staging-6.18/mount-honour-sb_nouser-in-the-new-mount-api.patch
rename to queue-6.18/mount-honour-sb_nouser-in-the-new-mount-api.patch

diff --git a/staging-6.18/series b/queue-6.18/series
similarity index 100%
rename from staging-6.18/series
rename to queue-6.18/series

diff --git a/staging-6.6/mount-honour-sb_nouser-in-the-new-mount-api.patch b/queue-6.6/mount-honour-sb_nouser-in-the-new-mount-api.patch
similarity index 100%
rename from staging-6.6/mount-honour-sb_nouser-in-the-new-mount-api.patch
rename to queue-6.6/mount-honour-sb_nouser-in-the-new-mount-api.patch

diff --git a/staging-5.15/series b/queue-6.6/series
similarity index 100%
rename from staging-5.15/series
rename to queue-6.6/series

diff --git a/staging-7.1/mount-honour-sb_nouser-in-the-new-mount-api.patch b/queue-7.1/mount-honour-sb_nouser-in-the-new-mount-api.patch
similarity index 100%
rename from staging-7.1/mount-honour-sb_nouser-in-the-new-mount-api.patch
rename to queue-7.1/mount-honour-sb_nouser-in-the-new-mount-api.patch

diff --git a/staging-6.1/series b/queue-7.1/series
similarity index 100%
rename from staging-6.1/series
rename to queue-7.1/series

diff --git a/staging-6.12/series b/staging-6.12/series
deleted file mode 100644 (file)
index d51a045..0000000
--- a/staging-6.12/series
+++ /dev/null
@@ -1 +0,0 @@
-mount-honour-sb_nouser-in-the-new-mount-api.patch

diff --git a/staging-6.6/series b/staging-6.6/series
deleted file mode 100644 (file)
index d51a045..0000000
--- a/staging-6.6/series
+++ /dev/null
@@ -1 +0,0 @@
-mount-honour-sb_nouser-in-the-new-mount-api.patch

diff --git a/staging-7.1/series b/staging-7.1/series
deleted file mode 100644 (file)
index d51a045..0000000
--- a/staging-7.1/series
+++ /dev/null
@@ -1 +0,0 @@
-mount-honour-sb_nouser-in-the-new-mount-api.patch