[linux] 02/02: Fix conflict between 4.4.4 and -rt patches

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit 32edf5348f37e031f4b54a44c54e36d3187efe1e
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Mar 6 03:27:56 2016 +0000

    Fix conflict between 4.4.4 and -rt patches
    
    "random: Make it work on rt" has a textual conflict with
    "genirq: Validate action before dereferencing it in handle_irq_event_percpu()"
---
 debian/patches/features/all/rt/random-make-it-work-on-rt.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/patches/features/all/rt/random-make-it-work-on-rt.patch b/debian/patches/features/all/rt/random-make-it-work-on-rt.patch
index 4dd44dc..2004b37 100644
--- a/debian/patches/features/all/rt/random-make-it-work-on-rt.patch
+++ b/debian/patches/features/all/rt/random-make-it-work-on-rt.patch
@@ -86,9 +86,9 @@ Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
  	irqreturn_t retval = IRQ_NONE;
  	unsigned int flags = 0, irq = desc->irq_data.irq;
  	struct irqaction *action = desc->action;
-@@ -175,7 +177,11 @@ irqreturn_t handle_irq_event_percpu(stru
+@@ -176,7 +178,11 @@ irqreturn_t handle_irq_event_percpu(stru
  		action = action->next;
- 	} while (action);
+ 	}
  
 -	add_interrupt_randomness(irq, flags);
 +#ifdef CONFIG_PREEMPT_RT_FULL

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git