Re: tip/x86/amba

[Alessandro Rubini]

>> I wonder what are the plans for the branch x86/amba, part of the tip
>> repository.  Of the 7 patches in that branch, 2 are already upstream
>> and the other 5 rebase perfectly (only conflicts are in the header
>> stanzas). This is the reverse log from next to my current working tree:
>> 
>>   0e7e31f DMA: PL330: use prefix in reg names to build under x86
>>   1e8486a watchdog: sp805_wdt depends on ARM
>>   6417077 mmc: Use the new <linux/sizes.h>
>>   52b9f4e drivers/amba: add support for a PCI bridge
>>   d8d2313 x86: add CONFIG_ARM_AMBA, selected by STA2X11

> We have been waiting for you to sort out the breakages and let us know
> that the problems has been resolved.  Sorry, [...]

Nothing to be sorry. Thanks for you patience.

> What are the upstream commits?

These are the ones in your branch:

  morgana% gitlog --reverse master..tip/x86/amba
  e4093bd DMA: PL330: use prefix in reg names to build under x86
  f5cfd23 pl080.h: moved from arm/include/asm/hardware to include/linux/amba/
  f449ac1 watchdog: sp805_wdt depends on ARM
  ab189b1 mmci: replace readsl/writesl with ioread32_rep/iowrite32_rep
  e61094e mmc: Use the new <linux/sizes.h>
  e7c1371 drivers/amba: add support for a PCI bridge
  5be5a01 x86: add CONFIG_ARM_AMBA, selected by STA2X11

Of those I see one in next (through the slave-dma/next branch):

  3a95b9f pl080.h: moved from arm/include/asm/hardware to include/linux/amba/

and one in master:

  4b85da0 ARM: 7596/1: mmci: replace readsl/writesl with ioread32_rep/iowrite32_rep

For the other ones the conflicts are only in the #include
stanzas. Even with current master No error or warning is then when
enabling CONFIG_ARM_AMBA under x86, even replying y or m to every new
question.

(There are two sta2x11 warnings, unrelated to amba, that I'll post a
fix for RSN).

Shall I repost the current version, send privately or have them
somewhere for you to pull from?

Thanks
/alessandro
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/