[GIT pull] irq core changes for 3.16

[GIT pull] irq core changes for 3.16

[Thomas Gleixner]

Linus,

please pull the latest irq-core-for-linus git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq-core-for-linus

The irq department delivers:

 - Another tree wide update to get rid of the horrible create_irq
   interface along with its even more horrible variants. That also
   gets rid of the last leftovers of the initial sparse irq hackery.
   arch/driver specific changes have been either acked or ignored.

 - A fix for the spurious interrupt detection logic with threaded
   interrupts.

 - A new ARM SoC interrupt controller

 - The usual pile of fixes and improvements all over the place  

Sorry you don't get a diff this time.

BRANCH=irq-core-for-linus
BASE=`git merge-base $BRANCH linus`
git diff -M $BASE..irq-core-for-linus

Is what my script uses for years now, but this time it created a diff
with random extra content from all over the tree.

$BASE is 2ed9fd28c2884e9f41c133f86a7e377d7c0a96bf

Thanks,

	tglx

------------------>
Arnd Bergmann (1):
      ARM: iop13xx: fix msi support with sparse IRQ

Eyal Perry (1):
      genirq: Provide !SMP stub for irq_set_affinity_notifier()

Ezequiel Garcia (1):
      irqchip: armada-370-xp: Move the devicetree binding documentation

Florian Fainelli (2):
      irqchip: brcmstb-l2: Add Broadcom Set Top Box Level-2 interrupt controller
      Documentation: brcmstb-l2: Add Broadcom STB Level-2 interrupt controller binding

Haojian Zhuang (1):
      irqchip: gic: Use mask field in GICC_IAR

Jiang Liu (1):
      genirq: Improve documentation to match current implementation

Sebastian Hesselbarth (1):
      irqchip: orion: Reverse irq handling priority

Thomas Gleixner (33):
      genirq: Sanitize spurious interrupt detection of threaded irqs
      arm: iop13xx: Use sparse irqs for MSI
      mips: Kill pointless destroy_irq()
      genirq: Provide generic hwirq allocation facility
      x86: Implement arch_setup/teardown_hwirq()
      x86: irq_remapping: Use irq_alloc/free_hwirq()
      x86: hpet: Use irq_alloc/free_hwirq()
      x86: uv: Use irq_alloc/free_hwirq()
      x86: htirq: Use irq_alloc/free_irq()
      x86: ioapic: Use irq_alloc/free_hwirq()
      x86: Get rid of get_nr_irqs_gsi()
      iommu: smar: Fix return value check of create_irq()
      iommu: dmar: Provide arch specific irq allocation
      ia64: Remove unused check_irq_used()
      x86: Remove create/destroy_irq()
      tile: Implement irq_alloc/free_hwirq() for migration
      tile: usb: Use irq_alloc/free_hwirq
      tile: net: Use irq_alloc/free_hwirq
      tile: serial: Use irq_alloc/free_hwirq
      tile: hvc: Use irq_alloc/free_hwirq
      tile: pci: Use irq_alloc/free_hwirq()
      tile: Use SPARSE_IRQ
      genirq: Make create/destroy_irq() ia64 private
      x86, irq: Remove pointless irq_reserve_irqs() call
      sh: intc: Remove pointless irq_reserve_irqs() invocation
      s390: pci: Check return value of alloc_irq_desc() proper
      s390: Remove pointless arch_show_interrupts()
      s390: Avoid call to irq_reserve_irqs()
      genirq: Replace reserve_irqs in core code
      genirq: Remove irq_reserve_irq[s]
      genirq: Replace dynamic_irq_init/cleanup
      ia64: Use irq_init_desc
      genirq: Remove dynamic_irq mess

Thomas Petazzoni (2):
      irqchip: irq-armada-370-xp: Do the set_smp_cross_call() in the driver
      irqchip: irq-armada-370-xp: Use cpu notifier to initialize secondary CPUs

Re: [GIT pull] irq core changes for 3.16

[Linus Torvalds]

On Wed, Jun 4, 2014 at 12:34 PM, Thomas Gleixner <tglx@linutronix.de> wrote:
>
> Is what my script uses for years now, but this time it created a diff
> with random extra content from all over the tree.
>
> $BASE is 2ed9fd28c2884e9f41c133f86a7e377d7c0a96bf

You have criss-cross merges, so there are multiple merge-bases. You
can see if it you use the "--all" flag to "git merge-base". For
example, there's that "Merge branches 'linus' and 'irq/urgent' into
irq/core" that does a back-merge of my tree, and there's also a "Merge
tag 'irqchip-mvebu-3.16' of git://git.infradead.org/linux-mvebu into
irq/core" that merges stuff that is already in my tree. So there is
not a single unique shared base-point.

When that happens, doing the diff against one of the base points *can*
happen to work, but generally gives other random cruft from the other
shared part of the tree as part of the diff. It happened for your
timer core pull too, you just didn't notice because the shared part
was much smaller.

Anyway, for the "there are multiple different commits in common" case,
the only way to get a true diff is to generate the actual merge in a
temporary branch, and see what the result is (and then just throw away
the merge). The git merge facilities are much smarter than just
diffing between two points, and will actually recursively merge up the
different base points in order to generate the final merge result.

But if it's rare, it doesn't much matter if the trivial "let's just
diff against the base" doesn't always work. But this *is* one of the
reasons why I suggest against back-merges, because it makes the
history harder to figure out, and it causes these kinds of "there are
many different independent base points" issues.

                Linus