fuzz cleanup due to reordering

diff --git a/queue-6.12/i2c-core-fix-adapter-probe-deferral-loop.patch b/queue-6.12/i2c-core-fix-adapter-probe-deferral-loop.patch
index 1b3b6b8bbbdfec468bbc6f4e16726add95949c4e..e421636d0c6c0d845c214343842335e98c20a436 100644 (file)
--- a/queue-6.12/i2c-core-fix-adapter-probe-deferral-loop.patch
+++ b/queue-6.12/i2c-core-fix-adapter-probe-deferral-loop.patch
@@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        /*
         * This adapter can be used as a parent immediately after device_add(),
         * setup runtime-pm (especially ignore-children) before hand.
-@@ -1577,10 +1581,6 @@ static int i2c_register_adapter(struct i
+@@ -1576,10 +1580,6 @@ static int i2c_register_adapter(struct i
        if (res)
                goto out_reg;
  

diff --git a/queue-6.12/i2c-core-fix-irq-domain-leak-on-adapter-registration-failure.patch b/queue-6.12/i2c-core-fix-irq-domain-leak-on-adapter-registration-failure.patch
index d7d407413d21974b56cc26dad9d8f1213a720e5e..d3be1d0a30c45dd1e1c2f303469650a0c19dbea9 100644 (file)
--- a/queue-6.12/i2c-core-fix-irq-domain-leak-on-adapter-registration-failure.patch
+++ b/queue-6.12/i2c-core-fix-irq-domain-leak-on-adapter-registration-failure.patch
@@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/i2c/i2c-core-base.c
 +++ b/drivers/i2c/i2c-core-base.c
-@@ -1572,7 +1572,7 @@ static int i2c_register_adapter(struct i
+@@ -1568,7 +1568,7 @@ static int i2c_register_adapter(struct i
        if (res) {
                pr_err("adapter '%s': can't register device (%d)\n", adap->name, res);
                put_device(&adap->dev);

diff --git a/queue-6.12/i2c-core-fix-null-deref-on-adapter-registration-failure.patch b/queue-6.12/i2c-core-fix-null-deref-on-adapter-registration-failure.patch
index cdf08838b021dfd21397a3f243c653d973362f1e..0ec3cd7a988445ed68f0d7f8307530f97dc0cb2c 100644 (file)
--- a/queue-6.12/i2c-core-fix-null-deref-on-adapter-registration-failure.patch
+++ b/queue-6.12/i2c-core-fix-null-deref-on-adapter-registration-failure.patch
@@ -26,7 +26,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/i2c/i2c-core-base.c
 +++ b/drivers/i2c/i2c-core-base.c
-@@ -1571,8 +1571,7 @@ static int i2c_register_adapter(struct i
+@@ -1567,8 +1567,7 @@ static int i2c_register_adapter(struct i
        res = device_add(&adap->dev);
        if (res) {
                pr_err("adapter '%s': can't register device (%d)\n", adap->name, res);

diff --git a/queue-6.18/i2c-core-fix-adapter-probe-deferral-loop.patch b/queue-6.18/i2c-core-fix-adapter-probe-deferral-loop.patch
index 0709e11cbb5b3bb9decb3cf0cf1d15b85ed37c7c..26b6a81846305cb0851bcb6acfea08caf99c992a 100644 (file)
--- a/queue-6.18/i2c-core-fix-adapter-probe-deferral-loop.patch
+++ b/queue-6.18/i2c-core-fix-adapter-probe-deferral-loop.patch
@@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        /*
         * This adapter can be used as a parent immediately after device_add(),
         * setup runtime-pm (especially ignore-children) before hand.
-@@ -1588,10 +1592,6 @@ static int i2c_register_adapter(struct i
+@@ -1587,10 +1591,6 @@ static int i2c_register_adapter(struct i
        if (res)
                goto out_reg;
  

diff --git a/queue-6.18/i2c-core-fix-irq-domain-leak-on-adapter-registration-failure.patch b/queue-6.18/i2c-core-fix-irq-domain-leak-on-adapter-registration-failure.patch
index 233e75c7650b5bb514a69f174051ae38892b8465..cd864263db72660954ad291537abfbf57d8190ff 100644 (file)
--- a/queue-6.18/i2c-core-fix-irq-domain-leak-on-adapter-registration-failure.patch
+++ b/queue-6.18/i2c-core-fix-irq-domain-leak-on-adapter-registration-failure.patch
@@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/i2c/i2c-core-base.c
 +++ b/drivers/i2c/i2c-core-base.c
-@@ -1583,7 +1583,7 @@ static int i2c_register_adapter(struct i
+@@ -1579,7 +1579,7 @@ static int i2c_register_adapter(struct i
        if (res) {
                pr_err("adapter '%s': can't register device (%d)\n", adap->name, res);
                put_device(&adap->dev);

diff --git a/queue-6.18/i2c-core-fix-null-deref-on-adapter-registration-failure.patch b/queue-6.18/i2c-core-fix-null-deref-on-adapter-registration-failure.patch
index c3a2f1ea0108bb4c0d97f61d3278c671a3021b1a..d3d42c3f9000bfe47b1e1e1ec0eaf5605c796484 100644 (file)
--- a/queue-6.18/i2c-core-fix-null-deref-on-adapter-registration-failure.patch
+++ b/queue-6.18/i2c-core-fix-null-deref-on-adapter-registration-failure.patch
@@ -26,7 +26,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/i2c/i2c-core-base.c
 +++ b/drivers/i2c/i2c-core-base.c
-@@ -1582,8 +1582,7 @@ static int i2c_register_adapter(struct i
+@@ -1578,8 +1578,7 @@ static int i2c_register_adapter(struct i
        res = device_add(&adap->dev);
        if (res) {
                pr_err("adapter '%s': can't register device (%d)\n", adap->name, res);

diff --git a/queue-6.18/kvm-vmx-refresh-guest_pending_dbg_exceptions.bs-on-all-injected-dbs.patch b/queue-6.18/kvm-vmx-refresh-guest_pending_dbg_exceptions.bs-on-all-injected-dbs.patch
index e0669f1a67937701961308036573a8fbc62f7f68..83b92932ab62adace83c3cb4a9ad6a4fc0fae239 100644 (file)
--- a/queue-6.18/kvm-vmx-refresh-guest_pending_dbg_exceptions.bs-on-all-injected-dbs.patch
+++ b/queue-6.18/kvm-vmx-refresh-guest_pending_dbg_exceptions.bs-on-all-injected-dbs.patch
@@ -69,7 +69,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        kvm_deliver_exception_payload(vcpu, ex);
  
        if (ex->has_error_code) {
-@@ -5287,26 +5305,9 @@ static int handle_exception_nmi(struct k
+@@ -5286,26 +5304,9 @@ static int handle_exception_nmi(struct k
                         * avoid single-step #DB and MTF updates, as ICEBP is
                         * higher priority.  Note, skipping ICEBP still clears
                         * STI and MOVSS blocking.

diff --git a/queue-6.18/kvm-x86-add-dedicated-api-for-getting-mask-of-accelerated-x2apic-msrs.patch b/queue-6.18/kvm-x86-add-dedicated-api-for-getting-mask-of-accelerated-x2apic-msrs.patch
index 986311d2fbded9f1569e5c10247413a8ff9c8676..7d4d73fa3c77c8f2dfbd6d67cf6f3ac5dfb7567a 100644 (file)
--- a/queue-6.18/kvm-x86-add-dedicated-api-for-getting-mask-of-accelerated-x2apic-msrs.patch
+++ b/queue-6.18/kvm-x86-add-dedicated-api-for-getting-mask-of-accelerated-x2apic-msrs.patch
@@ -78,7 +78,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  {
 --- a/arch/x86/kvm/vmx/vmx.c
 +++ b/arch/x86/kvm/vmx/vmx.c
-@@ -4080,7 +4080,7 @@ static void vmx_update_msr_bitmap_x2apic
+@@ -4062,7 +4062,7 @@ static void vmx_update_msr_bitmap_x2apic
         * mode, only the current timer count needs on-demand emulation by KVM.
         */
        if (mode & MSR_BITMAP_MODE_X2APIC_APICV)
@@ -87,7 +87,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        else
                msr_bitmap[read_idx] = ~0ull;
        msr_bitmap[write_idx] = ~0ull;
-@@ -4093,7 +4093,6 @@ static void vmx_update_msr_bitmap_x2apic
+@@ -4075,7 +4075,6 @@ static void vmx_update_msr_bitmap_x2apic
                                  !(mode & MSR_BITMAP_MODE_X2APIC));
  
        if (mode & MSR_BITMAP_MODE_X2APIC_APICV) {

diff --git a/queue-6.18/kvm-x86-ensure-vendor-s-exit-handler-runs-before-fastpath-userspace-exits.patch b/queue-6.18/kvm-x86-ensure-vendor-s-exit-handler-runs-before-fastpath-userspace-exits.patch
index a22a2be00709cdf3d5dc93d905ccba440b9b860a..37d54153076d20da5a1e9248bc6f145c40575f12 100644 (file)
--- a/queue-6.18/kvm-x86-ensure-vendor-s-exit-handler-runs-before-fastpath-userspace-exits.patch
+++ b/queue-6.18/kvm-x86-ensure-vendor-s-exit-handler-runs-before-fastpath-userspace-exits.patch
@@ -45,7 +45,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
 --- a/arch/x86/kvm/vmx/vmx.c
 +++ b/arch/x86/kvm/vmx/vmx.c
-@@ -6499,6 +6499,9 @@ static int __vmx_handle_exit(struct kvm_
+@@ -6498,6 +6498,9 @@ static int __vmx_handle_exit(struct kvm_
        if (enable_pml && !is_guest_mode(vcpu))
                vmx_flush_pml_buffer(vcpu);
  

diff --git a/queue-7.1/i2c-core-fix-adapter-probe-deferral-loop.patch b/queue-7.1/i2c-core-fix-adapter-probe-deferral-loop.patch
index 775ac323103b1c6ea6ef7edf09ba64c18267f622..52e6519f61169bafc02f95985f65455003de6d5a 100644 (file)
--- a/queue-7.1/i2c-core-fix-adapter-probe-deferral-loop.patch
+++ b/queue-7.1/i2c-core-fix-adapter-probe-deferral-loop.patch
@@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        /*
         * This adapter can be used as a parent immediately after device_add(),
         * setup runtime-pm (especially ignore-children) before hand.
-@@ -1587,10 +1591,6 @@ static int i2c_register_adapter(struct i
+@@ -1586,10 +1590,6 @@ static int i2c_register_adapter(struct i
        if (res)
                goto out_reg;
  

diff --git a/queue-7.1/i2c-core-fix-irq-domain-leak-on-adapter-registration-failure.patch b/queue-7.1/i2c-core-fix-irq-domain-leak-on-adapter-registration-failure.patch
index b1c288ef11c11a744c7d90484444241594fc29a5..ac08a5234c39510926b0f7aacbad3511110bf485 100644 (file)
--- a/queue-7.1/i2c-core-fix-irq-domain-leak-on-adapter-registration-failure.patch
+++ b/queue-7.1/i2c-core-fix-irq-domain-leak-on-adapter-registration-failure.patch
@@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/i2c/i2c-core-base.c
 +++ b/drivers/i2c/i2c-core-base.c
-@@ -1582,7 +1582,7 @@ static int i2c_register_adapter(struct i
+@@ -1578,7 +1578,7 @@ static int i2c_register_adapter(struct i
        if (res) {
                pr_err("adapter '%s': can't register device (%d)\n", adap->name, res);
                put_device(&adap->dev);

diff --git a/queue-7.1/i2c-core-fix-null-deref-on-adapter-registration-failure.patch b/queue-7.1/i2c-core-fix-null-deref-on-adapter-registration-failure.patch
index c2480be4bbdad2034673b17f21527f9611cdbd71..4b3309ab340727f972165d8887a18f3cf685599f 100644 (file)
--- a/queue-7.1/i2c-core-fix-null-deref-on-adapter-registration-failure.patch
+++ b/queue-7.1/i2c-core-fix-null-deref-on-adapter-registration-failure.patch
@@ -26,7 +26,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/i2c/i2c-core-base.c
 +++ b/drivers/i2c/i2c-core-base.c
-@@ -1581,8 +1581,7 @@ static int i2c_register_adapter(struct i
+@@ -1577,8 +1577,7 @@ static int i2c_register_adapter(struct i
        res = device_add(&adap->dev);
        if (res) {
                pr_err("adapter '%s': can't register device (%d)\n", adap->name, res);

diff --git a/queue-7.1/kvm-vmx-refresh-guest_pending_dbg_exceptions.bs-on-all-injected-dbs.patch b/queue-7.1/kvm-vmx-refresh-guest_pending_dbg_exceptions.bs-on-all-injected-dbs.patch
index 54af8932567c1b38305ee142d860abb244ec951d..6a1f0a1f345d9bb28e3fcfac572429d8b0095f71 100644 (file)
--- a/queue-7.1/kvm-vmx-refresh-guest_pending_dbg_exceptions.bs-on-all-injected-dbs.patch
+++ b/queue-7.1/kvm-vmx-refresh-guest_pending_dbg_exceptions.bs-on-all-injected-dbs.patch
@@ -69,7 +69,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        kvm_deliver_exception_payload(vcpu, ex);
  
        if (ex->has_error_code) {
-@@ -5477,26 +5495,9 @@ static int handle_exception_nmi(struct k
+@@ -5476,26 +5494,9 @@ static int handle_exception_nmi(struct k
                         * avoid single-step #DB and MTF updates, as ICEBP is
                         * higher priority.  Note, skipping ICEBP still clears
                         * STI and MOVSS blocking.

diff --git a/queue-7.1/kvm-x86-add-dedicated-api-for-getting-mask-of-accelerated-x2apic-msrs.patch b/queue-7.1/kvm-x86-add-dedicated-api-for-getting-mask-of-accelerated-x2apic-msrs.patch
index 1829c6736c87f9a139c2e9c690e15f70cc7653c5..77e081c93355d40866e16620abb8f40965fb2aad 100644 (file)
--- a/queue-7.1/kvm-x86-add-dedicated-api-for-getting-mask-of-accelerated-x2apic-msrs.patch
+++ b/queue-7.1/kvm-x86-add-dedicated-api-for-getting-mask-of-accelerated-x2apic-msrs.patch
@@ -78,7 +78,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  {
 --- a/arch/x86/kvm/vmx/vmx.c
 +++ b/arch/x86/kvm/vmx/vmx.c
-@@ -4159,7 +4159,7 @@ static void vmx_update_msr_bitmap_x2apic
+@@ -4141,7 +4141,7 @@ static void vmx_update_msr_bitmap_x2apic
         * mode, only the current timer count needs on-demand emulation by KVM.
         */
        if (mode & MSR_BITMAP_MODE_X2APIC_APICV)
@@ -87,7 +87,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        else
                msr_bitmap[read_idx] = ~0ull;
        msr_bitmap[write_idx] = ~0ull;
-@@ -4172,7 +4172,6 @@ static void vmx_update_msr_bitmap_x2apic
+@@ -4154,7 +4154,6 @@ static void vmx_update_msr_bitmap_x2apic
                                  !(mode & MSR_BITMAP_MODE_X2APIC));
  
        if (mode & MSR_BITMAP_MODE_X2APIC_APICV) {

diff --git a/queue-7.1/kvm-x86-ensure-vendor-s-exit-handler-runs-before-fastpath-userspace-exits.patch b/queue-7.1/kvm-x86-ensure-vendor-s-exit-handler-runs-before-fastpath-userspace-exits.patch
index 93a7009a047e56d8061e8e44dbea20e111b1ea38..ff71af2fcb8be745b2b80a396e018fcb610a60ae 100644 (file)
--- a/queue-7.1/kvm-x86-ensure-vendor-s-exit-handler-runs-before-fastpath-userspace-exits.patch
+++ b/queue-7.1/kvm-x86-ensure-vendor-s-exit-handler-runs-before-fastpath-userspace-exits.patch
@@ -45,7 +45,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
 --- a/arch/x86/kvm/vmx/vmx.c
 +++ b/arch/x86/kvm/vmx/vmx.c
-@@ -6698,6 +6698,9 @@ static int __vmx_handle_exit(struct kvm_
+@@ -6697,6 +6697,9 @@ static int __vmx_handle_exit(struct kvm_
        if (enable_pml && !is_guest_mode(vcpu))
                vmx_flush_pml_buffer(vcpu);