move 4.4 patches back into place for release

diff --git a/rc-4.4/af_unix-fix-garbage-collect-vs-msg_peek.patch b/queue-4.4/af_unix-fix-garbage-collect-vs-msg_peek.patch
similarity index 100%
rename from rc-4.4/af_unix-fix-garbage-collect-vs-msg_peek.patch
rename to queue-4.4/af_unix-fix-garbage-collect-vs-msg_peek.patch

diff --git a/rc-4.4/arm-dts-versatile-fix-up-interrupt-controller-node-n.patch b/queue-4.4/arm-dts-versatile-fix-up-interrupt-controller-node-n.patch
similarity index 100%
rename from rc-4.4/arm-dts-versatile-fix-up-interrupt-controller-node-n.patch
rename to queue-4.4/arm-dts-versatile-fix-up-interrupt-controller-node-n.patch

diff --git a/rc-4.4/arm-ensure-the-signal-page-contains-defined-contents.patch b/queue-4.4/arm-ensure-the-signal-page-contains-defined-contents.patch
similarity index 100%
rename from rc-4.4/arm-ensure-the-signal-page-contains-defined-contents.patch
rename to queue-4.4/arm-ensure-the-signal-page-contains-defined-contents.patch

diff --git a/rc-4.4/can-ems_usb-fix-memory-leak.patch b/queue-4.4/can-ems_usb-fix-memory-leak.patch
similarity index 100%
rename from rc-4.4/can-ems_usb-fix-memory-leak.patch
rename to queue-4.4/can-ems_usb-fix-memory-leak.patch

diff --git a/rc-4.4/can-esd_usb2-fix-memory-leak.patch b/queue-4.4/can-esd_usb2-fix-memory-leak.patch
similarity index 100%
rename from rc-4.4/can-esd_usb2-fix-memory-leak.patch
rename to queue-4.4/can-esd_usb2-fix-memory-leak.patch

diff --git a/rc-4.4/can-usb_8dev-fix-memory-leak.patch b/queue-4.4/can-usb_8dev-fix-memory-leak.patch
similarity index 100%
rename from rc-4.4/can-usb_8dev-fix-memory-leak.patch
rename to queue-4.4/can-usb_8dev-fix-memory-leak.patch

diff --git a/rc-4.4/cfg80211-fix-possible-memory-leak-in-function-cfg80211_bss_update.patch b/queue-4.4/cfg80211-fix-possible-memory-leak-in-function-cfg80211_bss_update.patch
similarity index 100%
rename from rc-4.4/cfg80211-fix-possible-memory-leak-in-function-cfg80211_bss_update.patch
rename to queue-4.4/cfg80211-fix-possible-memory-leak-in-function-cfg80211_bss_update.patch

diff --git a/rc-4.4/hfs-add-lock-nesting-notation-to-hfs_find_init.patch b/queue-4.4/hfs-add-lock-nesting-notation-to-hfs_find_init.patch
similarity index 100%
rename from rc-4.4/hfs-add-lock-nesting-notation-to-hfs_find_init.patch
rename to queue-4.4/hfs-add-lock-nesting-notation-to-hfs_find_init.patch

diff --git a/rc-4.4/hfs-add-missing-clean-up-in-hfs_fill_super.patch b/queue-4.4/hfs-add-missing-clean-up-in-hfs_fill_super.patch
similarity index 100%
rename from rc-4.4/hfs-add-missing-clean-up-in-hfs_fill_super.patch
rename to queue-4.4/hfs-add-missing-clean-up-in-hfs_fill_super.patch

diff --git a/rc-4.4/hfs-fix-high-memory-mapping-in-hfs_bnode_read.patch b/queue-4.4/hfs-fix-high-memory-mapping-in-hfs_bnode_read.patch
similarity index 100%
rename from rc-4.4/hfs-fix-high-memory-mapping-in-hfs_bnode_read.patch
rename to queue-4.4/hfs-fix-high-memory-mapping-in-hfs_bnode_read.patch

diff --git a/rc-4.4/lib-string.c-add-multibyte-memset-functions.patch b/queue-4.4/lib-string.c-add-multibyte-memset-functions.patch
similarity index 100%
rename from rc-4.4/lib-string.c-add-multibyte-memset-functions.patch
rename to queue-4.4/lib-string.c-add-multibyte-memset-functions.patch

diff --git a/rc-4.4/mlx4-fix-missing-error-code-in-mlx4_load_one.patch b/queue-4.4/mlx4-fix-missing-error-code-in-mlx4_load_one.patch
similarity index 100%
rename from rc-4.4/mlx4-fix-missing-error-code-in-mlx4_load_one.patch
rename to queue-4.4/mlx4-fix-missing-error-code-in-mlx4_load_one.patch

diff --git a/rc-4.4/net-802-garp-fix-memleak-in-garp_request_join.patch b/queue-4.4/net-802-garp-fix-memleak-in-garp_request_join.patch
similarity index 100%
rename from rc-4.4/net-802-garp-fix-memleak-in-garp_request_join.patch
rename to queue-4.4/net-802-garp-fix-memleak-in-garp_request_join.patch

diff --git a/rc-4.4/net-802-mrp-fix-memleak-in-mrp_request_join.patch b/queue-4.4/net-802-mrp-fix-memleak-in-mrp_request_join.patch
similarity index 100%
rename from rc-4.4/net-802-mrp-fix-memleak-in-mrp_request_join.patch
rename to queue-4.4/net-802-mrp-fix-memleak-in-mrp_request_join.patch

diff --git a/rc-4.4/net-llc-fix-skb_over_panic.patch b/queue-4.4/net-llc-fix-skb_over_panic.patch
similarity index 100%
rename from rc-4.4/net-llc-fix-skb_over_panic.patch
rename to queue-4.4/net-llc-fix-skb_over_panic.patch

diff --git a/rc-4.4/net-split-out-functions-related-to-registering-inflight-socket-files.patch b/queue-4.4/net-split-out-functions-related-to-registering-inflight-socket-files.patch
similarity index 100%
rename from rc-4.4/net-split-out-functions-related-to-registering-inflight-socket-files.patch
rename to queue-4.4/net-split-out-functions-related-to-registering-inflight-socket-files.patch

diff --git a/rc-4.4/netfilter-nft_nat-allow-to-specify-layer-4-protocol-.patch b/queue-4.4/netfilter-nft_nat-allow-to-specify-layer-4-protocol-.patch
similarity index 100%
rename from rc-4.4/netfilter-nft_nat-allow-to-specify-layer-4-protocol-.patch
rename to queue-4.4/netfilter-nft_nat-allow-to-specify-layer-4-protocol-.patch

diff --git a/rc-4.4/niu-fix-incorrect-error-return-missed-in-previous-revert.patch b/queue-4.4/niu-fix-incorrect-error-return-missed-in-previous-revert.patch
similarity index 100%
rename from rc-4.4/niu-fix-incorrect-error-return-missed-in-previous-revert.patch
rename to queue-4.4/niu-fix-incorrect-error-return-missed-in-previous-revert.patch

diff --git a/rc-4.4/ocfs2-fix-zero-out-valid-data.patch b/queue-4.4/ocfs2-fix-zero-out-valid-data.patch
similarity index 100%
rename from rc-4.4/ocfs2-fix-zero-out-valid-data.patch
rename to queue-4.4/ocfs2-fix-zero-out-valid-data.patch

diff --git a/rc-4.4/ocfs2-issue-zeroout-to-eof-blocks.patch b/queue-4.4/ocfs2-issue-zeroout-to-eof-blocks.patch
similarity index 100%
rename from rc-4.4/ocfs2-issue-zeroout-to-eof-blocks.patch
rename to queue-4.4/ocfs2-issue-zeroout-to-eof-blocks.patch

diff --git a/rc-4.4/sctp-move-198-addresses-from-unusable-to-private-sco.patch b/queue-4.4/sctp-move-198-addresses-from-unusable-to-private-sco.patch
similarity index 100%
rename from rc-4.4/sctp-move-198-addresses-from-unusable-to-private-sco.patch
rename to queue-4.4/sctp-move-198-addresses-from-unusable-to-private-sco.patch

diff --git a/queue-4.4/series b/queue-4.4/series
index 5373ff710bc4a80c75a61c10c4c4202c176f2725..ea42503d89c244529c356b8bc556af3d3e745967 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -1 +1,26 @@
-btrfs-mark-compressed-range-uptodate-only-if-all-bio.patch
+net-split-out-functions-related-to-registering-inflight-socket-files.patch
+af_unix-fix-garbage-collect-vs-msg_peek.patch
+workqueue-fix-uaf-in-pwq_unbound_release_workfn.patch
+net-802-mrp-fix-memleak-in-mrp_request_join.patch
+net-802-garp-fix-memleak-in-garp_request_join.patch
+sctp-move-198-addresses-from-unusable-to-private-sco.patch
+hfs-add-missing-clean-up-in-hfs_fill_super.patch
+hfs-fix-high-memory-mapping-in-hfs_bnode_read.patch
+hfs-add-lock-nesting-notation-to-hfs_find_init.patch
+arm-dts-versatile-fix-up-interrupt-controller-node-n.patch
+lib-string.c-add-multibyte-memset-functions.patch
+arm-ensure-the-signal-page-contains-defined-contents.patch
+ocfs2-fix-zero-out-valid-data.patch
+ocfs2-issue-zeroout-to-eof-blocks.patch
+can-usb_8dev-fix-memory-leak.patch
+can-ems_usb-fix-memory-leak.patch
+can-esd_usb2-fix-memory-leak.patch
+niu-fix-incorrect-error-return-missed-in-previous-revert.patch
+x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch
+cfg80211-fix-possible-memory-leak-in-function-cfg80211_bss_update.patch
+netfilter-nft_nat-allow-to-specify-layer-4-protocol-.patch
+tipc-fix-sleeping-in-tipc-accept-routine.patch
+mlx4-fix-missing-error-code-in-mlx4_load_one.patch
+net-llc-fix-skb_over_panic.patch
+tulip-windbond-840-fix-missing-pci_disable_device-in.patch
+sis900-fix-missing-pci_disable_device-in-probe-and-r.patch

diff --git a/rc-4.4/sis900-fix-missing-pci_disable_device-in-probe-and-r.patch b/queue-4.4/sis900-fix-missing-pci_disable_device-in-probe-and-r.patch
similarity index 100%
rename from rc-4.4/sis900-fix-missing-pci_disable_device-in-probe-and-r.patch
rename to queue-4.4/sis900-fix-missing-pci_disable_device-in-probe-and-r.patch

diff --git a/rc-4.4/tipc-fix-sleeping-in-tipc-accept-routine.patch b/queue-4.4/tipc-fix-sleeping-in-tipc-accept-routine.patch
similarity index 100%
rename from rc-4.4/tipc-fix-sleeping-in-tipc-accept-routine.patch
rename to queue-4.4/tipc-fix-sleeping-in-tipc-accept-routine.patch

diff --git a/rc-4.4/tulip-windbond-840-fix-missing-pci_disable_device-in.patch b/queue-4.4/tulip-windbond-840-fix-missing-pci_disable_device-in.patch
similarity index 100%
rename from rc-4.4/tulip-windbond-840-fix-missing-pci_disable_device-in.patch
rename to queue-4.4/tulip-windbond-840-fix-missing-pci_disable_device-in.patch

diff --git a/rc-4.4/workqueue-fix-uaf-in-pwq_unbound_release_workfn.patch b/queue-4.4/workqueue-fix-uaf-in-pwq_unbound_release_workfn.patch
similarity index 100%
rename from rc-4.4/workqueue-fix-uaf-in-pwq_unbound_release_workfn.patch
rename to queue-4.4/workqueue-fix-uaf-in-pwq_unbound_release_workfn.patch

diff --git a/rc-4.4/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch b/queue-4.4/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch
similarity index 100%
rename from rc-4.4/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch
rename to queue-4.4/x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch

diff --git a/rc-4.4/series b/rc-4.4/series
deleted file mode 100644 (file)
index ea42503..0000000
--- a/rc-4.4/series
+++ /dev/null
@@ -1,26 +0,0 @@
-net-split-out-functions-related-to-registering-inflight-socket-files.patch
-af_unix-fix-garbage-collect-vs-msg_peek.patch
-workqueue-fix-uaf-in-pwq_unbound_release_workfn.patch
-net-802-mrp-fix-memleak-in-mrp_request_join.patch
-net-802-garp-fix-memleak-in-garp_request_join.patch
-sctp-move-198-addresses-from-unusable-to-private-sco.patch
-hfs-add-missing-clean-up-in-hfs_fill_super.patch
-hfs-fix-high-memory-mapping-in-hfs_bnode_read.patch
-hfs-add-lock-nesting-notation-to-hfs_find_init.patch
-arm-dts-versatile-fix-up-interrupt-controller-node-n.patch
-lib-string.c-add-multibyte-memset-functions.patch
-arm-ensure-the-signal-page-contains-defined-contents.patch
-ocfs2-fix-zero-out-valid-data.patch
-ocfs2-issue-zeroout-to-eof-blocks.patch
-can-usb_8dev-fix-memory-leak.patch
-can-ems_usb-fix-memory-leak.patch
-can-esd_usb2-fix-memory-leak.patch
-niu-fix-incorrect-error-return-missed-in-previous-revert.patch
-x86-asm-ensure-asm-proto.h-can-be-included-stand-alo.patch
-cfg80211-fix-possible-memory-leak-in-function-cfg80211_bss_update.patch
-netfilter-nft_nat-allow-to-specify-layer-4-protocol-.patch
-tipc-fix-sleeping-in-tipc-accept-routine.patch
-mlx4-fix-missing-error-code-in-mlx4_load_one.patch
-net-llc-fix-skb_over_panic.patch
-tulip-windbond-840-fix-missing-pci_disable_device-in.patch
-sis900-fix-missing-pci_disable_device-in-probe-and-r.patch

diff --git a/queue-4.4/btrfs-mark-compressed-range-uptodate-only-if-all-bio.patch b/tmp-4.4/btrfs-mark-compressed-range-uptodate-only-if-all-bio.patch
similarity index 100%
rename from queue-4.4/btrfs-mark-compressed-range-uptodate-only-if-all-bio.patch
rename to tmp-4.4/btrfs-mark-compressed-range-uptodate-only-if-all-bio.patch

diff --git a/tmp-4.4/series b/tmp-4.4/series
new file mode 100644 (file)
index 0000000..5373ff7
--- /dev/null
+++ b/tmp-4.4/series
@@ -0,0 +1 @@
+btrfs-mark-compressed-range-uptodate-only-if-all-bio.patch