linux-next: manual merge of the parisc-hd tree with Linus' tree

2015-09-07 Thread Stephen Rothwell 
Hi all,

Today's linux-next merge of the parisc-hd tree got a conflict in:

  arch/parisc/kernel/irq.c

between commit:

  d2109a12198e ("parisc/irq: Use access helper irq_data_get_affinity_mask()")

from Linus' tree and commit:

  b15e2f939727 ("parisc: Filter out spurious interrupts in PA-RISC irq handler")

from the parisc-hd tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc arch/parisc/kernel/irq.c
index 413ec3c3f9cc,c0eab24f6a9e..
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
@@@ -507,8 -507,8 +507,8 @@@ void do_cpu_irq_mask(struct pt_regs *re
struct pt_regs *old_regs;
unsigned long eirr_val;
int irq, cpu = smp_processor_id();
- #ifdef CONFIG_SMP
 -  struct irq_desc *desc;
 +  struct irq_data *irq_data;
+ #ifdef CONFIG_SMP
cpumask_t dest;
  #endif
  
@@@ -521,10 -521,14 +521,14 @@@
goto set_out;
irq = eirr_to_irq(eirr_val);
  
- #ifdef CONFIG_SMP
 +  irq_data = irq_get_irq_data(irq);
+   /* Filter out spurious interrupts, mostly from serial port at bootup */
 -  desc = irq_to_desc(irq);
 -  if (unlikely(!desc->action))
++  if (unlikely(!irq_data))
+   goto set_out;
+ 
+ #ifdef CONFIG_SMP
 -  cpumask_copy(, desc->irq_data.affinity);
 -  if (irqd_is_per_cpu(>irq_data) &&
 +  cpumask_copy(, irq_data_get_affinity_mask(irq_data));
 +  if (irqd_is_per_cpu(irq_data) &&
!cpumask_test_cpu(smp_processor_id(), )) {
int cpu = cpumask_first();
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

linux-next: manual merge of the parisc-hd tree with Linus' tree

2015-09-07 Thread Stephen Rothwell 
Hi all,

Today's linux-next merge of the parisc-hd tree got a conflict in:

  arch/parisc/kernel/irq.c

between commit:

  d2109a12198e ("parisc/irq: Use access helper irq_data_get_affinity_mask()")

from Linus' tree and commit:

  b15e2f939727 ("parisc: Filter out spurious interrupts in PA-RISC irq handler")

from the parisc-hd tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc arch/parisc/kernel/irq.c
index 413ec3c3f9cc,c0eab24f6a9e..
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
@@@ -507,8 -507,8 +507,8 @@@ void do_cpu_irq_mask(struct pt_regs *re
struct pt_regs *old_regs;
unsigned long eirr_val;
int irq, cpu = smp_processor_id();
- #ifdef CONFIG_SMP
 -  struct irq_desc *desc;
 +  struct irq_data *irq_data;
+ #ifdef CONFIG_SMP
cpumask_t dest;
  #endif
  
@@@ -521,10 -521,14 +521,14 @@@
goto set_out;
irq = eirr_to_irq(eirr_val);
  
- #ifdef CONFIG_SMP
 +  irq_data = irq_get_irq_data(irq);
+   /* Filter out spurious interrupts, mostly from serial port at bootup */
 -  desc = irq_to_desc(irq);
 -  if (unlikely(!desc->action))
++  if (unlikely(!irq_data))
+   goto set_out;
+ 
+ #ifdef CONFIG_SMP
 -  cpumask_copy(, desc->irq_data.affinity);
 -  if (irqd_is_per_cpu(>irq_data) &&
 +  cpumask_copy(, irq_data_get_affinity_mask(irq_data));
 +  if (irqd_is_per_cpu(irq_data) &&
!cpumask_test_cpu(smp_processor_id(), )) {
int cpu = cpumask_first();
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: linux-next: manual merge of the parisc-hd tree with Linus' tree

2014-02-04 Thread Helge Deller 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 02/04/2014 01:27 AM, Stephen Rothwell wrote:
> Today's linux-next merge of the parisc-hd tree got a conflict in
> arch/parisc/include/asm/elf.h between commit 9dabf60dc4ab ("parisc: add
> flexible mmap memory layout support") from Linus' tree and commit
> 13de8ec38997 ("parisc: add flexible mmap memory layout support") from the
> parisc-hd tree.
> 
> It seems that this tree was rebased before being sent to Linus (I
> understand why) so I will just drop the whole parisc tree for today.
> Please just tidy up.

Thanks Stephen!

I just cleaned it up.

Helge
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.22 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJS8KlaAAoJEKGDlV8wpRJBdQEP/13n4pmbCH8Aox+eFwQhi7G5
Jkc6d7DodiVsMNLVK1r/JTXhK+S+7lrQT+ccbU0GKjIHs5ROO+FuE2ZiTOAXAvAq
/maZpewxSq2f5d+gJJZ6bOy7A8N1Zj/5byuuVycz+1XF4jmOj7a+B1wD8/EDqwS3
YmwTJy+Mo7WtTm5i0qeqmExcieoAviPBmH2T4L0FnHeYSCa876kKWUSzEN2Dy1u8
E9oKwlBYdH66gywsp27P8pqnH8sAZuhq30S0q7wHjsMzXgep3poo2Yy+RCrP3Vm2
cpv7cOSgGfDMhhcJ1is0j9UfxYM3mEqThIjAZDcheLDyZ1cmfebks7BojaHBHyQt
WM7/W1LZR9JQDcvuGlDmqrAOQkOJsAdUm4+sL4tdOt2CiKqtReIqQHnCUNnO81de
PEDtkkXhOkdzu12tV0HCTVJSIXQU57/h2VobYlDu5VvYDjB1nthWhTV7l7mBlJjx
Pe0ktJZT/DHs1OWV2nkwRGH92SakPqHxIsHaQ+XyXMkuO9g9rktZ2v3pL1B/uFsA
q5z6EZ0p604kDzwlAJb+mQ5YjBgAQsxliaCayRVDvoKtCo2Rmf1CHHkmzIYyUG9P
qffk+cqdUuYzoz5wEsLCtiyFK3t6IYkW50T+iZjt4Fqm8QKqX9ysxSZLkgTi/mzF
SCQI0dteIigBYakBH1xc
=WwyM
-END PGP SIGNATURE-
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: linux-next: manual merge of the parisc-hd tree with Linus' tree

2014-02-04 Thread Helge Deller 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 02/04/2014 01:27 AM, Stephen Rothwell wrote:
 Today's linux-next merge of the parisc-hd tree got a conflict in
 arch/parisc/include/asm/elf.h between commit 9dabf60dc4ab (parisc: add
 flexible mmap memory layout support) from Linus' tree and commit
 13de8ec38997 (parisc: add flexible mmap memory layout support) from the
 parisc-hd tree.
 
 It seems that this tree was rebased before being sent to Linus (I
 understand why) so I will just drop the whole parisc tree for today.
 Please just tidy up.

Thanks Stephen!

I just cleaned it up.

Helge
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.22 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJS8KlaAAoJEKGDlV8wpRJBdQEP/13n4pmbCH8Aox+eFwQhi7G5
Jkc6d7DodiVsMNLVK1r/JTXhK+S+7lrQT+ccbU0GKjIHs5ROO+FuE2ZiTOAXAvAq
/maZpewxSq2f5d+gJJZ6bOy7A8N1Zj/5byuuVycz+1XF4jmOj7a+B1wD8/EDqwS3
YmwTJy+Mo7WtTm5i0qeqmExcieoAviPBmH2T4L0FnHeYSCa876kKWUSzEN2Dy1u8
E9oKwlBYdH66gywsp27P8pqnH8sAZuhq30S0q7wHjsMzXgep3poo2Yy+RCrP3Vm2
cpv7cOSgGfDMhhcJ1is0j9UfxYM3mEqThIjAZDcheLDyZ1cmfebks7BojaHBHyQt
WM7/W1LZR9JQDcvuGlDmqrAOQkOJsAdUm4+sL4tdOt2CiKqtReIqQHnCUNnO81de
PEDtkkXhOkdzu12tV0HCTVJSIXQU57/h2VobYlDu5VvYDjB1nthWhTV7l7mBlJjx
Pe0ktJZT/DHs1OWV2nkwRGH92SakPqHxIsHaQ+XyXMkuO9g9rktZ2v3pL1B/uFsA
q5z6EZ0p604kDzwlAJb+mQ5YjBgAQsxliaCayRVDvoKtCo2Rmf1CHHkmzIYyUG9P
qffk+cqdUuYzoz5wEsLCtiyFK3t6IYkW50T+iZjt4Fqm8QKqX9ysxSZLkgTi/mzF
SCQI0dteIigBYakBH1xc
=WwyM
-END PGP SIGNATURE-
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

linux-next: manual merge of the parisc-hd tree with Linus' tree

2014-02-03 Thread Stephen Rothwell 
Hi all,

Today's linux-next merge of the parisc-hd tree got a conflict in
arch/parisc/include/asm/elf.h between commit 9dabf60dc4ab ("parisc: add
flexible mmap memory layout support") from Linus' tree and commit
13de8ec38997 ("parisc: add flexible mmap memory layout support") from the
parisc-hd tree.

It seems that this tree was rebased before being sent to Linus (I
understand why) so I will just drop the whole parisc tree for today.
Please just tidy up.

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgp8B5QIiWk9c.pgp
Description: PGP signature

linux-next: manual merge of the parisc-hd tree with Linus' tree

2014-02-03 Thread Stephen Rothwell 
Hi all,

Today's linux-next merge of the parisc-hd tree got a conflict in
arch/parisc/include/asm/elf.h between commit 9dabf60dc4ab (parisc: add
flexible mmap memory layout support) from Linus' tree and commit
13de8ec38997 (parisc: add flexible mmap memory layout support) from the
parisc-hd tree.

It seems that this tree was rebased before being sent to Linus (I
understand why) so I will just drop the whole parisc tree for today.
Please just tidy up.

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgp8B5QIiWk9c.pgp
Description: PGP signature

linux-next: manual merge of the parisc-hd tree with Linus' tree

2013-05-26 Thread Stephen Rothwell 
Hi all,

Today's linux-next merge of the parisc-hd tree got conflicts in
arch/parisc/include/asm/processor.h and arch/parisc/kernel/irq.c between
commit d96b51ec1465 ("parisc: fix irq stack on UP and SMP") from Linus'
tree and commit 1c92ce8487f6 ("parisc: use arch_spinlock_t instead of
raw_spinlock_t in irqstacks") from the parisc-hd tree.

I just used the version of both files from Linus' tree and can carry the
fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpnDks64auTd.pgp
Description: PGP signature

linux-next: manual merge of the parisc-hd tree with Linus' tree

2013-05-26 Thread Stephen Rothwell 
Hi all,

Today's linux-next merge of the parisc-hd tree got conflicts in
arch/parisc/include/asm/processor.h and arch/parisc/kernel/irq.c between
commit d96b51ec1465 (parisc: fix irq stack on UP and SMP) from Linus'
tree and commit 1c92ce8487f6 (parisc: use arch_spinlock_t instead of
raw_spinlock_t in irqstacks) from the parisc-hd tree.

I just used the version of both files from Linus' tree and can carry the
fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpnDks64auTd.pgp
Description: PGP signature