Merge conflict on RT 4.14 to latest stable

[Dan Murphy <dmurphy@xxxxxx>]

Hello

We have a merge conflict in kernel/softirq.c when upgrading to the latest stable release

Please help resolve this.

Dan
-- 
------------------
Dan Murphy

diff --cc kernel/softirq.c
index d0688a7,e89c3b0..0000000
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@@ -950,27 -486,15 +950,31 @@@ void __tasklet_hi_schedule(struct taskl
  }
  EXPORT_SYMBOL(__tasklet_hi_schedule);
  
++<<<<<<< HEAD
 +void __tasklet_hi_schedule_first(struct tasklet_struct *t)
 +{
 +	BUG_ON(!irqs_disabled());
 +
 +	__tasklet_hi_schedule(t);
 +}
 +EXPORT_SYMBOL(__tasklet_hi_schedule_first);
 +
 +void  tasklet_enable(struct tasklet_struct *t)
++=======
+ static __latent_entropy void tasklet_action(struct softirq_action *a)
++>>>>>>> 852a96020848659ae7a03ede00d023151d5f79c8
  {
 -	struct tasklet_struct *list;
 +	if (!atomic_dec_and_test(&t->count))
 +		return;
 +	if (test_and_clear_bit(TASKLET_STATE_PENDING, &t->state))
 +		tasklet_schedule(t);
 +}
 +EXPORT_SYMBOL(tasklet_enable);
  
 -	local_irq_disable();
 -	list = __this_cpu_read(tasklet_vec.head);
 -	__this_cpu_write(tasklet_vec.head, NULL);
 -	__this_cpu_write(tasklet_vec.tail, this_cpu_ptr(&tasklet_vec.head));
 -	local_irq_enable();
 +static void __tasklet_action(struct softirq_action *a,
 +			     struct tasklet_struct *list)
 +{
 +	int loops = 1000000;
  
  	while (list) {
  		struct tasklet_struct *t = list;