From 38896de0ab4bfa837ad5f0044c9d2fb7e48b74bf Mon Sep 17 00:00:00 2001
From: Sasha Levin <sashal@kernel.org>
Date: Sat, 7 Sep 2019 02:41:10 -0400
Subject: [PATCH] Fix up git mis-rebase

I had to rebase my local queue after Greg released 4.19.71/5.2.13, and
apparently git did the wrong thing w.r.t rename detection. Fix it up...

Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 queue-4.19/series       | 44 +++++++++++++++++++++++++
 queue-5.2/series        | 72 +++++++++++++++++++++++++++++++++++++++++
 releases/4.19.71/series | 72 -----------------------------------------
 releases/5.2.13/series  | 44 -------------------------
 4 files changed, 116 insertions(+), 116 deletions(-)
 create mode 100644 queue-5.2/series

diff --git a/queue-4.19/series b/queue-4.19/series
index f5a30e9bb71..d638a565ead 100644
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -1,3 +1,47 @@
 spi-bcm2835aux-unifying-code-between-polling-and-int.patch
 spi-bcm2835aux-remove-dangerous-uncontrolled-read-of.patch
 spi-bcm2835aux-fix-corruptions-for-longer-spi-transf.patch
+net-tundra-tsi108-use-spin_lock_irqsave-instead-of-s.patch
+netfilter-nf_tables-use-after-free-in-failing-rule-w.patch
+tools-bpftool-fix-error-message-prog-object.patch
+hv_netvsc-fix-a-warning-of-suspicious-rcu-usage.patch
+net-tc35815-explicitly-check-net_ip_align-is-not-zer.patch
+bluetooth-btqca-add-a-short-delay-before-downloading.patch
+bluetooth-hidp-let-hidp_send_message-return-number-o.patch
+ibmveth-convert-multicast-list-size-for-little-endia.patch
+gpio-fix-build-error-of-function-redefinition.patch
+netfilter-nft_flow_offload-skip-tcp-rst-and-fin-pack.patch
+drm-mediatek-use-correct-device-to-import-prime-buff.patch
+drm-mediatek-set-dma-max-segment-size.patch
+scsi-qla2xxx-fix-gnl.l-memory-leak-on-adapter-init-f.patch
+scsi-target-tcmu-avoid-use-after-free-after-command-.patch
+cxgb4-fix-a-memory-leak-bug.patch
+liquidio-add-cleanup-in-octeon_setup_iq.patch
+net-myri10ge-fix-memory-leaks.patch
+lan78xx-fix-memory-leaks.patch
+vfs-fix-page-locking-deadlocks-when-deduping-files.patch
+cx82310_eth-fix-a-memory-leak-bug.patch
+net-kalmia-fix-memory-leaks.patch
+ibmvnic-unmap-dma-address-of-tx-descriptor-buffers-a.patch
+net-cavium-fix-driver-name.patch
+wimax-i2400m-fix-a-memory-leak-bug.patch
+ravb-fix-use-after-free-ravb_tstamp_skb.patch
+kprobes-fix-potential-deadlock-in-kprobe_optimizer.patch
+hid-cp2112-prevent-sleeping-function-called-from-inv.patch
+x86-boot-compressed-64-fix-boot-on-machines-with-bro.patch
+input-hyperv-keyboard-use-in-place-iterator-api-in-t.patch
+tools-hv-kvp-eliminate-may-be-used-uninitialized-war.patch
+nvme-multipath-fix-possible-i-o-hang-when-paths-are-.patch
+ib-mlx4-fix-memory-leaks.patch
+infiniband-hfi1-fix-a-memory-leak-bug.patch
+infiniband-hfi1-fix-memory-leaks.patch
+selftests-kvm-fix-state-save-load-on-processors-with.patch
+selftests-kvm-make-platform_info_test-pass-on-amd.patch
+ceph-fix-buffer-free-while-holding-i_ceph_lock-in-__.patch
+ceph-fix-buffer-free-while-holding-i_ceph_lock-in-__.patch-16576
+ceph-fix-buffer-free-while-holding-i_ceph_lock-in-fi.patch
+kvm-arm-arm64-only-skip-mmio-insn-once.patch
+afs-fix-leak-in-afs_lookup_cell_rcu.patch
+kvm-arm-arm64-vgic-properly-initialise-private-irq-a.patch
+x86-boot-compressed-64-fix-missing-initialization-in.patch
+libceph-allow-ceph_buffer_put-to-receive-a-null-ceph.patch
diff --git a/queue-5.2/series b/queue-5.2/series
new file mode 100644
index 00000000000..8d8dd5f6e8c
--- /dev/null
+++ b/queue-5.2/series
@@ -0,0 +1,72 @@
+batman-adv-fix-netlink-dumping-of-all-mcast_flags-bu.patch
+libbpf-fix-erroneous-multi-closing-of-btf-fd.patch
+libbpf-set-btf-fd-for-prog-only-when-there-is-suppor.patch
+netfilter-nf_flow_table-fix-offload-for-flows-that-a.patch
+net-mlx5e-fix-error-flow-of-cqe-recovery-on-tx-repor.patch
+clk-samsung-change-signature-of-exynos5_subcmus_init.patch
+clk-samsung-exynos5800-move-mau-subsystem-clocks-to-.patch
+clk-samsung-exynos542x-move-mscl-subsystem-clocks-to.patch
+net-tundra-tsi108-use-spin_lock_irqsave-instead-of-s.patch
+netfilter-nf_tables-use-after-free-in-failing-rule-w.patch
+netfilter-nf_flow_table-conntrack-picks-up-expired-f.patch
+netfilter-nf_flow_table-teardown-flow-timeout-race.patch
+tools-bpftool-fix-error-message-prog-object.patch
+ixgbe-fix-possible-deadlock-in-ixgbe_service_task.patch
+hv_netvsc-fix-a-warning-of-suspicious-rcu-usage.patch
+net-tc35815-explicitly-check-net_ip_align-is-not-zer.patch
+bluetooth-btqca-add-a-short-delay-before-downloading.patch
+bluetooth-hci_qca-send-vs-pre-shutdown-command.patch
+bluetooth-hidp-let-hidp_send_message-return-number-o.patch
+s390-qeth-serialize-cmd-reply-with-concurrent-timeou.patch
+ibmveth-convert-multicast-list-size-for-little-endia.patch
+gpio-fix-build-error-of-function-redefinition.patch
+netfilter-nft_flow_offload-skip-tcp-rst-and-fin-pack.patch
+drm-mediatek-use-correct-device-to-import-prime-buff.patch
+drm-mediatek-set-dma-max-segment-size.patch
+scsi-qla2xxx-fix-gnl.l-memory-leak-on-adapter-init-f.patch
+scsi-target-tcmu-avoid-use-after-free-after-command-.patch
+cxgb4-fix-a-memory-leak-bug.patch
+selftests-kvm-do-not-try-running-the-vm-in-vmx_set_n.patch
+selftests-kvm-provide-common-function-to-enable-evmc.patch
+selftests-kvm-fix-vmx_set_nested_state_test.patch
+liquidio-add-cleanup-in-octeon_setup_iq.patch
+net-myri10ge-fix-memory-leaks.patch
+clk-fix-falling-back-to-legacy-parent-string-matchin.patch
+clk-fix-potential-null-dereference-in-clk_fetch_pare.patch
+lan78xx-fix-memory-leaks.patch
+vfs-fix-page-locking-deadlocks-when-deduping-files.patch
+cx82310_eth-fix-a-memory-leak-bug.patch
+net-kalmia-fix-memory-leaks.patch
+ibmvnic-unmap-dma-address-of-tx-descriptor-buffers-a.patch
+net-cavium-fix-driver-name.patch
+wimax-i2400m-fix-a-memory-leak-bug.patch
+ravb-fix-use-after-free-ravb_tstamp_skb.patch
+sched-core-schedule-new-worker-even-if-pi-blocked.patch
+kprobes-fix-potential-deadlock-in-kprobe_optimizer.patch
+hid-intel-ish-hid-ipc-add-ehl-device-id.patch
+hid-cp2112-prevent-sleeping-function-called-from-inv.patch
+x86-boot-compressed-64-fix-boot-on-machines-with-bro.patch
+scsi-lpfc-mitigate-high-memory-pre-allocation-by-scs.patch
+input-hyperv-keyboard-use-in-place-iterator-api-in-t.patch
+tools-hv-kvp-eliminate-may-be-used-uninitialized-war.patch
+nvme-multipath-fix-possible-i-o-hang-when-paths-are-.patch
+nvme-fix-cntlid-validation-when-not-using-nvmeof.patch
+rdma-cma-fix-null-ptr-deref-read-in-cma_cleanup.patch
+ib-mlx4-fix-memory-leaks.patch
+infiniband-hfi1-fix-a-memory-leak-bug.patch
+infiniband-hfi1-fix-memory-leaks.patch
+selftests-kvm-fix-state-save-load-on-processors-with.patch
+selftests-kvm-make-platform_info_test-pass-on-amd.patch
+drm-amdgpu-prevent-memory-leaks-in-amdgpu_cs-ioctl.patch
+ceph-fix-buffer-free-while-holding-i_ceph_lock-in-__.patch
+ceph-fix-buffer-free-while-holding-i_ceph_lock-in-__.patch-12800
+ceph-fix-buffer-free-while-holding-i_ceph_lock-in-fi.patch
+kvm-arm-arm64-only-skip-mmio-insn-once.patch
+afs-fix-leak-in-afs_lookup_cell_rcu.patch
+afs-fix-possible-oops-in-afs_lookup-trace-event.patch
+afs-use-correct-afs_call_type-in-yfs_fs_store_opaque.patch
+rdma-bnxt_re-fix-stack-out-of-bounds-in-bnxt_qplib_r.patch
+gpio-fix-irqchip-initialization-order.patch
+kvm-arm-arm64-vgic-properly-initialise-private-irq-a.patch
+x86-boot-compressed-64-fix-missing-initialization-in.patch
+libceph-allow-ceph_buffer_put-to-receive-a-null-ceph.patch
diff --git a/releases/4.19.71/series b/releases/4.19.71/series
index e747eebdc9c..0017b27394e 100644
--- a/releases/4.19.71/series
+++ b/releases/4.19.71/series
@@ -1,73 +1 @@
 revert-input-elantech-enable-smbus-on-new-2018-systems.patch
-batman-adv-fix-netlink-dumping-of-all-mcast_flags-bu.patch
-libbpf-fix-erroneous-multi-closing-of-btf-fd.patch
-libbpf-set-btf-fd-for-prog-only-when-there-is-suppor.patch
-netfilter-nf_flow_table-fix-offload-for-flows-that-a.patch
-net-mlx5e-fix-error-flow-of-cqe-recovery-on-tx-repor.patch
-clk-samsung-change-signature-of-exynos5_subcmus_init.patch
-clk-samsung-exynos5800-move-mau-subsystem-clocks-to-.patch
-clk-samsung-exynos542x-move-mscl-subsystem-clocks-to.patch
-net-tundra-tsi108-use-spin_lock_irqsave-instead-of-s.patch
-netfilter-nf_tables-use-after-free-in-failing-rule-w.patch
-netfilter-nf_flow_table-conntrack-picks-up-expired-f.patch
-netfilter-nf_flow_table-teardown-flow-timeout-race.patch
-tools-bpftool-fix-error-message-prog-object.patch
-ixgbe-fix-possible-deadlock-in-ixgbe_service_task.patch
-hv_netvsc-fix-a-warning-of-suspicious-rcu-usage.patch
-net-tc35815-explicitly-check-net_ip_align-is-not-zer.patch
-bluetooth-btqca-add-a-short-delay-before-downloading.patch
-bluetooth-hci_qca-send-vs-pre-shutdown-command.patch
-bluetooth-hidp-let-hidp_send_message-return-number-o.patch
-s390-qeth-serialize-cmd-reply-with-concurrent-timeou.patch
-ibmveth-convert-multicast-list-size-for-little-endia.patch
-gpio-fix-build-error-of-function-redefinition.patch
-netfilter-nft_flow_offload-skip-tcp-rst-and-fin-pack.patch
-drm-mediatek-use-correct-device-to-import-prime-buff.patch
-drm-mediatek-set-dma-max-segment-size.patch
-scsi-qla2xxx-fix-gnl.l-memory-leak-on-adapter-init-f.patch
-scsi-target-tcmu-avoid-use-after-free-after-command-.patch
-cxgb4-fix-a-memory-leak-bug.patch
-selftests-kvm-do-not-try-running-the-vm-in-vmx_set_n.patch
-selftests-kvm-provide-common-function-to-enable-evmc.patch
-selftests-kvm-fix-vmx_set_nested_state_test.patch
-liquidio-add-cleanup-in-octeon_setup_iq.patch
-net-myri10ge-fix-memory-leaks.patch
-clk-fix-falling-back-to-legacy-parent-string-matchin.patch
-clk-fix-potential-null-dereference-in-clk_fetch_pare.patch
-lan78xx-fix-memory-leaks.patch
-vfs-fix-page-locking-deadlocks-when-deduping-files.patch
-cx82310_eth-fix-a-memory-leak-bug.patch
-net-kalmia-fix-memory-leaks.patch
-ibmvnic-unmap-dma-address-of-tx-descriptor-buffers-a.patch
-net-cavium-fix-driver-name.patch
-wimax-i2400m-fix-a-memory-leak-bug.patch
-ravb-fix-use-after-free-ravb_tstamp_skb.patch
-sched-core-schedule-new-worker-even-if-pi-blocked.patch
-kprobes-fix-potential-deadlock-in-kprobe_optimizer.patch
-hid-intel-ish-hid-ipc-add-ehl-device-id.patch
-hid-cp2112-prevent-sleeping-function-called-from-inv.patch
-x86-boot-compressed-64-fix-boot-on-machines-with-bro.patch
-scsi-lpfc-mitigate-high-memory-pre-allocation-by-scs.patch
-input-hyperv-keyboard-use-in-place-iterator-api-in-t.patch
-tools-hv-kvp-eliminate-may-be-used-uninitialized-war.patch
-nvme-multipath-fix-possible-i-o-hang-when-paths-are-.patch
-nvme-fix-cntlid-validation-when-not-using-nvmeof.patch
-rdma-cma-fix-null-ptr-deref-read-in-cma_cleanup.patch
-ib-mlx4-fix-memory-leaks.patch
-infiniband-hfi1-fix-a-memory-leak-bug.patch
-infiniband-hfi1-fix-memory-leaks.patch
-selftests-kvm-fix-state-save-load-on-processors-with.patch
-selftests-kvm-make-platform_info_test-pass-on-amd.patch
-drm-amdgpu-prevent-memory-leaks-in-amdgpu_cs-ioctl.patch
-ceph-fix-buffer-free-while-holding-i_ceph_lock-in-__.patch
-ceph-fix-buffer-free-while-holding-i_ceph_lock-in-__.patch-12800
-ceph-fix-buffer-free-while-holding-i_ceph_lock-in-fi.patch
-kvm-arm-arm64-only-skip-mmio-insn-once.patch
-afs-fix-leak-in-afs_lookup_cell_rcu.patch
-afs-fix-possible-oops-in-afs_lookup-trace-event.patch
-afs-use-correct-afs_call_type-in-yfs_fs_store_opaque.patch
-rdma-bnxt_re-fix-stack-out-of-bounds-in-bnxt_qplib_r.patch
-gpio-fix-irqchip-initialization-order.patch
-kvm-arm-arm64-vgic-properly-initialise-private-irq-a.patch
-x86-boot-compressed-64-fix-missing-initialization-in.patch
-libceph-allow-ceph_buffer_put-to-receive-a-null-ceph.patch
diff --git a/releases/5.2.13/series b/releases/5.2.13/series
index c91ff2db65f..0017b27394e 100644
--- a/releases/5.2.13/series
+++ b/releases/5.2.13/series
@@ -1,45 +1 @@
 revert-input-elantech-enable-smbus-on-new-2018-systems.patch
-net-tundra-tsi108-use-spin_lock_irqsave-instead-of-s.patch
-netfilter-nf_tables-use-after-free-in-failing-rule-w.patch
-tools-bpftool-fix-error-message-prog-object.patch
-hv_netvsc-fix-a-warning-of-suspicious-rcu-usage.patch
-net-tc35815-explicitly-check-net_ip_align-is-not-zer.patch
-bluetooth-btqca-add-a-short-delay-before-downloading.patch
-bluetooth-hidp-let-hidp_send_message-return-number-o.patch
-ibmveth-convert-multicast-list-size-for-little-endia.patch
-gpio-fix-build-error-of-function-redefinition.patch
-netfilter-nft_flow_offload-skip-tcp-rst-and-fin-pack.patch
-drm-mediatek-use-correct-device-to-import-prime-buff.patch
-drm-mediatek-set-dma-max-segment-size.patch
-scsi-qla2xxx-fix-gnl.l-memory-leak-on-adapter-init-f.patch
-scsi-target-tcmu-avoid-use-after-free-after-command-.patch
-cxgb4-fix-a-memory-leak-bug.patch
-liquidio-add-cleanup-in-octeon_setup_iq.patch
-net-myri10ge-fix-memory-leaks.patch
-lan78xx-fix-memory-leaks.patch
-vfs-fix-page-locking-deadlocks-when-deduping-files.patch
-cx82310_eth-fix-a-memory-leak-bug.patch
-net-kalmia-fix-memory-leaks.patch
-ibmvnic-unmap-dma-address-of-tx-descriptor-buffers-a.patch
-net-cavium-fix-driver-name.patch
-wimax-i2400m-fix-a-memory-leak-bug.patch
-ravb-fix-use-after-free-ravb_tstamp_skb.patch
-kprobes-fix-potential-deadlock-in-kprobe_optimizer.patch
-hid-cp2112-prevent-sleeping-function-called-from-inv.patch
-x86-boot-compressed-64-fix-boot-on-machines-with-bro.patch
-input-hyperv-keyboard-use-in-place-iterator-api-in-t.patch
-tools-hv-kvp-eliminate-may-be-used-uninitialized-war.patch
-nvme-multipath-fix-possible-i-o-hang-when-paths-are-.patch
-ib-mlx4-fix-memory-leaks.patch
-infiniband-hfi1-fix-a-memory-leak-bug.patch
-infiniband-hfi1-fix-memory-leaks.patch
-selftests-kvm-fix-state-save-load-on-processors-with.patch
-selftests-kvm-make-platform_info_test-pass-on-amd.patch
-ceph-fix-buffer-free-while-holding-i_ceph_lock-in-__.patch
-ceph-fix-buffer-free-while-holding-i_ceph_lock-in-__.patch-16576
-ceph-fix-buffer-free-while-holding-i_ceph_lock-in-fi.patch
-kvm-arm-arm64-only-skip-mmio-insn-once.patch
-afs-fix-leak-in-afs_lookup_cell_rcu.patch
-kvm-arm-arm64-vgic-properly-initialise-private-irq-a.patch
-x86-boot-compressed-64-fix-missing-initialization-in.patch
-libceph-allow-ceph_buffer_put-to-receive-a-null-ceph.patch
-- 
2.47.3