move 4.14 patches back into -rc and queued patches

diff --git a/queue-4.14/series b/queue-4.14/series
index 25d331c5df68ec71df8fe37b85c6d568a092e530..5373ff710bc4a80c75a61c10c4c4202c176f2725 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -1,39 +1 @@
-selftest-fix-build-error-in-tools-testing-selftests-vm-userfaultfd.c.patch
-kvm-x86-determine-if-an-exception-has-an-error-code-only-when-injecting-it.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
-net-annotate-data-race-around-sk_ll_usec.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
-virtio_net-do-not-pull-payload-in-skb-head.patch
-gro-ensure-frag0-meets-ip-header-alignment.patch
-x86-kvm-fix-vcpu-id-indexed-array-sizes.patch
-ocfs2-fix-zero-out-valid-data.patch
-ocfs2-issue-zeroout-to-eof-blocks.patch
-can-raw-raw_setsockopt-fix-raw_rcv-panic-for-sock-uaf.patch
-can-mcba_usb_start-add-missing-urb-transfer_dma-initialization.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
-nfc-nfcsim-fix-use-after-free-during-module-unload.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-conntrack-adjust-stop-timestamp-to-real-ex.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
-net-mlx5-fix-flow-table-chaining.patch
-sctp-fix-return-value-check-in-__sctp_rcv_asconf_loo.patch
-tulip-windbond-840-fix-missing-pci_disable_device-in.patch
-sis900-fix-missing-pci_disable_device-in-probe-and-r.patch
-can-hi311x-fix-a-signedness-bug-in-hi3110_cmd.patch
-revert-perf-map-fix-dso-nsinfo-refcounting.patch
 btrfs-mark-compressed-range-uptodate-only-if-all-bio.patch

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

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

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

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

diff --git a/queue-4.14/can-hi311x-fix-a-signedness-bug-in-hi3110_cmd.patch b/rc-4.14/can-hi311x-fix-a-signedness-bug-in-hi3110_cmd.patch
similarity index 100%
rename from queue-4.14/can-hi311x-fix-a-signedness-bug-in-hi3110_cmd.patch
rename to rc-4.14/can-hi311x-fix-a-signedness-bug-in-hi3110_cmd.patch

diff --git a/queue-4.14/can-mcba_usb_start-add-missing-urb-transfer_dma-initialization.patch b/rc-4.14/can-mcba_usb_start-add-missing-urb-transfer_dma-initialization.patch
similarity index 100%
rename from queue-4.14/can-mcba_usb_start-add-missing-urb-transfer_dma-initialization.patch
rename to rc-4.14/can-mcba_usb_start-add-missing-urb-transfer_dma-initialization.patch

diff --git a/queue-4.14/can-raw-raw_setsockopt-fix-raw_rcv-panic-for-sock-uaf.patch b/rc-4.14/can-raw-raw_setsockopt-fix-raw_rcv-panic-for-sock-uaf.patch
similarity index 100%
rename from queue-4.14/can-raw-raw_setsockopt-fix-raw_rcv-panic-for-sock-uaf.patch
rename to rc-4.14/can-raw-raw_setsockopt-fix-raw_rcv-panic-for-sock-uaf.patch

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

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

diff --git a/queue-4.14/gro-ensure-frag0-meets-ip-header-alignment.patch b/rc-4.14/gro-ensure-frag0-meets-ip-header-alignment.patch
similarity index 100%
rename from queue-4.14/gro-ensure-frag0-meets-ip-header-alignment.patch
rename to rc-4.14/gro-ensure-frag0-meets-ip-header-alignment.patch

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

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

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

diff --git a/queue-4.14/kvm-x86-determine-if-an-exception-has-an-error-code-only-when-injecting-it.patch b/rc-4.14/kvm-x86-determine-if-an-exception-has-an-error-code-only-when-injecting-it.patch
similarity index 100%
rename from queue-4.14/kvm-x86-determine-if-an-exception-has-an-error-code-only-when-injecting-it.patch
rename to rc-4.14/kvm-x86-determine-if-an-exception-has-an-error-code-only-when-injecting-it.patch

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

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

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

diff --git a/queue-4.14/net-annotate-data-race-around-sk_ll_usec.patch b/rc-4.14/net-annotate-data-race-around-sk_ll_usec.patch
similarity index 100%
rename from queue-4.14/net-annotate-data-race-around-sk_ll_usec.patch
rename to rc-4.14/net-annotate-data-race-around-sk_ll_usec.patch

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

diff --git a/queue-4.14/net-mlx5-fix-flow-table-chaining.patch b/rc-4.14/net-mlx5-fix-flow-table-chaining.patch
similarity index 100%
rename from queue-4.14/net-mlx5-fix-flow-table-chaining.patch
rename to rc-4.14/net-mlx5-fix-flow-table-chaining.patch

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

diff --git a/queue-4.14/netfilter-conntrack-adjust-stop-timestamp-to-real-ex.patch b/rc-4.14/netfilter-conntrack-adjust-stop-timestamp-to-real-ex.patch
similarity index 100%
rename from queue-4.14/netfilter-conntrack-adjust-stop-timestamp-to-real-ex.patch
rename to rc-4.14/netfilter-conntrack-adjust-stop-timestamp-to-real-ex.patch

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

diff --git a/queue-4.14/nfc-nfcsim-fix-use-after-free-during-module-unload.patch b/rc-4.14/nfc-nfcsim-fix-use-after-free-during-module-unload.patch
similarity index 100%
rename from queue-4.14/nfc-nfcsim-fix-use-after-free-during-module-unload.patch
rename to rc-4.14/nfc-nfcsim-fix-use-after-free-during-module-unload.patch

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

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

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

diff --git a/queue-4.14/revert-perf-map-fix-dso-nsinfo-refcounting.patch b/rc-4.14/revert-perf-map-fix-dso-nsinfo-refcounting.patch
similarity index 100%
rename from queue-4.14/revert-perf-map-fix-dso-nsinfo-refcounting.patch
rename to rc-4.14/revert-perf-map-fix-dso-nsinfo-refcounting.patch

diff --git a/queue-4.14/sctp-fix-return-value-check-in-__sctp_rcv_asconf_loo.patch b/rc-4.14/sctp-fix-return-value-check-in-__sctp_rcv_asconf_loo.patch
similarity index 100%
rename from queue-4.14/sctp-fix-return-value-check-in-__sctp_rcv_asconf_loo.patch
rename to rc-4.14/sctp-fix-return-value-check-in-__sctp_rcv_asconf_loo.patch

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

diff --git a/queue-4.14/selftest-fix-build-error-in-tools-testing-selftests-vm-userfaultfd.c.patch b/rc-4.14/selftest-fix-build-error-in-tools-testing-selftests-vm-userfaultfd.c.patch
similarity index 100%
rename from queue-4.14/selftest-fix-build-error-in-tools-testing-selftests-vm-userfaultfd.c.patch
rename to rc-4.14/selftest-fix-build-error-in-tools-testing-selftests-vm-userfaultfd.c.patch

diff --git a/rc-4.14/series b/rc-4.14/series
new file mode 100644 (file)
index 0000000..5454a05
--- /dev/null
+++ b/rc-4.14/series
@@ -0,0 +1,38 @@
+selftest-fix-build-error-in-tools-testing-selftests-vm-userfaultfd.c.patch
+kvm-x86-determine-if-an-exception-has-an-error-code-only-when-injecting-it.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
+net-annotate-data-race-around-sk_ll_usec.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
+virtio_net-do-not-pull-payload-in-skb-head.patch
+gro-ensure-frag0-meets-ip-header-alignment.patch
+x86-kvm-fix-vcpu-id-indexed-array-sizes.patch
+ocfs2-fix-zero-out-valid-data.patch
+ocfs2-issue-zeroout-to-eof-blocks.patch
+can-raw-raw_setsockopt-fix-raw_rcv-panic-for-sock-uaf.patch
+can-mcba_usb_start-add-missing-urb-transfer_dma-initialization.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
+nfc-nfcsim-fix-use-after-free-during-module-unload.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-conntrack-adjust-stop-timestamp-to-real-ex.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
+net-mlx5-fix-flow-table-chaining.patch
+sctp-fix-return-value-check-in-__sctp_rcv_asconf_loo.patch
+tulip-windbond-840-fix-missing-pci_disable_device-in.patch
+sis900-fix-missing-pci_disable_device-in-probe-and-r.patch
+can-hi311x-fix-a-signedness-bug-in-hi3110_cmd.patch
+revert-perf-map-fix-dso-nsinfo-refcounting.patch

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

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

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

diff --git a/queue-4.14/virtio_net-do-not-pull-payload-in-skb-head.patch b/rc-4.14/virtio_net-do-not-pull-payload-in-skb-head.patch
similarity index 100%
rename from queue-4.14/virtio_net-do-not-pull-payload-in-skb-head.patch
rename to rc-4.14/virtio_net-do-not-pull-payload-in-skb-head.patch

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

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

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

diff --git a/queue-4.14/x86-kvm-fix-vcpu-id-indexed-array-sizes.patch b/rc-4.14/x86-kvm-fix-vcpu-id-indexed-array-sizes.patch
similarity index 100%
rename from queue-4.14/x86-kvm-fix-vcpu-id-indexed-array-sizes.patch
rename to rc-4.14/x86-kvm-fix-vcpu-id-indexed-array-sizes.patch