mirror of
https://github.com/torvalds/linux.git
synced 2024-11-07 12:41:55 +00:00
5375871d43
Pull powerpc merge from Benjamin Herrenschmidt:
"Here's the powerpc batch for this merge window. It is going to be a
bit more nasty than usual as in touching things outside of
arch/powerpc mostly due to the big iSeriesectomy :-) We finally got
rid of the bugger (legacy iSeries support) which was a PITA to
maintain and that nobody really used anymore.
Here are some of the highlights:
- Legacy iSeries is gone. Thanks Stephen ! There's still some bits
and pieces remaining if you do a grep -ir series arch/powerpc but
they are harmless and will be removed in the next few weeks
hopefully.
- The 'fadump' functionality (Firmware Assisted Dump) replaces the
previous (equivalent) "pHyp assisted dump"... it's a rewrite of a
mechanism to get the hypervisor to do crash dumps on pSeries, the
new implementation hopefully being much more reliable. Thanks
Mahesh Salgaonkar.
- The "EEH" code (pSeries PCI error handling & recovery) got a big
spring cleaning, motivated by the need to be able to implement a
new backend for it on top of some new different type of firwmare.
The work isn't complete yet, but a good chunk of the cleanups is
there. Note that this adds a field to struct device_node which is
not very nice and which Grant objects to. I will have a patch soon
that moves that to a powerpc private data structure (hopefully
before rc1) and we'll improve things further later on (hopefully
getting rid of the need for that pointer completely). Thanks Gavin
Shan.
- I dug into our exception & interrupt handling code to improve the
way we do lazy interrupt handling (and make it work properly with
"edge" triggered interrupt sources), and while at it found & fixed
a wagon of issues in those areas, including adding support for page
fault retry & fatal signals on page faults.
- Your usual random batch of small fixes & updates, including a bunch
of new embedded boards, both Freescale and APM based ones, etc..."
I fixed up some conflicts with the generalized irq-domain changes from
Grant Likely, hopefully correctly.
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (141 commits)
powerpc/ps3: Do not adjust the wrapper load address
powerpc: Remove the rest of the legacy iSeries include files
powerpc: Remove the remaining CONFIG_PPC_ISERIES pieces
init: Remove CONFIG_PPC_ISERIES
powerpc: Remove FW_FEATURE ISERIES from arch code
tty/hvc_vio: FW_FEATURE_ISERIES is no longer selectable
powerpc/spufs: Fix double unlocks
powerpc/5200: convert mpc5200 to use of_platform_populate()
powerpc/mpc5200: add options to mpc5200_defconfig
powerpc/mpc52xx: add a4m072 board support
powerpc/mpc5200: update mpc5200_defconfig to fit for charon board
Documentation/powerpc/mpc52xx.txt: Checkpatch cleanup
powerpc/44x: Add additional device support for APM821xx SoC and Bluestone board
powerpc/44x: Add support PCI-E for APM821xx SoC and Bluestone board
MAINTAINERS: Update PowerPC 4xx tree
powerpc/44x: The bug fixed support for APM821xx SoC and Bluestone board
powerpc: document the FSL MPIC message register binding
powerpc: add support for MPIC message register API
powerpc/fsl: Added aliased MSIIR register address to MSI node in dts
powerpc/85xx: mpc8548cds - add 36-bit dts
...
|
||
|---|---|---|
| .. | ||
| acquirewdt.c | ||
| advantechwdt.c | ||
| alim1535_wdt.c | ||
| alim7101_wdt.c | ||
| ar7_wdt.c | ||
| at32ap700x_wdt.c | ||
| at91rm9200_wdt.c | ||
| at91sam9_wdt.c | ||
| at91sam9_wdt.h | ||
| ath79_wdt.c | ||
| bcm47xx_wdt.c | ||
| bcm63xx_wdt.c | ||
| bfin_wdt.c | ||
| booke_wdt.c | ||
| coh901327_wdt.c | ||
| cpu5wdt.c | ||
| cpwd.c | ||
| davinci_wdt.c | ||
| dw_wdt.c | ||
| ep93xx_wdt.c | ||
| eurotechwdt.c | ||
| f71808e_wdt.c | ||
| gef_wdt.c | ||
| geodewdt.c | ||
| hpwdt.c | ||
| i6300esb.c | ||
| ib700wdt.c | ||
| ibmasr.c | ||
| imx2_wdt.c | ||
| indydog.c | ||
| intel_scu_watchdog.c | ||
| intel_scu_watchdog.h | ||
| iop_wdt.c | ||
| it87_wdt.c | ||
| it8712f_wdt.c | ||
| iTCO_vendor_support.c | ||
| iTCO_vendor.h | ||
| iTCO_wdt.c | ||
| ixp4xx_wdt.c | ||
| ixp2000_wdt.c | ||
| jz4740_wdt.c | ||
| Kconfig | ||
| ks8695_wdt.c | ||
| lantiq_wdt.c | ||
| m54xx_wdt.c | ||
| machzwd.c | ||
| Makefile | ||
| max63xx_wdt.c | ||
| mixcomwd.c | ||
| mpc8xxx_wdt.c | ||
| mpcore_wdt.c | ||
| mtx-1_wdt.c | ||
| mv64x60_wdt.c | ||
| nuc900_wdt.c | ||
| nv_tco.c | ||
| nv_tco.h | ||
| octeon-wdt-main.c | ||
| octeon-wdt-nmi.S | ||
| of_xilinx_wdt.c | ||
| omap_wdt.c | ||
| omap_wdt.h | ||
| orion_wdt.c | ||
| pc87413_wdt.c | ||
| pcwd_pci.c | ||
| pcwd_usb.c | ||
| pcwd.c | ||
| pika_wdt.c | ||
| pnx833x_wdt.c | ||
| pnx4008_wdt.c | ||
| rc32434_wdt.c | ||
| rdc321x_wdt.c | ||
| riowd.c | ||
| s3c2410_wdt.c | ||
| sa1100_wdt.c | ||
| sb_wdog.c | ||
| sbc60xxwdt.c | ||
| sbc7240_wdt.c | ||
| sbc8360.c | ||
| sbc_epx_c3.c | ||
| sbc_fitpc2_wdt.c | ||
| sc520_wdt.c | ||
| sc1200wdt.c | ||
| sch311x_wdt.c | ||
| scx200_wdt.c | ||
| shwdt.c | ||
| smsc37b787_wdt.c | ||
| softdog.c | ||
| sp805_wdt.c | ||
| sp5100_tco.c | ||
| sp5100_tco.h | ||
| stmp3xxx_wdt.c | ||
| ts72xx_wdt.c | ||
| twl4030_wdt.c | ||
| txx9wdt.c | ||
| via_wdt.c | ||
| w83627hf_wdt.c | ||
| w83697hf_wdt.c | ||
| w83697ug_wdt.c | ||
| w83877f_wdt.c | ||
| w83977f_wdt.c | ||
| wafer5823wdt.c | ||
| watchdog_core.c | ||
| watchdog_dev.c | ||
| watchdog_dev.h | ||
| wd501p.h | ||
| wdrtas.c | ||
| wdt285.c | ||
| wdt977.c | ||
| wdt_pci.c | ||
| wdt.c | ||
| wm831x_wdt.c | ||
| wm8350_wdt.c | ||
| xen_wdt.c | ||