$ git checkout master Already on "master" $ git reset --hard stable HEAD is now at f9d1c6c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband Merging origin/master $ git merge origin/master Updating f9d1c6c..9bedbcb Fast forward drivers/char/agp/agp.h | 6 +- drivers/char/agp/alpha-agp.c | 4 +- drivers/char/agp/amd-k7-agp.c | 4 +- drivers/char/agp/amd64-agp.c | 4 +- drivers/char/agp/ati-agp.c | 4 +- drivers/char/agp/backend.c | 16 ++-- drivers/char/agp/compat_ioctl.c | 2 +- drivers/char/agp/efficeon-agp.c | 6 +- drivers/char/agp/frontend.c | 12 +- drivers/char/agp/generic.c | 35 +++--- drivers/char/agp/hp-agp.c | 6 +- drivers/char/agp/i460-agp.c | 2 +- drivers/char/agp/intel-agp.c | 237 +++++++++++++++++++++++++-------------- drivers/char/agp/nvidia-agp.c | 4 +- drivers/char/agp/parisc-agp.c | 6 +- drivers/char/agp/sgi-agp.c | 8 +- drivers/char/agp/sworks-agp.c | 6 +- drivers/char/agp/uninorth-agp.c | 10 +- drivers/char/agp/via-agp.c | 13 ++- include/linux/agp_backend.h | 16 +-- include/linux/agpgart.h | 4 +- 21 files changed, 237 insertions(+), 168 deletions(-) Merging powerpc-merge/merge $ git merge powerpc-merge/merge Already up-to-date. Merging scsi-rc-fixes/master $ git merge scsi-rc-fixes/master Already up-to-date. Merging net-current/master $ git merge net-current/master Merge made by recursive. net/mac80211/tx.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) Merging sparc-current/master $ git merge sparc-current/master Merge made by recursive. drivers/scsi/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merging sound-current/for-linus $ git merge sound-current/for-linus Already up-to-date. Merging arm-current/master $ git merge arm-current/master Already up-to-date. Merging pci-current/for-linus $ git merge pci-current/for-linus Already up-to-date. Merging wireless-current/master $ git merge wireless-current/master Already up-to-date. Merging kbuild-current/master $ git merge kbuild-current/master Already up-to-date. Merging quilt/driver-core.current $ git merge quilt/driver-core.current Merge made by recursive. Documentation/kobject.txt | 4 ++++ drivers/base/core.c | 5 +++++ include/linux/sysfs.h | 4 +++- lib/kobject.c | 18 +++++------------- 4 files changed, 17 insertions(+), 14 deletions(-) Merging quilt/usb.current $ git merge quilt/usb.current Merge made by recursive. drivers/usb/class/cdc-acm.c | 3 --- drivers/usb/host/ehci.h | 19 ++++++++++--------- drivers/usb/host/ohci-hcd.c | 15 ++++++++++++++- drivers/usb/host/ohci-q.c | 12 ++++++++++++ drivers/usb/storage/unusual_devs.h | 8 ++++++++ 5 files changed, 44 insertions(+), 13 deletions(-) Merging cpufreq-current/fixes $ git merge cpufreq-current/fixes Already up-to-date. Merging input-current/for-linus $ git merge input-current/for-linus Already up-to-date. Merging quilt/driver-core $ git merge quilt/driver-core Auto-merged drivers/net/wireless/rt2x00/rt73usb.c Auto-merged drivers/scsi/hosts.c CONFLICT (content): Merge conflict in drivers/scsi/hosts.c Resolved 'drivers/scsi/hosts.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-dev | 20 ++ Documentation/DocBook/uio-howto.tmpl | 40 ++++- Documentation/filesystems/sysfs.txt | 6 + arch/arm/common/dmabounce.c | 22 +-- arch/arm/common/locomo.c | 2 +- arch/arm/common/sa1111.c | 10 +- arch/arm/common/scoop.c | 2 +- arch/arm/kernel/ecard.c | 5 +- arch/arm/mach-integrator/impd1.c | 7 +- arch/arm/mach-integrator/lm.c | 6 +- arch/arm/plat-omap/mailbox.c | 2 +- arch/mips/kernel/rtlx.c | 4 +- arch/mips/sibyte/common/sb_tbprof.c | 3 +- arch/powerpc/platforms/chrp/pci.c | 2 +- arch/sparc64/kernel/ebus.c | 4 +- arch/sparc64/kernel/of_device.c | 4 +- arch/sparc64/kernel/pci.c | 2 +- arch/sparc64/kernel/vio.c | 18 +- arch/x86/kernel/cpuid.c | 4 +- arch/x86/kernel/microcode.c | 4 +- arch/x86/kernel/msr.c | 4 +- arch/x86/kernel/pci-dma.c | 6 +- arch/x86/kernel/pci-gart_64.c | 4 +- arch/x86/kernel/traps_32.c | 1 + arch/x86/kernel/traps_64.c | 1 + block/bsg.c | 3 +- block/genhd.c | 205 +++++++++++-------- drivers/acpi/fan.c | 10 +- drivers/acpi/glue.c | 6 +- drivers/acpi/processor_core.c | 5 +- drivers/acpi/scan.c | 2 +- drivers/acpi/thermal.c | 4 +- drivers/acpi/video.c | 5 +- drivers/base/base.h | 27 +++ drivers/base/class.c | 153 +++++++++------ drivers/base/core.c | 183 +++++++++++------ drivers/base/firmware_class.c | 2 +- drivers/base/power/trace.c | 2 +- drivers/base/sys.c | 11 +- drivers/block/aoe/aoechr.c | 5 +- drivers/block/paride/pg.c | 5 +- drivers/block/paride/pt.c | 10 +- drivers/block/pktcdvd.c | 4 +- drivers/bluetooth/bfusb.c | 3 +- drivers/bluetooth/bt3c_cs.c | 3 +- drivers/char/cyclades.c | 10 +- drivers/char/dsp56k.c | 3 +- drivers/char/ip2/ip2main.c | 12 +- drivers/char/ipmi/ipmi_devintf.c | 2 +- drivers/char/istallion.c | 5 +- drivers/char/lp.c | 3 +- drivers/char/mem.c | 6 +- drivers/char/misc.c | 4 +- drivers/char/pcmcia/cm4000_cs.c | 2 +- drivers/char/pcmcia/cm4040_cs.c | 3 +- drivers/char/ppdev.c | 5 +- drivers/char/raw.c | 7 +- drivers/char/snsc.c | 3 +- drivers/char/stallion.c | 4 +- drivers/char/tty_io.c | 12 +- drivers/char/vc_screen.c | 12 +- drivers/char/viotape.c | 8 +- drivers/char/vt.c | 14 +- drivers/char/xilinx_hwicap/xilinx_hwicap.c | 5 +- drivers/dca/dca-sysfs.c | 8 +- drivers/eisa/Makefile | 2 +- drivers/eisa/eisa-bus.c | 4 +- drivers/firmware/dell_rbu.c | 2 +- drivers/hid/hidraw.c | 5 +- drivers/hwmon/hwmon.c | 3 +- drivers/i2c/i2c-core.c | 96 +++++----- drivers/i2c/i2c-dev.c | 6 +- drivers/ide/ide-tape.c | 10 +- drivers/ieee1394/dv1394.c | 7 +- drivers/ieee1394/nodemgr.c | 23 ++- drivers/ieee1394/raw1394.c | 4 +- drivers/ieee1394/video1394.c | 6 +- drivers/infiniband/core/cm.c | 72 +++---- drivers/infiniband/hw/ipath/ipath_file_ops.c | 2 +- drivers/isdn/capi/capi.c | 3 +- drivers/macintosh/adb.c | 3 +- drivers/mca/mca-bus.c | 2 +- drivers/media/common/tuners/tuner-xc2028.c | 2 +- drivers/media/common/tuners/xc5000.c | 2 +- drivers/media/dvb/dvb-core/dvbdev.c | 4 +- drivers/media/dvb/dvb-usb/cxusb.c | 21 ++- drivers/media/dvb/dvb-usb/gp8psk.c | 3 +- drivers/media/dvb/frontends/bcm3510.c | 5 +- drivers/media/dvb/frontends/nxt200x.c | 3 +- drivers/media/dvb/frontends/or51211.c | 4 +- drivers/media/dvb/frontends/sp8870.c | 2 +- drivers/media/dvb/frontends/sp887x.c | 2 +- drivers/media/dvb/frontends/tda10048.c | 2 +- drivers/media/dvb/frontends/tda1004x.c | 2 +- drivers/media/dvb/ttusb-dec/ttusb_dec.c | 2 +- drivers/media/video/bt8xx/bttv-cards.c | 3 +- drivers/media/video/cx25840/cx25840-firmware.c | 27 +-- drivers/memstick/host/jmb38x_ms.c | 4 +- drivers/message/fusion/mptbase.h | 2 +- drivers/message/fusion/mptfc.c | 4 +- drivers/misc/phantom.c | 5 +- drivers/mtd/mtdchar.c | 9 +- drivers/net/arm/at91_ether.c | 2 +- drivers/net/arm/ep93xx_eth.c | 2 +- drivers/net/arm/etherh.c | 6 +- drivers/net/cxgb3/common.h | 5 +- drivers/net/cxgb3/t3_hw.c | 7 +- drivers/net/irda/irda-usb.c | 12 +- drivers/net/myri10ge/myri10ge.c | 11 +- drivers/net/phy/phy_device.c | 8 +- drivers/net/ppp_generic.c | 3 +- drivers/net/wan/cosa.c | 6 +- drivers/net/wireless/atmel.c | 6 +- drivers/net/wireless/libertas/if_cs.c | 2 +- drivers/net/wireless/libertas/if_sdio.c | 4 +- drivers/net/wireless/libertas/if_usb.c | 4 +- drivers/net/wireless/p54/p54usb.c | 5 +- drivers/net/wireless/rt2x00/rt2x00.h | 4 +- drivers/net/wireless/rt2x00/rt2x00pci.h | 2 +- drivers/net/wireless/rt2x00/rt61pci.c | 4 +- drivers/net/wireless/rt2x00/rt73usb.c | 6 +- drivers/net/wireless/zd1201.c | 2 +- drivers/pci/hotplug/acpiphp.h | 4 +- drivers/power/apm_power.c | 2 +- drivers/power/power_supply_core.c | 4 +- drivers/rtc/interface.c | 2 +- drivers/s390/block/dasd.c | 32 ++-- drivers/s390/block/dasd_3990_erp.c | 2 +- drivers/s390/block/dasd_devmap.c | 28 ++-- drivers/s390/block/dasd_eckd.c | 6 +- drivers/s390/block/dasd_eer.c | 4 +- drivers/s390/block/dasd_fba.c | 4 +- drivers/s390/block/dasd_int.h | 4 +- drivers/s390/block/dasd_proc.c | 2 +- drivers/s390/block/dcssblk.c | 7 +- drivers/s390/char/raw3270.c | 14 +- drivers/s390/char/tape_3590.c | 129 ++++++------ drivers/s390/char/tape_block.c | 2 +- drivers/s390/char/tape_class.c | 7 +- drivers/s390/char/tape_core.c | 20 +- drivers/s390/char/tape_proc.c | 2 +- drivers/s390/char/tape_std.c | 12 +- drivers/s390/char/vmlogrdr.c | 5 +- drivers/s390/char/vmur.c | 11 +- drivers/s390/cio/ccwgroup.c | 3 +- drivers/s390/cio/chp.c | 3 +- drivers/s390/cio/cio.c | 29 ++- drivers/s390/cio/cio.h | 4 + drivers/s390/cio/css.c | 4 +- drivers/s390/cio/device.c | 20 ++- drivers/s390/cio/device_fsm.c | 6 +- drivers/s390/cio/device_ops.c | 2 +- drivers/s390/cio/qdio.c | 24 ++-- drivers/s390/crypto/ap_bus.c | 4 +- drivers/s390/kvm/kvm_virtio.c | 15 +- drivers/s390/net/claw.c | 50 +++--- drivers/s390/net/claw.h | 2 +- drivers/s390/net/ctcm_main.c | 22 ++- drivers/s390/net/ctcm_main.h | 2 +- drivers/s390/net/lcs.c | 30 ++-- drivers/s390/net/netiucv.c | 4 +- drivers/s390/net/qeth_core.h | 10 +- drivers/s390/net/qeth_core_main.c | 10 +- drivers/s390/s390_rdev.c | 2 +- drivers/s390/scsi/zfcp_aux.c | 23 +-- drivers/s390/scsi/zfcp_def.h | 4 +- drivers/sbus/sbus.c | 6 +- drivers/scsi/aic94xx/aic94xx_sds.c | 12 +- drivers/scsi/aic94xx/aic94xx_sds.h | 4 +- drivers/scsi/aic94xx/aic94xx_seq.c | 7 +- drivers/scsi/dpt_i2o.c | 4 +- drivers/scsi/hosts.c | 7 +- drivers/scsi/scsi_transport_fc.c | 9 +- drivers/scsi/scsi_transport_iscsi.c | 4 +- drivers/spi/spi.c | 2 +- drivers/spi/spidev.c | 4 +- drivers/uio/Kconfig | 10 +- drivers/uio/Makefile | 1 + drivers/uio/uio.c | 26 +++ drivers/uio/uio_pdrv.c | 118 +++++++++++ drivers/usb/atm/cxacru.c | 2 +- drivers/usb/atm/ueagle-atm.c | 20 +- drivers/usb/core/devio.c | 15 ++- drivers/usb/core/file.c | 5 +- drivers/usb/gadget/printer.c | 4 +- drivers/usb/misc/isight_firmware.c | 2 +- drivers/usb/mon/mon_bin.c | 5 +- drivers/video/aty/aty128fb.c | 2 +- drivers/video/aty/radeonfb.h | 2 +- drivers/video/console/fbcon.c | 3 +- drivers/video/fbmem.c | 5 +- fs/coda/psdev.c | 5 +- fs/partitions/check.c | 2 +- fs/sysfs/file.c | 18 ++- fs/sysfs/mount.c | 2 +- fs/sysfs/sysfs.h | 1 + include/linux/device.h | 52 ++++-- include/linux/eisa.h | 2 +- include/linux/firmware.h | 2 +- include/linux/init.h | 1 + include/linux/kobject.h | 3 +- include/linux/pci.h | 4 +- include/linux/spi/spi.h | 2 +- include/linux/sysfs.h | 5 + include/linux/uio_driver.h | 8 +- include/scsi/scsi_host.h | 2 +- include/scsi/scsi_transport_fc.h | 4 +- include/scsi/scsi_transport_iscsi.h | 2 +- init/main.c | 9 + lib/Kconfig.debug | 3 + lib/kobject.c | 62 ++++++- net/bluetooth/hci_sysfs.c | 7 - .../firmware_sample_firmware_class.c | 2 +- samples/kobject/kset-example.c | 2 +- scripts/mod/file2alias.c | 24 ++- sound/core/init.c | 5 +- sound/drivers/vx/vx_core.c | 4 +- sound/oss/soundcard.c | 14 +- sound/pci/maestro3.c | 29 ++-- sound/pci/pcxhr/pcxhr_core.c | 4 +- sound/pci/riptide/riptide.c | 10 +- sound/pci/vx222/vx222_ops.c | 2 +- sound/pci/ymfpci/ymfpci_main.c | 59 ++++--- sound/sound_core.c | 5 +- 224 files changed, 1601 insertions(+), 1028 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-dev create mode 100644 drivers/uio/uio_pdrv.c Merging quilt/usb $ git merge quilt/usb Removed Documentation/usb/uhci.txt Removed drivers/usb/serial/airprime.c Merge made by recursive. Documentation/DocBook/gadget.tmpl | 38 + Documentation/usb/WUSB-Design-overview.txt | 448 ++++++ Documentation/usb/gadget_serial.txt | 35 +- Documentation/usb/uhci.txt | 165 -- Documentation/usb/wusb-cbaf | 133 ++ arch/arm/Kconfig | 2 + arch/cris/Kconfig | 2 + arch/h8300/Kconfig | 2 + arch/v850/Kconfig | 2 + drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/hid/usbhid/hid-core.c | 2 +- drivers/usb/Kconfig | 2 + drivers/usb/Makefile | 3 + drivers/usb/atm/cxacru.c | 1 - drivers/usb/atm/speedtch.c | 1 - drivers/usb/class/cdc-wdm.c | 16 +- drivers/usb/core/devices.c | 4 - drivers/usb/core/devio.c | 4 +- drivers/usb/core/driver.c | 37 +- drivers/usb/core/endpoint.c | 4 +- drivers/usb/core/file.c | 10 +- drivers/usb/core/hcd.c | 6 +- drivers/usb/core/hcd.h | 4 +- drivers/usb/core/hub.c | 586 +++++--- drivers/usb/core/message.c | 22 +- drivers/usb/core/usb.c | 7 +- drivers/usb/gadget/Makefile | 6 +- drivers/usb/gadget/amd5536udc.c | 2 +- drivers/usb/gadget/at91_udc.c | 13 + drivers/usb/gadget/composite.c | 1041 +++++++++++++ drivers/usb/gadget/config.c | 75 +- drivers/usb/gadget/dummy_hcd.c | 4 +- drivers/usb/gadget/epautoconf.c | 1 + drivers/usb/gadget/ether.c | 2 +- drivers/usb/gadget/f_acm.c | 587 +++++++ drivers/usb/gadget/f_loopback.c | 383 +++++ drivers/usb/gadget/f_serial.c | 298 ++++ drivers/usb/gadget/f_sourcesink.c | 589 +++++++ drivers/usb/gadget/file_storage.c | 4 +- drivers/usb/gadget/fsl_usb2_udc.c | 2 +- drivers/usb/gadget/g_zero.h | 25 + drivers/usb/gadget/goku_udc.c | 2 +- drivers/usb/gadget/inode.c | 23 +- drivers/usb/gadget/lh7a40x_udc.c | 2 +- drivers/usb/gadget/m66592-udc.c | 2 +- drivers/usb/gadget/net2280.c | 2 +- drivers/usb/gadget/omap_udc.c | 2 +- drivers/usb/gadget/printer.c | 7 +- drivers/usb/gadget/pxa2xx_udc.c | 2 +- drivers/usb/gadget/rndis.c | 55 +- drivers/usb/gadget/rndis.h | 2 - drivers/usb/gadget/serial.c | 2313 ++-------------------------- drivers/usb/gadget/u_serial.c | 1270 +++++++++++++++ drivers/usb/gadget/u_serial.h | 47 + drivers/usb/gadget/zero.c | 1158 ++------------- drivers/usb/host/Kconfig | 26 + drivers/usb/host/Makefile | 3 + drivers/usb/host/ehci-dbg.c | 4 +- drivers/usb/host/ehci-fsl.c | 12 +- drivers/usb/host/ehci-hcd.c | 2 +- drivers/usb/host/ehci-ixp4xx.c | 8 +- drivers/usb/host/ehci-orion.c | 8 +- drivers/usb/host/ehci-ps3.c | 2 +- drivers/usb/host/ehci-q.c | 17 +- drivers/usb/host/ehci.h | 5 +- drivers/usb/host/hwa-hc.c | 935 +++++++++++ drivers/usb/host/isp116x-hcd.c | 7 +- drivers/usb/host/isp1760-hcd.c | 81 +- drivers/usb/host/isp1760-hcd.h | 20 +- drivers/usb/host/isp1760-if.c | 37 +- drivers/usb/host/ohci-at91.c | 9 +- drivers/usb/host/ohci-dbg.c | 2 +- drivers/usb/host/ohci-hcd.c | 2 +- drivers/usb/host/ohci-omap.c | 2 +- drivers/usb/host/ohci-pnx4008.c | 2 +- drivers/usb/host/ohci-ppc-of.c | 2 +- drivers/usb/host/ohci-ps3.c | 2 +- drivers/usb/host/ohci-q.c | 3 - drivers/usb/host/ohci-sm501.c | 2 +- drivers/usb/host/ohci-ssb.c | 2 +- drivers/usb/host/r8a66597-hcd.c | 6 +- drivers/usb/host/sl811-hcd.c | 2 +- drivers/usb/host/u132-hcd.c | 2 +- drivers/usb/host/uhci-hcd.c | 1 + drivers/usb/host/uhci-hub.c | 8 +- drivers/usb/host/whci/Kbuild | 11 + drivers/usb/host/whci/asl.c | 366 +++++ drivers/usb/host/whci/hcd.c | 339 ++++ drivers/usb/host/whci/hw.c | 80 + drivers/usb/host/whci/init.c | 181 +++ drivers/usb/host/whci/int.c | 95 ++ drivers/usb/host/whci/pzl.c | 398 +++++ drivers/usb/host/whci/qset.c | 563 +++++++ drivers/usb/host/whci/whcd.h | 195 +++ drivers/usb/host/whci/whci-hc.h | 413 +++++ drivers/usb/host/whci/wusb.c | 241 +++ drivers/usb/misc/Kconfig | 10 + drivers/usb/misc/Makefile | 1 + drivers/usb/misc/auerswald.c | 10 +- drivers/usb/misc/emi62.c | 2 - drivers/usb/misc/ftdi-elan.c | 24 - drivers/usb/misc/gotemp.c | 301 ++++ drivers/usb/misc/iowarrior.c | 8 +- drivers/usb/misc/rio500.c | 8 +- drivers/usb/misc/sisusbvga/sisusb.c | 13 +- drivers/usb/misc/usblcd.c | 6 +- drivers/usb/mon/mon_stat.c | 14 +- drivers/usb/serial/Kconfig | 16 +- drivers/usb/serial/Makefile | 1 - drivers/usb/serial/airprime.c | 353 ----- drivers/usb/serial/cp2101.c | 13 +- drivers/usb/serial/digi_acceleport.c | 3 +- drivers/usb/serial/io_fw_down3.h | 11 +- drivers/usb/serial/io_ti.c | 1888 +++++++++++------------ drivers/usb/serial/ir-usb.c | 490 ++++--- drivers/usb/serial/keyspan_pda.S | 2 +- drivers/usb/serial/kl5kusb105.c | 2 +- drivers/usb/serial/option.c | 2 + drivers/usb/serial/ti_fw_3410.h | 4 + drivers/usb/serial/ti_fw_5052.h | 5 + drivers/usb/serial/ti_usb_3410_5052.c | 106 +- drivers/usb/serial/usb-serial.c | 8 +- drivers/usb/serial/xircom_pgs.S | 2 +- drivers/usb/storage/datafab.c | 2 - drivers/usb/storage/debug.c | 2 - drivers/usb/storage/debug.h | 2 - drivers/usb/storage/dpcm.c | 2 - drivers/usb/storage/dpcm.h | 2 - drivers/usb/storage/freecom.c | 2 - drivers/usb/storage/freecom.h | 2 - drivers/usb/storage/initializers.c | 2 - drivers/usb/storage/initializers.h | 2 - drivers/usb/storage/isd200.c | 8 +- drivers/usb/storage/jumpshot.c | 2 - drivers/usb/storage/protocol.c | 2 - drivers/usb/storage/protocol.h | 2 - drivers/usb/storage/scsiglue.c | 28 +- drivers/usb/storage/scsiglue.h | 2 - drivers/usb/storage/sddr09.c | 1 - drivers/usb/storage/sddr09.h | 2 - drivers/usb/storage/sddr55.c | 2 - drivers/usb/storage/sddr55.h | 2 - drivers/usb/storage/shuttle_usbat.c | 2 - drivers/usb/storage/shuttle_usbat.h | 2 - drivers/usb/storage/transport.c | 83 +- drivers/usb/storage/transport.h | 2 - drivers/usb/storage/unusual_devs.h | 2 - drivers/usb/storage/usb.c | 111 +- drivers/usb/storage/usb.h | 25 +- drivers/usb/wusbcore/Kconfig | 17 + drivers/usb/wusbcore/Makefile | 20 + drivers/usb/wusbcore/cbaf.c | 620 ++++++++ drivers/usb/wusbcore/crypto.c | 538 +++++++ drivers/usb/wusbcore/dev-sysfs.c | 199 +++ drivers/usb/wusbcore/devconnect.c | 1319 ++++++++++++++++ drivers/usb/wusbcore/mmc.c | 329 ++++ drivers/usb/wusbcore/pal.c | 39 + drivers/usb/wusbcore/reservation.c | 115 ++ drivers/usb/wusbcore/rh.c | 477 ++++++ drivers/usb/wusbcore/security.c | 644 ++++++++ drivers/usb/wusbcore/wa-hc.c | 83 + drivers/usb/wusbcore/wa-hc.h | 416 +++++ drivers/usb/wusbcore/wa-nep.c | 313 ++++ drivers/usb/wusbcore/wa-rpipe.c | 562 +++++++ drivers/usb/wusbcore/wa-xfer.c | 1709 ++++++++++++++++++++ drivers/usb/wusbcore/wusbhc.c | 392 +++++ drivers/usb/wusbcore/wusbhc.h | 525 +++++++ drivers/uwb/Kconfig | 90 ++ drivers/uwb/Makefile | 29 + drivers/uwb/address.c | 374 +++++ drivers/uwb/beacon.c | 707 +++++++++ drivers/uwb/driver.c | 142 ++ drivers/uwb/drp-avail.c | 288 ++++ drivers/uwb/drp-ie.c | 233 +++ drivers/uwb/drp.c | 451 ++++++ drivers/uwb/est.c | 414 +++++ drivers/uwb/hwa-rc.c | 915 +++++++++++ drivers/uwb/i1480/Makefile | 2 + drivers/uwb/i1480/dfu/Makefile | 9 + drivers/uwb/i1480/dfu/dfu.c | 281 ++++ drivers/uwb/i1480/dfu/i1480-dfu.h | 263 ++++ drivers/uwb/i1480/dfu/mac.c | 529 +++++++ drivers/uwb/i1480/dfu/phy.c | 203 +++ drivers/uwb/i1480/dfu/usb.c | 501 ++++++ drivers/uwb/i1480/i1480-est.c | 99 ++ drivers/uwb/i1480/i1480-wlp.h | 155 ++ drivers/uwb/i1480/i1480u-wlp/Makefile | 8 + drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h | 269 ++++ drivers/uwb/i1480/i1480u-wlp/lc.c | 421 +++++ drivers/uwb/i1480/i1480u-wlp/netdev.c | 367 +++++ drivers/uwb/i1480/i1480u-wlp/rx.c | 491 ++++++ drivers/uwb/i1480/i1480u-wlp/sysfs.c | 446 ++++++ drivers/uwb/i1480/i1480u-wlp/tx.c | 638 ++++++++ drivers/uwb/ie.c | 570 +++++++ drivers/uwb/lc-dev.c | 512 ++++++ drivers/uwb/lc-rc.c | 485 ++++++ drivers/uwb/neh.c | 615 ++++++++ drivers/uwb/pal.c | 71 + drivers/uwb/reset.c | 319 ++++ drivers/uwb/rsv.c | 677 ++++++++ drivers/uwb/scan.c | 159 ++ drivers/uwb/umc-bus.c | 185 +++ drivers/uwb/umc-dev.c | 103 ++ drivers/uwb/umc-drv.c | 31 + drivers/uwb/uwb-debug.c | 367 +++++ drivers/uwb/uwb-internal.h | 283 ++++ drivers/uwb/uwbd.c | 425 +++++ drivers/uwb/whc-rc.c | 511 ++++++ drivers/uwb/whci.c | 274 ++++ drivers/uwb/wlp/Makefile | 10 + drivers/uwb/wlp/driver.c | 43 + drivers/uwb/wlp/eda.c | 449 ++++++ drivers/uwb/wlp/messages.c | 1946 +++++++++++++++++++++++ drivers/uwb/wlp/sysfs.c | 715 +++++++++ drivers/uwb/wlp/txrx.c | 374 +++++ drivers/uwb/wlp/wlp-internal.h | 228 +++ drivers/uwb/wlp/wlp-lc.c | 572 +++++++ drivers/uwb/wlp/wss-lc.c | 1056 +++++++++++++ include/linux/bitmap.h | 1 + include/linux/byteorder/bitfields.h | 114 ++ include/linux/usb.h | 14 +- include/linux/usb/composite.h | 338 ++++ include/linux/usb/gadget.h | 27 +- include/linux/usb/irda.h | 151 ++ include/linux/usb/wusb-wa.h | 281 ++++ include/linux/usb/wusb.h | 419 +++++ include/linux/usbdevice_fs.h | 2 - include/linux/uwb.h | 759 +++++++++ include/linux/uwb/debug-cmd.h | 57 + include/linux/uwb/debug.h | 82 + include/linux/uwb/spec.h | 625 ++++++++ include/linux/uwb/umc.h | 194 +++ include/linux/uwb/whci.h | 117 ++ include/linux/wlp.h | 728 +++++++++ lib/bitmap.c | 22 + 236 files changed, 42957 insertions(+), 5749 deletions(-) create mode 100644 Documentation/usb/WUSB-Design-overview.txt delete mode 100644 Documentation/usb/uhci.txt create mode 100644 Documentation/usb/wusb-cbaf create mode 100644 drivers/usb/gadget/composite.c create mode 100644 drivers/usb/gadget/f_acm.c create mode 100644 drivers/usb/gadget/f_loopback.c create mode 100644 drivers/usb/gadget/f_serial.c create mode 100644 drivers/usb/gadget/f_sourcesink.c create mode 100644 drivers/usb/gadget/g_zero.h create mode 100644 drivers/usb/gadget/u_serial.c create mode 100644 drivers/usb/gadget/u_serial.h create mode 100644 drivers/usb/host/hwa-hc.c create mode 100644 drivers/usb/host/whci/Kbuild create mode 100644 drivers/usb/host/whci/asl.c create mode 100644 drivers/usb/host/whci/hcd.c create mode 100644 drivers/usb/host/whci/hw.c create mode 100644 drivers/usb/host/whci/init.c create mode 100644 drivers/usb/host/whci/int.c create mode 100644 drivers/usb/host/whci/pzl.c create mode 100644 drivers/usb/host/whci/qset.c create mode 100644 drivers/usb/host/whci/whcd.h create mode 100644 drivers/usb/host/whci/whci-hc.h create mode 100644 drivers/usb/host/whci/wusb.c create mode 100644 drivers/usb/misc/gotemp.c delete mode 100644 drivers/usb/serial/airprime.c create mode 100644 drivers/usb/wusbcore/Kconfig create mode 100644 drivers/usb/wusbcore/Makefile create mode 100644 drivers/usb/wusbcore/cbaf.c create mode 100644 drivers/usb/wusbcore/crypto.c create mode 100644 drivers/usb/wusbcore/dev-sysfs.c create mode 100644 drivers/usb/wusbcore/devconnect.c create mode 100644 drivers/usb/wusbcore/mmc.c create mode 100644 drivers/usb/wusbcore/pal.c create mode 100644 drivers/usb/wusbcore/reservation.c create mode 100644 drivers/usb/wusbcore/rh.c create mode 100644 drivers/usb/wusbcore/security.c create mode 100644 drivers/usb/wusbcore/wa-hc.c create mode 100644 drivers/usb/wusbcore/wa-hc.h create mode 100644 drivers/usb/wusbcore/wa-nep.c create mode 100644 drivers/usb/wusbcore/wa-rpipe.c create mode 100644 drivers/usb/wusbcore/wa-xfer.c create mode 100644 drivers/usb/wusbcore/wusbhc.c create mode 100644 drivers/usb/wusbcore/wusbhc.h create mode 100644 drivers/uwb/Kconfig create mode 100644 drivers/uwb/Makefile create mode 100644 drivers/uwb/address.c create mode 100644 drivers/uwb/beacon.c create mode 100644 drivers/uwb/driver.c create mode 100644 drivers/uwb/drp-avail.c create mode 100644 drivers/uwb/drp-ie.c create mode 100644 drivers/uwb/drp.c create mode 100644 drivers/uwb/est.c create mode 100644 drivers/uwb/hwa-rc.c create mode 100644 drivers/uwb/i1480/Makefile create mode 100644 drivers/uwb/i1480/dfu/Makefile create mode 100644 drivers/uwb/i1480/dfu/dfu.c create mode 100644 drivers/uwb/i1480/dfu/i1480-dfu.h create mode 100644 drivers/uwb/i1480/dfu/mac.c create mode 100644 drivers/uwb/i1480/dfu/phy.c create mode 100644 drivers/uwb/i1480/dfu/usb.c create mode 100644 drivers/uwb/i1480/i1480-est.c create mode 100644 drivers/uwb/i1480/i1480-wlp.h create mode 100644 drivers/uwb/i1480/i1480u-wlp/Makefile create mode 100644 drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.h create mode 100644 drivers/uwb/i1480/i1480u-wlp/lc.c create mode 100644 drivers/uwb/i1480/i1480u-wlp/netdev.c create mode 100644 drivers/uwb/i1480/i1480u-wlp/rx.c create mode 100644 drivers/uwb/i1480/i1480u-wlp/sysfs.c create mode 100644 drivers/uwb/i1480/i1480u-wlp/tx.c create mode 100644 drivers/uwb/ie.c create mode 100644 drivers/uwb/lc-dev.c create mode 100644 drivers/uwb/lc-rc.c create mode 100644 drivers/uwb/neh.c create mode 100644 drivers/uwb/pal.c create mode 100644 drivers/uwb/reset.c create mode 100644 drivers/uwb/rsv.c create mode 100644 drivers/uwb/scan.c create mode 100644 drivers/uwb/umc-bus.c create mode 100644 drivers/uwb/umc-dev.c create mode 100644 drivers/uwb/umc-drv.c create mode 100644 drivers/uwb/uwb-debug.c create mode 100644 drivers/uwb/uwb-internal.h create mode 100644 drivers/uwb/uwbd.c create mode 100644 drivers/uwb/whc-rc.c create mode 100644 drivers/uwb/whci.c create mode 100644 drivers/uwb/wlp/Makefile create mode 100644 drivers/uwb/wlp/driver.c create mode 100644 drivers/uwb/wlp/eda.c create mode 100644 drivers/uwb/wlp/messages.c create mode 100644 drivers/uwb/wlp/sysfs.c create mode 100644 drivers/uwb/wlp/txrx.c create mode 100644 drivers/uwb/wlp/wlp-internal.h create mode 100644 drivers/uwb/wlp/wlp-lc.c create mode 100644 drivers/uwb/wlp/wss-lc.c create mode 100644 include/linux/byteorder/bitfields.h create mode 100644 include/linux/usb/composite.h create mode 100644 include/linux/usb/irda.h create mode 100644 include/linux/usb/wusb-wa.h create mode 100644 include/linux/usb/wusb.h create mode 100644 include/linux/uwb.h create mode 100644 include/linux/uwb/debug-cmd.h create mode 100644 include/linux/uwb/debug.h create mode 100644 include/linux/uwb/spec.h create mode 100644 include/linux/uwb/umc.h create mode 100644 include/linux/uwb/whci.h create mode 100644 include/linux/wlp.h Merging tip-core/auto-core-next $ git merge tip-core/auto-core-next Auto-merged lib/Kconfig.debug Auto-merged net/core/dev.c Merge made by recursive. Documentation/cpusets.txt | 2 +- Documentation/cputopology.txt | 26 +++------ Documentation/kernel-parameters.txt | 3 + arch/avr32/kernel/vmlinux.lds.S | 2 - arch/parisc/kernel/vmlinux.lds.S | 1 - arch/powerpc/kernel/vmlinux.lds.S | 2 - arch/s390/kernel/vmlinux.lds.S | 1 - arch/sh/kernel/vmlinux_32.lds.S | 1 - arch/sh/kernel/vmlinux_64.lds.S | 1 - arch/x86/kernel/cpu/common.c | 2 +- arch/x86/kernel/vmlinux_32.lds.S | 9 +-- arch/x86/kernel/vmlinux_64.lds.S | 10 +-- block/blk-core.c | 2 +- drivers/base/topology.c | 32 ++--------- include/asm-generic/percpu.h | 9 +++- include/asm-generic/sections.h | 10 +++ include/asm-generic/vmlinux.lds.h | 23 ++++++++ include/asm-x86/percpu.h | 83 ++++++++++++++++++++++++++-- include/linux/bootmem.h | 2 +- include/linux/interrupt.h | 3 +- include/linux/kernel.h | 6 -- include/linux/percpu.h | 24 ++++++++- include/linux/sched.h | 3 +- include/linux/topology.h | 13 ++++ kernel/cpuset.c | 4 +- kernel/hrtimer.c | 2 +- kernel/lockdep.c | 4 +- kernel/lockdep_proc.c | 2 +- kernel/module.c | 7 +- kernel/mutex-debug.c | 2 +- kernel/mutex.c | 5 +- kernel/printk.c | 105 +++++++++++++++-------------------- kernel/rcuclassic.c | 2 +- kernel/rcupreempt.c | 4 +- kernel/sched.c | 9 ++- kernel/softirq.c | 7 +- kernel/softlockup.c | 48 ++++++++++++++-- kernel/stacktrace.c | 12 ++-- kernel/sysctl.c | 20 +++++- kernel/time/tick-sched.c | 4 +- kernel/timer.c | 2 +- lib/Kconfig.debug | 27 ++++++++- mm/bootmem.c | 6 +- mm/filemap.c | 15 +++-- net/core/dev.c | 4 +- 45 files changed, 361 insertions(+), 200 deletions(-) Merging cpus4096/auto-cpus4096-next $ git merge cpus4096/auto-cpus4096-next Auto-merged kernel/rcuclassic.c Auto-merged kernel/rcupreempt.c Auto-merged kernel/sched.c Auto-merged net/core/dev.c Merge made by recursive. arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 6 +- arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 6 +- arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 8 +- arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c | 10 +- arch/x86/kernel/cpu/cpufreq/speedstep-ich.c | 4 +- arch/x86/kernel/cpu/intel_cacheinfo.c | 2 +- arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 4 +- arch/x86/kernel/io_apic_64.c | 8 +- arch/x86/kernel/smpboot.c | 8 +- arch/x86/xen/smp.c | 4 +- drivers/acpi/processor_throttling.c | 6 +- drivers/base/cpu.c | 4 +- drivers/cpufreq/cpufreq.c | 14 ++-- drivers/cpufreq/cpufreq_conservative.c | 2 +- drivers/cpufreq/cpufreq_ondemand.c | 4 +- drivers/infiniband/hw/ehca/ehca_irq.c | 4 +- include/asm-x86/ipi.h | 2 +- include/linux/cpumask.h | 98 ++++++++++++++------- kernel/cpu.c | 2 +- kernel/rcuclassic.c | 2 +- kernel/rcupreempt.c | 10 +- kernel/sched.c | 54 ++++++------ kernel/sched_fair.c | 2 +- kernel/sched_rt.c | 6 +- kernel/taskstats.c | 4 +- kernel/time/clocksource.c | 4 +- kernel/time/tick-broadcast.c | 3 +- kernel/workqueue.c | 6 +- lib/cpumask.c | 9 ++ mm/allocpercpu.c | 4 +- mm/vmstat.c | 2 +- net/core/dev.c | 4 +- net/iucv/iucv.c | 2 +- net/sunrpc/svc.c | 2 +- 34 files changed, 175 insertions(+), 135 deletions(-) Merging ftrace/auto-ftrace-next $ git merge ftrace/auto-ftrace-next Auto-merged arch/arm/Kconfig Auto-merged arch/powerpc/kernel/irq.c Auto-merged arch/powerpc/kernel/ppc_ksyms.c Auto-merged include/linux/sched.h Auto-merged kernel/lockdep.c Auto-merged kernel/printk.c Auto-merged kernel/sched.c Auto-merged kernel/sysctl.c Auto-merged lib/Kconfig.debug Merge made by recursive. Documentation/tracers/mmiotrace.txt | 164 ++ Makefile | 4 + arch/arm/Kconfig | 2 + arch/arm/boot/compressed/Makefile | 6 + arch/arm/kernel/Makefile | 5 + arch/arm/kernel/armksyms.c | 5 + arch/arm/kernel/entry-common.S | 47 + arch/arm/kernel/ftrace.c | 118 ++ arch/arm/kernel/kprobes.c | 2 +- arch/powerpc/Kconfig | 4 +- arch/powerpc/kernel/Makefile | 14 + arch/powerpc/kernel/entry_32.S | 123 ++ arch/powerpc/kernel/entry_64.S | 62 + arch/powerpc/kernel/ftrace.c | 161 ++ arch/powerpc/kernel/io.c | 3 +- arch/powerpc/kernel/irq.c | 6 +- arch/powerpc/kernel/ppc_ksyms.c | 5 + arch/powerpc/kernel/setup_32.c | 6 +- arch/powerpc/platforms/powermac/Makefile | 5 + arch/sparc64/Kconfig | 2 + arch/sparc64/Kconfig.debug | 2 +- arch/sparc64/kernel/Makefile | 1 + arch/sparc64/kernel/ftrace.c | 92 + arch/sparc64/lib/mcount.S | 58 +- arch/x86/Kconfig | 2 + arch/x86/Kconfig.debug | 28 + arch/x86/kernel/Makefile | 8 + arch/x86/kernel/alternative.c | 22 +- arch/x86/kernel/entry_32.S | 68 + arch/x86/kernel/entry_64.S | 102 + arch/x86/kernel/ftrace.c | 149 ++ arch/x86/kernel/i386_ksyms_32.c | 9 +- arch/x86/kernel/machine_kexec_32.c | 4 + arch/x86/kernel/machine_kexec_64.c | 4 + arch/x86/kernel/process_32.c | 3 + arch/x86/kernel/process_64.c | 3 + arch/x86/kernel/vsyscall_64.c | 3 +- arch/x86/kernel/x8664_ksyms_64.c | 11 +- arch/x86/lib/Makefile | 1 + arch/x86/lib/thunk_32.S | 47 + arch/x86/lib/thunk_64.S | 19 +- arch/x86/mm/Makefile | 5 + arch/x86/mm/fault.c | 13 + arch/x86/mm/init_32.c | 4 + arch/x86/mm/init_64.c | 10 +- arch/x86/mm/ioremap.c | 11 +- arch/x86/mm/kmmio.c | 509 +++++ arch/x86/mm/mmio-mod.c | 515 +++++ arch/x86/mm/pageattr.c | 1 + arch/x86/mm/pf_in.c | 489 +++++ arch/x86/mm/pf_in.h | 39 + arch/x86/mm/testmmiotrace.c | 71 + arch/x86/vdso/vclock_gettime.c | 15 +- arch/x86/vdso/vgetcpu.c | 3 +- include/asm-arm/kprobes.h | 1 + include/asm-powerpc/ftrace.h | 6 + include/asm-powerpc/hw_irq.h | 10 + include/asm-x86/alternative.h | 2 + include/asm-x86/irqflags.h | 24 +- include/asm-x86/vsyscall.h | 3 +- include/linux/ftrace.h | 140 ++ include/linux/irqflags.h | 13 +- include/linux/linkage.h | 2 + include/linux/marker.h | 40 +- include/linux/mmiotrace.h | 85 + include/linux/preempt.h | 34 +- include/linux/sched.h | 16 + include/linux/writeback.h | 2 + kernel/Makefile | 14 + kernel/fork.c | 2 +- kernel/lockdep.c | 33 +- kernel/marker.c | 30 +- kernel/printk.c | 2 + kernel/sched.c | 57 +- kernel/semaphore.c | 2 + kernel/spinlock.c | 2 +- kernel/sysctl.c | 11 + kernel/trace/Kconfig | 135 ++ kernel/trace/Makefile | 24 + kernel/trace/ftrace.c | 1605 +++++++++++++++ kernel/trace/trace.c | 3142 ++++++++++++++++++++++++++++++ kernel/trace/trace.h | 333 ++++ kernel/trace/trace_functions.c | 78 + kernel/trace/trace_irqsoff.c | 486 +++++ kernel/trace/trace_mmiotrace.c | 295 +++ kernel/trace/trace_sched_switch.c | 286 +++ kernel/trace/trace_sched_wakeup.c | 447 +++++ kernel/trace/trace_selftest.c | 563 ++++++ kernel/trace/trace_selftest_dynamic.c | 7 + kernel/trace/trace_sysprof.c | 363 ++++ lib/Kconfig.debug | 2 + lib/Makefile | 9 + lib/smp_processor_id.c | 6 +- mm/page-writeback.c | 10 +- scripts/Makefile.lib | 3 +- 95 files changed, 11276 insertions(+), 114 deletions(-) create mode 100644 Documentation/tracers/mmiotrace.txt create mode 100644 arch/arm/kernel/ftrace.c create mode 100644 arch/powerpc/kernel/ftrace.c create mode 100644 arch/sparc64/kernel/ftrace.c create mode 100644 arch/x86/kernel/ftrace.c create mode 100644 arch/x86/lib/thunk_32.S create mode 100644 arch/x86/mm/kmmio.c create mode 100644 arch/x86/mm/mmio-mod.c create mode 100644 arch/x86/mm/pf_in.c create mode 100644 arch/x86/mm/pf_in.h create mode 100644 arch/x86/mm/testmmiotrace.c create mode 100644 include/asm-powerpc/ftrace.h create mode 100644 include/linux/ftrace.h create mode 100644 include/linux/mmiotrace.h create mode 100644 kernel/trace/Kconfig create mode 100644 kernel/trace/Makefile create mode 100644 kernel/trace/ftrace.c create mode 100644 kernel/trace/trace.c create mode 100644 kernel/trace/trace.h create mode 100644 kernel/trace/trace_functions.c create mode 100644 kernel/trace/trace_irqsoff.c create mode 100644 kernel/trace/trace_mmiotrace.c create mode 100644 kernel/trace/trace_sched_switch.c create mode 100644 kernel/trace/trace_sched_wakeup.c create mode 100644 kernel/trace/trace_selftest.c create mode 100644 kernel/trace/trace_selftest_dynamic.c create mode 100644 kernel/trace/trace_sysprof.c Merging genirq/auto-genirq-next $ git merge genirq/auto-genirq-next Auto-merged include/linux/interrupt.h Merge made by recursive. Documentation/IRQ-affinity.txt | 37 +++++++++++++++++----- Documentation/filesystems/proc.txt | 29 +++++++++++------- arch/alpha/kernel/irq.c | 5 +-- include/linux/interrupt.h | 5 +++ include/linux/irq.h | 9 ----- kernel/irq/manage.c | 28 ++++++++++++++++- kernel/irq/proc.c | 59 +++++++++++++++++++++++++++++++++-- 7 files changed, 134 insertions(+), 38 deletions(-) Merging safe-poison-pointers/auto-safe-poison-pointers-next $ git merge safe-poison-pointers/auto-safe-poison-pointers-next Auto-merged arch/x86/Kconfig Merge made by recursive. arch/x86/Kconfig | 5 +++++ include/linux/poison.h | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) Merging sched/auto-sched-next $ git merge sched/auto-sched-next Auto-merged include/linux/sched.h Auto-merged init/main.c Auto-merged kernel/Makefile CONFLICT (content): Merge conflict in kernel/Makefile Auto-merged kernel/cpu.c Auto-merged kernel/cpuset.c Auto-merged kernel/rcuclassic.c Auto-merged kernel/rcupreempt.c Auto-merged kernel/sched.c Auto-merged kernel/sched_fair.c Auto-merged kernel/sched_rt.c Auto-merged lib/Kconfig.debug Resolved 'kernel/Makefile' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. Documentation/RCU/NMI-RCU.txt | 3 + Documentation/RCU/RTFP.txt | 108 ++++++ Documentation/RCU/checklist.txt | 89 ++++-- Documentation/RCU/whatisRCU.txt | 58 +++- Documentation/scheduler/sched-domains.txt | 7 +- arch/ia64/sn/kernel/irq.c | 1 + crypto/async_tx/async_tx.c | 1 + drivers/infiniband/hw/ipath/ipath_verbs.c | 1 + drivers/infiniband/hw/ipath/ipath_verbs_mcast.c | 3 +- drivers/net/macvlan.c | 2 +- include/linux/dcache.h | 1 + include/linux/list.h | 367 -------------------- include/linux/rcuclassic.h | 3 + include/linux/rculist.h | 373 ++++++++++++++++++++ include/linux/rcupdate.h | 26 ++- include/linux/rcupreempt.h | 42 ++- include/linux/sched.h | 39 +-- init/main.c | 1 + kernel/Makefile | 5 +- kernel/cpu.c | 24 ++ kernel/cpuset.c | 20 +- kernel/kthread.c | 1 + kernel/pid.c | 1 + kernel/rcuclassic.c | 30 ++- kernel/rcupdate.c | 71 +++-- kernel/rcupreempt.c | 418 ++++++++++++++++++++--- kernel/rcupreempt_trace.c | 1 - kernel/rcutorture.c | 34 ++- kernel/sched.c | 266 +++++++++------ kernel/sched_cpupri.c | 174 ++++++++++ kernel/sched_cpupri.h | 36 ++ kernel/sched_fair.c | 19 +- kernel/sched_features.h | 2 - kernel/sched_rt.c | 305 ++++++++++++----- lib/Kconfig.debug | 3 +- lib/textsearch.c | 1 + net/802/psnap.c | 1 + net/8021q/vlan.c | 1 + net/bridge/br_fdb.c | 1 + net/bridge/br_stp.c | 1 + net/netfilter/nf_conntrack_helper.c | 1 + net/netfilter/nf_conntrack_netlink.c | 1 + net/netlabel/netlabel_domainhash.c | 3 +- 43 files changed, 1803 insertions(+), 742 deletions(-) create mode 100644 include/linux/rculist.h create mode 100644 kernel/sched_cpupri.c create mode 100644 kernel/sched_cpupri.h $ git am -3 ../patches/0001-ftrace-fix-rculist-split-fallout.patch Applying ftrace: fix rculist split fallout Merging stackprotector/auto-stackprotector-next $ git merge stackprotector/auto-stackprotector-next Auto-merged arch/x86/Kconfig Auto-merged arch/x86/Kconfig.debug Auto-merged arch/x86/kernel/Makefile Auto-merged arch/x86/kernel/process_64.c Auto-merged arch/x86/mm/fault.c Auto-merged include/linux/sched.h Auto-merged init/main.c Auto-merged kernel/fork.c Auto-merged kernel/sched.c Merge made by recursive. arch/x86/Kconfig | 23 +++++------ arch/x86/Kconfig.debug | 1 + arch/x86/Makefile | 2 +- arch/x86/kernel/Makefile | 1 + arch/x86/kernel/process_64.c | 13 ++++++- arch/x86/mm/fault.c | 7 +++ include/asm-x86/pda.h | 2 - include/asm-x86/stackprotector.h | 38 +++++++++++++++++++ include/asm-x86/system.h | 6 ++- include/linux/magic.h | 1 + include/linux/sched.h | 16 +++++++- include/linux/stackprotector.h | 16 ++++++++ init/main.c | 7 +++ kernel/exit.c | 5 +-- kernel/fork.c | 5 ++ kernel/panic.c | 77 +++++++++++++++++++++++++++++++++++++- kernel/sched.c | 7 +--- 17 files changed, 196 insertions(+), 31 deletions(-) create mode 100644 include/asm-x86/stackprotector.h create mode 100644 include/linux/stackprotector.h Merging timers/auto-timers-next $ git merge timers/auto-timers-next Auto-merged kernel/hrtimer.c Auto-merged kernel/time/tick-sched.c Merge made by recursive. drivers/char/hpet.c | 63 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/hpet.h | 3 +- kernel/hrtimer.c | 7 +--- kernel/posix-cpu-timers.c | 3 ++ kernel/time/tick-sched.c | 7 +++++ 5 files changed, 77 insertions(+), 6 deletions(-) Merging x86/auto-x86-next $ git merge x86/auto-x86-next Auto-merged Documentation/kernel-parameters.txt Auto-merged arch/x86/Kconfig Auto-merged arch/x86/Kconfig.debug Auto-merged arch/x86/Makefile Auto-merged arch/x86/kernel/Makefile Auto-merged arch/x86/kernel/cpu/intel_cacheinfo.c Auto-merged arch/x86/kernel/entry_32.S Auto-merged arch/x86/kernel/entry_64.S Removed arch/x86/kernel/i8259_64.c Auto-merged arch/x86/kernel/io_apic_64.c Removed arch/x86/kernel/nmi_32.c Auto-merged arch/x86/kernel/pci-dma.c Auto-merged arch/x86/kernel/pci-gart_64.c Auto-merged arch/x86/kernel/process_32.c CONFLICT (content): Merge conflict in arch/x86/kernel/process_32.c Auto-merged arch/x86/kernel/process_64.c CONFLICT (content): Merge conflict in arch/x86/kernel/process_64.c Auto-merged arch/x86/kernel/smpboot.c Auto-merged arch/x86/kernel/traps_32.c Auto-merged arch/x86/kernel/traps_64.c Auto-merged arch/x86/kernel/vmlinux_32.lds.S Auto-merged arch/x86/kernel/vmlinux_64.lds.S Auto-merged arch/x86/kernel/x8664_ksyms_64.c Auto-merged arch/x86/mm/init_32.c Auto-merged arch/x86/mm/init_64.c Auto-merged arch/x86/mm/ioremap.c Auto-merged arch/x86/mm/pageattr.c Removed arch/x86/xen/manage.c Auto-merged arch/x86/xen/smp.c Auto-merged drivers/base/power/trace.c Auto-merged drivers/base/topology.c Auto-merged drivers/char/agp/amd64-agp.c Auto-merged include/asm-generic/vmlinux.lds.h Removed include/asm-x86/current_32.h Removed include/asm-x86/current_64.h Removed include/asm-x86/hw_irq_32.h Removed include/asm-x86/hw_irq_64.h Auto-merged include/asm-x86/ipi.h Removed include/asm-x86/irq_32.h Removed include/asm-x86/irq_64.h Removed include/asm-x86/mach-default/irq_vectors.h Removed include/asm-x86/mach-default/irq_vectors_limits.h Removed include/asm-x86/mach-visws/irq_vectors.h Removed include/asm-x86/mach-voyager/irq_vectors.h Auto-merged include/asm-x86/pda.h Auto-merged include/asm-x86/percpu.h Auto-merged include/asm-x86/system.h Removed include/asm-x86/thread_info_32.h Removed include/asm-x86/thread_info_64.h Auto-merged include/linux/bootmem.h Auto-merged kernel/printk.c Auto-merged kernel/sched.c Auto-merged kernel/time/tick-broadcast.c Resolved 'arch/x86/kernel/process_32.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. Documentation/kernel-parameters.txt | 23 + Documentation/{ => x86}/i386/IO-APIC.txt | 0 Documentation/{ => x86}/i386/boot.txt | 79 +- .../{ => x86}/i386/usb-legacy-support.txt | 0 Documentation/{ => x86}/i386/zero-page.txt | 0 Documentation/{ => x86}/x86_64/00-INDEX | 0 Documentation/{ => x86}/x86_64/boot-options.txt | 0 Documentation/{ => x86}/x86_64/cpu-hotplug-spec | 0 .../{ => x86}/x86_64/fake-numa-for-cpusets | 0 Documentation/{ => x86}/x86_64/kernel-stacks | 0 Documentation/{ => x86}/x86_64/machinecheck | 0 Documentation/{ => x86}/x86_64/mm.txt | 5 +- Documentation/{ => x86}/x86_64/uefi.txt | 0 arch/ia64/Kconfig | 4 + arch/x86/Kconfig | 190 ++- arch/x86/Kconfig.cpu | 4 + arch/x86/Kconfig.debug | 4 +- arch/x86/Makefile | 23 +- arch/x86/boot/compressed/head_64.S | 5 +- arch/x86/boot/compressed/misc.c | 43 +- arch/x86/boot/cpu.c | 2 + arch/x86/boot/main.c | 4 + arch/x86/boot/memory.c | 3 +- arch/x86/boot/video-vga.c | 3 +- arch/x86/configs/i386_defconfig | 1711 ++++++++++++++------ arch/x86/configs/x86_64_defconfig | 1735 ++++++++++++++------ arch/x86/kernel/Makefile | 9 +- arch/x86/kernel/acpi/boot.c | 337 ++++- arch/x86/kernel/acpi/sleep.c | 4 +- arch/x86/kernel/aperture_64.c | 313 +++-- arch/x86/kernel/apic_32.c | 51 +- arch/x86/kernel/apic_64.c | 63 +- arch/x86/kernel/apm_32.c | 25 +- arch/x86/kernel/cpu/Makefile | 4 + arch/x86/kernel/cpu/addon_cpuid_features.c | 17 +- arch/x86/kernel/cpu/amd.c | 45 +- arch/x86/kernel/cpu/amd_64.c | 206 +++ arch/x86/kernel/cpu/bugs.c | 27 +- arch/x86/kernel/{ => cpu}/bugs_64.c | 0 arch/x86/kernel/cpu/centaur_64.c | 31 + arch/x86/kernel/cpu/cpu.h | 5 + arch/x86/kernel/cpu/intel_64.c | 92 + arch/x86/kernel/cpu/intel_cacheinfo.c | 1 + arch/x86/kernel/cpu/mcheck/mce_64.c | 20 +- arch/x86/kernel/cpu/mtrr/generic.c | 38 +- arch/x86/kernel/cpu/mtrr/main.c | 901 ++++++++++- arch/x86/kernel/cpu/mtrr/mtrr.h | 3 + arch/x86/kernel/cpu/perfctr-watchdog.c | 4 +- arch/x86/kernel/e820.c | 967 +++++++++++ arch/x86/kernel/e820_32.c | 566 +------- arch/x86/kernel/e820_64.c | 852 +---------- arch/x86/kernel/early-quirks.c | 13 - arch/x86/kernel/efi.c | 59 +- arch/x86/kernel/efi_64.c | 8 +- arch/x86/kernel/entry_32.S | 2 +- arch/x86/kernel/entry_64.S | 4 - arch/x86/kernel/genapic_64.c | 2 +- arch/x86/kernel/genx2apic_uv_x.c | 141 ++- arch/x86/kernel/head.c | 73 + arch/x86/kernel/head32.c | 27 + arch/x86/kernel/head64.c | 90 +- arch/x86/kernel/head_32.S | 13 +- arch/x86/kernel/head_64.S | 80 +- arch/x86/kernel/hpet.c | 43 +- arch/x86/kernel/{i8259_32.c => i8259.c} | 136 +-- arch/x86/kernel/i8259_64.c | 512 ------ arch/x86/kernel/io_apic_32.c | 605 ++++---- arch/x86/kernel/io_apic_64.c | 204 ++-- arch/x86/kernel/ipi.c | 1 - arch/x86/kernel/irq_32.c | 254 ++-- arch/x86/kernel/irq_64.c | 28 + arch/x86/kernel/irqinit_32.c | 114 ++ arch/x86/kernel/irqinit_64.c | 217 +++ arch/x86/kernel/ldt.c | 6 +- arch/x86/kernel/mmconf-fam10h_64.c | 1 + arch/x86/kernel/mpparse.c | 826 ++++++---- arch/x86/kernel/{nmi_64.c => nmi.c} | 221 ++- arch/x86/kernel/nmi_32.c | 467 ------ arch/x86/kernel/numaq_32.c | 25 +- arch/x86/kernel/paravirt.c | 1 + arch/x86/kernel/pci-dma.c | 13 +- arch/x86/kernel/pci-gart_64.c | 78 +- arch/x86/kernel/process.c | 190 ++- arch/x86/kernel/process_32.c | 66 +- arch/x86/kernel/process_64.c | 36 +- arch/x86/kernel/quirks.c | 58 +- arch/x86/kernel/reboot.c | 18 +- arch/x86/kernel/reboot_fixups_32.c | 4 +- arch/x86/kernel/setup.c | 335 ++++- arch/x86/kernel/setup64.c | 14 +- arch/x86/kernel/setup_32.c | 308 ++--- arch/x86/kernel/setup_64.c | 440 +----- arch/x86/kernel/smpboot.c | 196 +-- arch/x86/kernel/srat_32.c | 43 +- arch/x86/kernel/summit_32.c | 2 + arch/x86/kernel/sys_i386_32.c | 64 +- arch/x86/kernel/time_32.c | 3 +- arch/x86/kernel/trampoline.c | 2 +- arch/x86/kernel/traps_32.c | 10 +- arch/x86/kernel/traps_64.c | 31 +- arch/x86/kernel/tsc_32.c | 24 +- arch/x86/kernel/tsc_64.c | 2 +- arch/x86/kernel/vmiclock_32.c | 3 +- arch/x86/kernel/vmlinux_32.lds.S | 7 - arch/x86/kernel/vmlinux_64.lds.S | 7 - arch/x86/kernel/vsmp_64.c | 3 + arch/x86/kernel/x8664_ksyms_64.c | 5 - arch/x86/lguest/boot.c | 7 +- arch/x86/mach-default/setup.c | 11 +- arch/x86/mach-es7000/Makefile | 1 - arch/x86/mach-es7000/es7000plat.c | 49 +- arch/x86/mach-generic/Makefile | 10 +- arch/x86/mach-generic/bigsmp.c | 4 +- arch/x86/mach-generic/numaq.c | 41 + arch/x86/mach-generic/probe.c | 15 +- arch/x86/mach-visws/mpparse.c | 7 +- arch/x86/mach-visws/setup.c | 6 +- arch/x86/mach-visws/visws_apic.c | 3 +- arch/x86/mach-voyager/setup.c | 19 +- arch/x86/mach-voyager/voyager_smp.c | 14 - arch/x86/mm/discontig_32.c | 238 ++-- arch/x86/mm/dump_pagetables.c | 2 +- arch/x86/mm/init_32.c | 85 +- arch/x86/mm/init_64.c | 31 +- arch/x86/mm/ioremap.c | 14 +- arch/x86/mm/k8topology_64.c | 13 +- arch/x86/mm/numa_64.c | 89 +- arch/x86/mm/pageattr.c | 41 +- arch/x86/mm/pat.c | 83 +- arch/x86/mm/pgtable.c | 2 +- arch/x86/mm/srat_64.c | 5 +- arch/x86/pci/Makefile_32 | 5 +- arch/x86/pci/acpi.c | 18 +- arch/x86/pci/direct.c | 21 +- arch/x86/pci/i386.c | 4 +- arch/x86/pci/irq.c | 261 ++-- arch/x86/pci/k8-bus_64.c | 4 +- arch/x86/pci/mmconfig-shared.c | 2 +- arch/x86/pci/numa.c | 29 +- arch/x86/vdso/vma.c | 2 +- arch/x86/xen/Kconfig | 12 +- arch/x86/xen/Makefile | 2 +- arch/x86/xen/enlighten.c | 166 ++- arch/x86/xen/manage.c | 143 -- arch/x86/xen/mmu.c | 227 +++- arch/x86/xen/mmu.h | 32 +- arch/x86/xen/setup.c | 9 +- arch/x86/xen/smp.c | 8 +- arch/x86/xen/suspend.c | 45 + arch/x86/xen/time.c | 13 + arch/x86/xen/xen-head.S | 9 +- arch/x86/xen/xen-ops.h | 11 + drivers/acpi/Kconfig | 1 - drivers/acpi/numa.c | 4 + drivers/acpi/pci_irq.c | 5 + drivers/base/power/trace.c | 2 +- drivers/base/topology.c | 25 +- drivers/char/agp/amd64-agp.c | 85 +- drivers/char/hvc_xen.c | 61 +- drivers/firmware/dmi_scan.c | 5 + drivers/input/xen-kbdfront.c | 20 +- drivers/lguest/lg.h | 1 - drivers/video/xen-fbfront.c | 211 ++- drivers/xen/Makefile | 2 +- drivers/xen/balloon.c | 10 +- drivers/xen/events.c | 114 ++- drivers/xen/grant-table.c | 4 +- drivers/xen/manage.c | 252 +++ drivers/xen/xenbus/xenbus_comms.c | 23 +- fs/proc/proc_misc.c | 16 + include/asm-generic/vmlinux.lds.h | 14 + include/asm-x86/acpi.h | 1 + include/asm-x86/apic.h | 4 - include/asm-x86/atomic_64.h | 6 - include/asm-x86/bios_ebda.h | 2 + include/asm-x86/bitops.h | 34 +- include/asm-x86/bootparam.h | 4 + include/asm-x86/cpufeature.h | 6 +- include/asm-x86/current.h | 42 +- include/asm-x86/current_32.h | 17 - include/asm-x86/current_64.h | 27 - include/asm-x86/desc.h | 46 +- include/asm-x86/e820.h | 81 +- include/asm-x86/e820_32.h | 24 +- include/asm-x86/e820_64.h | 29 - include/asm-x86/efi.h | 2 +- include/asm-x86/fixmap_32.h | 8 +- include/asm-x86/gart.h | 63 + include/asm-x86/genapic_64.h | 2 + include/asm-x86/hardirq.h | 6 + include/asm-x86/highmem.h | 3 + include/asm-x86/hw_irq.h | 105 ++- include/asm-x86/hw_irq_32.h | 66 - include/asm-x86/hw_irq_64.h | 173 -- include/asm-x86/i8259.h | 2 + include/asm-x86/io.h | 56 + include/asm-x86/io_32.h | 49 - include/asm-x86/io_64.h | 71 - include/asm-x86/io_apic.h | 38 +- include/asm-x86/ipi.h | 1 + include/asm-x86/irq.h | 51 +- include/asm-x86/irq_32.h | 51 - include/asm-x86/irq_64.h | 51 - include/asm-x86/irq_vectors.h | 169 ++ include/asm-x86/mach-default/irq_vectors.h | 96 -- include/asm-x86/mach-default/irq_vectors_limits.h | 16 - include/asm-x86/mach-default/smpboot_hooks.h | 4 +- include/asm-x86/mach-generic/mach_mpparse.h | 7 +- include/asm-x86/mach-numaq/mach_apic.h | 39 +- include/asm-x86/mach-numaq/mach_mpparse.h | 11 +- include/asm-x86/mach-visws/irq_vectors.h | 62 - include/asm-x86/mach-voyager/irq_vectors.h | 79 - include/asm-x86/mmconfig.h | 12 + include/asm-x86/mmzone_32.h | 26 +- include/asm-x86/mpspec.h | 31 +- include/asm-x86/msr-index.h | 4 +- include/asm-x86/nmi.h | 33 +- include/asm-x86/numa_32.h | 1 + include/asm-x86/numa_64.h | 19 +- include/asm-x86/numaq.h | 6 +- include/asm-x86/page.h | 11 +- include/asm-x86/page_32.h | 11 +- include/asm-x86/paravirt.h | 15 + include/asm-x86/pat.h | 8 +- include/asm-x86/pci.h | 2 + include/asm-x86/pda.h | 5 +- include/asm-x86/percpu.h | 46 + include/asm-x86/pgtable.h | 72 +- include/asm-x86/processor-flags.h | 6 + include/asm-x86/proto.h | 2 - include/asm-x86/ptrace.h | 8 +- include/asm-x86/reboot.h | 2 +- include/asm-x86/required-features.h | 6 +- include/asm-x86/resume-trace.h | 2 +- include/asm-x86/seccomp_32.h | 1 + include/asm-x86/segment.h | 23 +- include/asm-x86/setup.h | 11 +- include/asm-x86/smp.h | 17 +- include/asm-x86/srat.h | 12 +- include/asm-x86/string_32.h | 323 +++-- include/asm-x86/system.h | 3 +- include/asm-x86/thread_info.h | 248 +++- include/asm-x86/thread_info_32.h | 205 --- include/asm-x86/thread_info_64.h | 195 --- include/asm-x86/topology.h | 152 +- include/asm-x86/uv/uv_hub.h | 188 ++- include/asm-x86/uv/uv_mmrs.h | 509 ++++++- include/asm-x86/vm86.h | 11 +- include/asm-x86/xen/hypercall.h | 11 +- include/asm-x86/xen/page.h | 29 +- include/linux/acpi.h | 2 +- include/linux/bootmem.h | 2 + include/linux/console.h | 2 + include/linux/efi.h | 4 - include/linux/kernel_stat.h | 2 +- include/linux/mm.h | 7 +- include/linux/page-flags.h | 1 + include/linux/pageblock-flags.h | 8 +- include/linux/resume-trace.h | 2 +- include/xen/events.h | 4 + include/xen/grant_table.h | 3 + include/xen/hvc-console.h | 9 + include/xen/interface/elfnote.h | 20 + include/xen/interface/io/fbif.h | 29 +- include/xen/interface/io/kbdif.h | 2 + include/xen/interface/memory.h | 12 +- include/xen/xen-ops.h | 6 + kernel/printk.c | 3 + kernel/time/tick-broadcast.c | 6 +- mm/page_alloc.c | 80 +- 270 files changed, 12550 insertions(+), 8746 deletions(-) rename Documentation/{ => x86}/i386/IO-APIC.txt (100%) rename Documentation/{ => x86}/i386/boot.txt (96%) rename Documentation/{ => x86}/i386/usb-legacy-support.txt (100%) rename Documentation/{ => x86}/i386/zero-page.txt (100%) rename Documentation/{ => x86}/x86_64/00-INDEX (100%) rename Documentation/{ => x86}/x86_64/boot-options.txt (100%) rename Documentation/{ => x86}/x86_64/cpu-hotplug-spec (100%) rename Documentation/{ => x86}/x86_64/fake-numa-for-cpusets (100%) rename Documentation/{ => x86}/x86_64/kernel-stacks (100%) rename Documentation/{ => x86}/x86_64/machinecheck (100%) rename Documentation/{ => x86}/x86_64/mm.txt (87%) rename Documentation/{ => x86}/x86_64/uefi.txt (100%) create mode 100644 arch/x86/kernel/cpu/amd_64.c rename arch/x86/kernel/{ => cpu}/bugs_64.c (100%) create mode 100644 arch/x86/kernel/cpu/centaur_64.c create mode 100644 arch/x86/kernel/cpu/intel_64.c create mode 100644 arch/x86/kernel/e820.c create mode 100644 arch/x86/kernel/head.c rename arch/x86/kernel/{i8259_32.c => i8259.c} (70%) delete mode 100644 arch/x86/kernel/i8259_64.c create mode 100644 arch/x86/kernel/irqinit_32.c create mode 100644 arch/x86/kernel/irqinit_64.c rename arch/x86/kernel/{nmi_64.c => nmi.c} (68%) delete mode 100644 arch/x86/kernel/nmi_32.c create mode 100644 arch/x86/mach-generic/numaq.c delete mode 100644 arch/x86/xen/manage.c create mode 100644 arch/x86/xen/suspend.c create mode 100644 drivers/xen/manage.c delete mode 100644 include/asm-x86/current_32.h delete mode 100644 include/asm-x86/current_64.h delete mode 100644 include/asm-x86/hw_irq_32.h delete mode 100644 include/asm-x86/hw_irq_64.h delete mode 100644 include/asm-x86/irq_32.h delete mode 100644 include/asm-x86/irq_64.h create mode 100644 include/asm-x86/irq_vectors.h delete mode 100644 include/asm-x86/mach-default/irq_vectors.h delete mode 100644 include/asm-x86/mach-default/irq_vectors_limits.h delete mode 100644 include/asm-x86/mach-visws/irq_vectors.h delete mode 100644 include/asm-x86/mach-voyager/irq_vectors.h create mode 100644 include/asm-x86/mmconfig.h delete mode 100644 include/asm-x86/thread_info_32.h delete mode 100644 include/asm-x86/thread_info_64.h Merging pci/linux-next $ git merge pci/linux-next Auto-merged Documentation/kernel-parameters.txt Auto-merged MAINTAINERS Auto-merged arch/x86/kernel/acpi/sleep.c Auto-merged arch/x86/kernel/apm_32.c Auto-merged arch/x86/kernel/early-quirks.c Auto-merged arch/x86/kernel/setup_64.c Auto-merged arch/x86/pci/common.c Auto-merged arch/x86/pci/irq.c CONFLICT (content): Merge conflict in arch/x86/pci/irq.c Auto-merged drivers/acpi/Kconfig Auto-merged drivers/base/power/trace.c Auto-merged drivers/pci/hotplug/acpiphp.h Auto-merged drivers/pci/pci-driver.c Auto-merged include/asm-generic/vmlinux.lds.h Auto-merged include/linux/acpi.h Auto-merged include/linux/device.h CONFLICT (content): Merge conflict in include/linux/device.h Auto-merged include/linux/pci.h Auto-merged lib/kobject.c Resolved 'arch/x86/pci/irq.c' using previous resolution. Resolved 'include/linux/device.h' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. Documentation/kernel-parameters.txt | 9 +- MAINTAINERS | 12 +- arch/x86/kernel/acpi/sleep.c | 2 + arch/x86/kernel/apm_32.c | 8 +- arch/x86/kernel/early-quirks.c | 26 +- arch/x86/kernel/setup_64.c | 5 + arch/x86/pci/common.c | 26 ++ arch/x86/pci/early.c | 60 +++- arch/x86/pci/irq.c | 258 ++++++++---- arch/x86/pci/pci.h | 1 + drivers/acpi/Kconfig | 9 + drivers/acpi/Makefile | 1 + drivers/acpi/pci_slot.c | 368 +++++++++++++++++ drivers/acpi/sleep/main.c | 303 ++++++++------- drivers/base/platform.c | 296 +++++++++++++- drivers/base/power/main.c | 675 ++++++++++++++++++++++++------- drivers/base/power/power.h | 2 +- drivers/base/power/trace.c | 4 +- drivers/pci/Makefile | 2 +- drivers/pci/hotplug/acpi_pcihp.c | 85 ++++- drivers/pci/hotplug/acpiphp.h | 1 - drivers/pci/hotplug/acpiphp_core.c | 25 +- drivers/pci/hotplug/acpiphp_glue.c | 23 +- drivers/pci/hotplug/acpiphp_ibm.c | 6 +- drivers/pci/hotplug/cpci_hotplug_core.c | 2 +- drivers/pci/hotplug/cpqphp_core.c | 4 +- drivers/pci/hotplug/fakephp.c | 86 ++--- drivers/pci/hotplug/ibmphp_ebda.c | 3 +- drivers/pci/hotplug/pci_hotplug_core.c | 274 ++++++-------- drivers/pci/hotplug/pciehp.h | 9 +- drivers/pci/hotplug/pciehp_core.c | 45 +-- drivers/pci/hotplug/pciehp_hpc.c | 104 +----- drivers/pci/hotplug/rpadlpar_sysfs.c | 5 +- drivers/pci/hotplug/rpaphp_slot.c | 44 +-- drivers/pci/hotplug/sgi_hotplug.c | 12 +- drivers/pci/hotplug/shpchp.h | 14 +- drivers/pci/hotplug/shpchp_core.c | 37 +-- drivers/pci/hotplug/shpchp_hpc.c | 1 - drivers/pci/intel-iommu.c | 1 - drivers/pci/msi.c | 12 +- drivers/pci/pci-acpi.c | 222 ++++------- drivers/pci/pci-driver.c | 388 ++++++++++++++++-- drivers/pci/pci.c | 6 +- drivers/pci/pci.h | 16 +- drivers/pci/pcie/aer/aerdrv.c | 1 + drivers/pci/pcie/portdrv_bus.c | 1 + drivers/pci/probe.c | 45 ++ drivers/pci/proc.c | 4 +- drivers/pci/quirks.c | 134 +++++-- drivers/pci/slot.c | 233 +++++++++++ drivers/pnp/pnpacpi/core.c | 4 +- include/acpi/acpi_bus.h | 4 +- include/asm-generic/vmlinux.lds.h | 6 + include/asm-x86/pci-direct.h | 4 + include/linux/acpi.h | 3 + include/linux/device.h | 8 + include/linux/pci.h | 36 ++- include/linux/pci_hotplug.h | 14 +- include/linux/platform_device.h | 1 + include/linux/pm.h | 314 +++++++++++++-- include/linux/suspend.h | 14 +- kernel/power/disk.c | 50 ++- kernel/power/main.c | 16 +- lib/kobject.c | 1 + 64 files changed, 3218 insertions(+), 1167 deletions(-) create mode 100644 drivers/acpi/pci_slot.c create mode 100644 drivers/pci/slot.c Merging quilt/device-mapper $ git merge quilt/device-mapper Already up-to-date. Merging hid/mm $ git merge hid/mm Auto-merged drivers/hid/hidraw.c Merge made by recursive. drivers/hid/hid-core.c | 10 ++++---- drivers/hid/hidraw.c | 47 ++++++++++++++++++++------------------ drivers/hid/usbhid/hid-quirks.c | 18 ++++++++++++++- drivers/hid/usbhid/hiddev.c | 14 ++++++++--- drivers/hid/usbhid/usbkbd.c | 2 +- include/linux/hid.h | 2 +- 6 files changed, 59 insertions(+), 34 deletions(-) Merging quilt/i2c $ git merge quilt/i2c Removed Documentation/i2c/busses/i2c-i810 Removed Documentation/i2c/busses/i2c-prosavage Removed Documentation/i2c/busses/i2c-savage4 Auto-merged MAINTAINERS Removed drivers/i2c/busses/i2c-i810.c Removed drivers/i2c/busses/i2c-prosavage.c Removed drivers/i2c/busses/i2c-savage4.c Auto-merged drivers/i2c/i2c-core.c CONFLICT (content): Merge conflict in drivers/i2c/i2c-core.c Auto-merged drivers/i2c/i2c-dev.c Resolved 'drivers/i2c/i2c-core.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. Documentation/feature-removal-schedule.txt | 7 - Documentation/i2c/busses/i2c-i810 | 47 -- Documentation/i2c/busses/i2c-prosavage | 23 - Documentation/i2c/busses/i2c-savage4 | 26 - Documentation/i2c/chips/max6875 | 2 +- Documentation/i2c/chips/pca9539 | 10 +- Documentation/i2c/chips/pcf8574 | 12 +- Documentation/i2c/chips/pcf8575 | 9 +- Documentation/i2c/fault-codes | 127 +++++ Documentation/i2c/smbus-protocol | 4 +- Documentation/i2c/writing-clients | 69 ++- MAINTAINERS | 7 + arch/arm/mach-omap1/board-h3.c | 4 + arch/arm/mach-omap2/board-h4.c | 11 + drivers/hwmon/adm1025.c | 100 ++-- drivers/hwmon/f75375s.c | 89 +--- drivers/hwmon/lm83.c | 104 ++-- drivers/hwmon/lm90.c | 115 +++-- drivers/i2c/algos/i2c-algo-bit.c | 4 +- drivers/i2c/algos/i2c-algo-pca.c | 2 +- drivers/i2c/algos/i2c-algo-pcf.c | 48 ++- drivers/i2c/busses/Kconfig | 524 ++++++++++---------- drivers/i2c/busses/Makefile | 43 +- drivers/i2c/busses/i2c-ali1535.c | 38 +- drivers/i2c/busses/i2c-ali1563.c | 38 +- drivers/i2c/busses/i2c-ali15x3.c | 32 +- drivers/i2c/busses/i2c-amd756-s4882.c | 4 +- drivers/i2c/busses/i2c-amd756.c | 35 +- drivers/i2c/busses/i2c-amd8111.c | 54 ++- drivers/i2c/busses/i2c-cpm.c | 745 ++++++++++++++++++++++++++++ drivers/i2c/busses/i2c-davinci.c | 89 +++- drivers/i2c/busses/i2c-elektor.c | 4 +- drivers/i2c/busses/i2c-gpio.c | 2 +- drivers/i2c/busses/i2c-hydra.c | 3 - drivers/i2c/busses/i2c-i801.c | 284 +++++------ drivers/i2c/busses/i2c-i810.c | 260 ---------- drivers/i2c/busses/i2c-ibm_iic.c | 189 +------- drivers/i2c/busses/i2c-iop3xx.c | 2 +- drivers/i2c/busses/i2c-isch.c | 339 +++++++++++++ drivers/i2c/busses/i2c-mpc.c | 2 +- drivers/i2c/busses/i2c-mv64xxx.c | 2 +- drivers/i2c/busses/i2c-nforce2-s4985.c | 257 ++++++++++ drivers/i2c/busses/i2c-nforce2.c | 49 ++- drivers/i2c/busses/i2c-ocores.c | 2 +- drivers/i2c/busses/i2c-pasemi.c | 2 +- drivers/i2c/busses/i2c-pca-platform.c | 2 +- drivers/i2c/busses/i2c-piix4.c | 73 ++-- drivers/i2c/busses/i2c-pmcmsp.c | 2 +- drivers/i2c/busses/i2c-prosavage.c | 325 ------------ drivers/i2c/busses/i2c-pxa.c | 2 +- drivers/i2c/busses/i2c-s3c2410.c | 2 +- drivers/i2c/busses/i2c-savage4.c | 185 ------- drivers/i2c/busses/i2c-sibyte.c | 4 +- drivers/i2c/busses/i2c-sis5595.c | 29 +- drivers/i2c/busses/i2c-sis630.c | 59 ++- drivers/i2c/busses/i2c-sis96x.c | 37 +- drivers/i2c/busses/i2c-stub.c | 6 +- drivers/i2c/busses/i2c-taos-evm.c | 5 +- drivers/i2c/busses/i2c-via.c | 5 +- drivers/i2c/busses/i2c-viapro.c | 31 +- drivers/i2c/busses/i2c-voodoo3.c | 2 - drivers/i2c/busses/scx200_acb.c | 2 +- drivers/i2c/chips/Kconfig | 17 +- drivers/i2c/chips/eeprom.c | 127 +++--- drivers/i2c/chips/isp1301_omap.c | 141 ++---- drivers/i2c/chips/max6875.c | 112 ++--- drivers/i2c/chips/pca9539.c | 100 ++--- drivers/i2c/chips/pcf8574.c | 106 ++--- drivers/i2c/chips/pcf8575.c | 84 ++-- drivers/i2c/chips/pcf8591.c | 102 ++--- drivers/i2c/i2c-core.c | 525 ++++++++++++++++---- drivers/i2c/i2c-dev.c | 5 +- drivers/video/fb_ddc.c | 1 + drivers/video/intelfb/intelfb_i2c.c | 12 +- drivers/video/matrox/i2c-matroxfb.c | 41 +- drivers/video/matrox/matroxfb_maven.c | 97 ++--- drivers/w1/masters/ds2482.c | 104 ++--- include/linux/i2c-algo-pcf.h | 8 +- include/linux/i2c-id.h | 3 - include/linux/i2c.h | 44 ++- 80 files changed, 3462 insertions(+), 2757 deletions(-) delete mode 100644 Documentation/i2c/busses/i2c-i810 delete mode 100644 Documentation/i2c/busses/i2c-prosavage delete mode 100644 Documentation/i2c/busses/i2c-savage4 create mode 100644 Documentation/i2c/fault-codes create mode 100644 drivers/i2c/busses/i2c-cpm.c delete mode 100644 drivers/i2c/busses/i2c-i810.c create mode 100644 drivers/i2c/busses/i2c-isch.c create mode 100644 drivers/i2c/busses/i2c-nforce2-s4985.c delete mode 100644 drivers/i2c/busses/i2c-prosavage.c delete mode 100644 drivers/i2c/busses/i2c-savage4.c Merging quilt/kernel-doc $ git merge quilt/kernel-doc Merge made by recursive. Documentation/00-INDEX | 2 -- Documentation/early-userspace/00-INDEX | 8 ++++++++ Documentation/{ => early-userspace}/initrd.txt | 6 +++--- 3 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 Documentation/early-userspace/00-INDEX rename Documentation/{ => early-userspace}/initrd.txt (99%) Merging avr32/avr32-arch $ git merge avr32/avr32-arch Merge made by recursive. arch/avr32/boards/atngw100/setup.c | 29 +++++ arch/avr32/boards/atstk1000/atstk1002.c | 8 +- arch/avr32/boards/atstk1000/atstk1003.c | 7 + arch/avr32/boards/atstk1000/atstk1004.c | 9 ++- arch/avr32/kernel/signal.c | 3 + arch/avr32/lib/io-readsb.S | 2 +- arch/avr32/mach-at32ap/at32ap700x.c | 191 ++++++++++++++++++++++++------- arch/avr32/mach-at32ap/pio.c | 2 + arch/avr32/mm/init.c | 2 + include/asm-avr32/arch-at32ap/board.h | 10 ++- include/asm-avr32/pci.h | 2 + 11 files changed, 221 insertions(+), 44 deletions(-) Merging v4l-dvb/stable $ git merge v4l-dvb/stable Merge made by recursive. Documentation/video4linux/CARDLIST.cx23885 | 1 + Documentation/video4linux/CARDLIST.em28xx | 4 +- Documentation/video4linux/CARDLIST.saa7134 | 4 +- drivers/media/common/tuners/tda18271-maps.c | 2 +- drivers/media/common/tuners/tuner-i2c.h | 8 + drivers/media/dvb/dvb-usb/Kconfig | 9 + drivers/media/dvb/dvb-usb/Makefile | 3 + drivers/media/dvb/dvb-usb/anysee.c | 555 ++++++++ drivers/media/dvb/dvb-usb/anysee.h | 304 ++++ drivers/media/dvb/dvb-usb/au6610.c | 83 +- drivers/media/dvb/dvb-usb/au6610.h | 22 +- drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 2 + drivers/media/dvb/dvb-usb/gl861.c | 65 +- drivers/media/dvb/dvb-usb/gl861.h | 2 +- drivers/media/dvb/frontends/Kconfig | 14 + drivers/media/dvb/frontends/Makefile | 1 + drivers/media/dvb/frontends/au8522.c | 1 - drivers/media/dvb/frontends/drx397xD.c | 1504 ++++++++++++++++++++ drivers/media/dvb/frontends/drx397xD.h | 130 ++ drivers/media/dvb/frontends/drx397xD_fw.h | 40 + drivers/media/dvb/frontends/dvb-pll.c | 47 + drivers/media/dvb/frontends/dvb-pll.h | 1 + drivers/media/dvb/frontends/s5h1409.c | 1 - drivers/media/dvb/frontends/s5h1411.c | 1 - drivers/media/dvb/frontends/tda10023.c | 193 ++-- drivers/media/dvb/frontends/tda1002x.h | 31 +- drivers/media/dvb/ttpci/Kconfig | 1 + drivers/media/dvb/ttpci/budget-av.c | 12 +- drivers/media/radio/radio-si470x.c | 483 +++++-- drivers/media/video/bt8xx/bttv-driver.c | 44 +- drivers/media/video/bt8xx/bttv-vbi.c | 6 +- drivers/media/video/bt8xx/bttvp.h | 6 +- drivers/media/video/cafe_ccic.c | 18 +- drivers/media/video/compat_ioctl32.c | 1 + drivers/media/video/cx18/cx18-av-core.c | 2 +- drivers/media/video/cx18/cx18-av-core.h | 6 +- drivers/media/video/cx18/cx18-cards.c | 61 +- drivers/media/video/cx18/cx18-cards.h | 40 - drivers/media/video/cx18/cx18-driver.c | 2 +- drivers/media/video/cx23885/cx23885-cards.c | 13 + drivers/media/video/cx23885/cx23885-dvb.c | 27 + drivers/media/video/cx23885/cx23885-video.c | 24 +- drivers/media/video/cx23885/cx23885.h | 1 + drivers/media/video/cx25840/cx25840-core.c | 2 +- drivers/media/video/cx88/cx88-blackbird.c | 16 +- drivers/media/video/cx88/cx88-video.c | 24 +- drivers/media/video/em28xx/em28xx-audio.c | 12 + drivers/media/video/em28xx/em28xx-cards.c | 60 +- drivers/media/video/em28xx/em28xx-dvb.c | 33 + drivers/media/video/em28xx/em28xx-reg.h | 1 + drivers/media/video/em28xx/em28xx-video.c | 54 +- drivers/media/video/em28xx/em28xx.h | 2 + drivers/media/video/ivtv/ivtv-cards.c | 41 +- drivers/media/video/ivtv/ivtv-cards.h | 3 +- drivers/media/video/ivtv/ivtv-driver.c | 3 +- drivers/media/video/ivtv/ivtv-gpio.c | 11 +- drivers/media/video/ivtv/ivtvfb.c | 82 ++ drivers/media/video/meye.c | 18 +- drivers/media/video/pvrusb2/pvrusb2-audio.c | 1 - drivers/media/video/pvrusb2/pvrusb2-audio.h | 1 - drivers/media/video/pvrusb2/pvrusb2-context.c | 1 - drivers/media/video/pvrusb2/pvrusb2-context.h | 1 - drivers/media/video/pvrusb2/pvrusb2-ctrl.c | 1 - drivers/media/video/pvrusb2/pvrusb2-ctrl.h | 1 - drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | 1 - drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.h | 1 - drivers/media/video/pvrusb2/pvrusb2-debug.h | 1 - drivers/media/video/pvrusb2/pvrusb2-debugifc.c | 1 - drivers/media/video/pvrusb2/pvrusb2-debugifc.h | 1 - drivers/media/video/pvrusb2/pvrusb2-devattr.c | 11 +- drivers/media/video/pvrusb2/pvrusb2-devattr.h | 1 - drivers/media/video/pvrusb2/pvrusb2-eeprom.c | 1 - drivers/media/video/pvrusb2/pvrusb2-eeprom.h | 1 - drivers/media/video/pvrusb2/pvrusb2-encoder.c | 1 - drivers/media/video/pvrusb2/pvrusb2-encoder.h | 1 - drivers/media/video/pvrusb2/pvrusb2-fx2-cmd.h | 1 - drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 1 - drivers/media/video/pvrusb2/pvrusb2-hdw.c | 46 +- drivers/media/video/pvrusb2/pvrusb2-hdw.h | 1 - .../media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c | 1 - drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c | 1 - drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h | 1 - drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 1 - drivers/media/video/pvrusb2/pvrusb2-i2c-core.h | 1 - drivers/media/video/pvrusb2/pvrusb2-io.c | 1 - drivers/media/video/pvrusb2/pvrusb2-io.h | 1 - drivers/media/video/pvrusb2/pvrusb2-ioread.c | 1 - drivers/media/video/pvrusb2/pvrusb2-ioread.h | 1 - drivers/media/video/pvrusb2/pvrusb2-main.c | 1 - drivers/media/video/pvrusb2/pvrusb2-std.c | 1 - drivers/media/video/pvrusb2/pvrusb2-std.h | 1 - drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 461 ++----- drivers/media/video/pvrusb2/pvrusb2-sysfs.h | 1 - drivers/media/video/pvrusb2/pvrusb2-tuner.c | 1 - drivers/media/video/pvrusb2/pvrusb2-tuner.h | 1 - drivers/media/video/pvrusb2/pvrusb2-util.h | 1 - drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 1 - drivers/media/video/pvrusb2/pvrusb2-v4l2.h | 1 - drivers/media/video/pvrusb2/pvrusb2-video-v4l.c | 1 - drivers/media/video/pvrusb2/pvrusb2-video-v4l.h | 1 - drivers/media/video/pvrusb2/pvrusb2-wm8775.c | 1 - drivers/media/video/pvrusb2/pvrusb2-wm8775.h | 1 - drivers/media/video/pvrusb2/pvrusb2.h | 1 - drivers/media/video/saa7134/saa7134-cards.c | 95 ++- drivers/media/video/saa7134/saa7134-dvb.c | 3 +- drivers/media/video/saa7134/saa7134-empress.c | 45 +- drivers/media/video/saa7134/saa7134-input.c | 2 + drivers/media/video/saa7134/saa7134-reg.h | 1 + drivers/media/video/saa7134/saa7134-tvaudio.c | 33 +- drivers/media/video/saa7134/saa7134-video.c | 52 +- drivers/media/video/saa7134/saa7134.h | 3 +- drivers/media/video/soc_camera.c | 18 +- drivers/media/video/stk-webcam.c | 18 +- drivers/media/video/tcm825x.c | 6 + drivers/media/video/tcm825x.h | 1 + drivers/media/video/usbvision/usbvision-video.c | 18 +- drivers/media/video/videodev.c | 293 +++-- drivers/media/video/vivi.c | 37 +- drivers/media/video/zr364xx.c | 16 +- include/linux/videodev2.h | 10 + include/media/cx25840.h | 6 +- include/media/v4l2-dev.h | 73 +- 122 files changed, 4238 insertions(+), 1189 deletions(-) create mode 100644 drivers/media/dvb/dvb-usb/anysee.c create mode 100644 drivers/media/dvb/dvb-usb/anysee.h create mode 100644 drivers/media/dvb/frontends/drx397xD.c create mode 100644 drivers/media/dvb/frontends/drx397xD.h create mode 100644 drivers/media/dvb/frontends/drx397xD_fw.h Merging s390/features $ git merge s390/features Removed arch/s390/kernel/binfmt_elf32.c Auto-merged drivers/s390/block/dasd.c CONFLICT (content): Merge conflict in drivers/s390/block/dasd.c Auto-merged drivers/s390/block/dasd_3990_erp.c Auto-merged drivers/s390/block/dasd_eckd.c CONFLICT (content): Merge conflict in drivers/s390/block/dasd_eckd.c Auto-merged drivers/s390/block/dasd_fba.c CONFLICT (content): Merge conflict in drivers/s390/block/dasd_fba.c Auto-merged drivers/s390/char/raw3270.c Auto-merged drivers/s390/char/tape_3590.c Auto-merged drivers/s390/char/tape_core.c CONFLICT (content): Merge conflict in drivers/s390/char/tape_core.c Auto-merged drivers/s390/char/vmur.c Auto-merged drivers/s390/cio/chp.c Auto-merged drivers/s390/cio/cio.c Auto-merged drivers/s390/cio/cio.h Auto-merged drivers/s390/cio/css.c Auto-merged drivers/s390/cio/device.c Auto-merged drivers/s390/cio/device_fsm.c CONFLICT (content): Merge conflict in drivers/s390/cio/device_fsm.c Auto-merged drivers/s390/cio/device_ops.c Auto-merged drivers/s390/cio/qdio.c Auto-merged drivers/s390/net/claw.c CONFLICT (content): Merge conflict in drivers/s390/net/claw.c Auto-merged drivers/s390/net/ctcm_main.c CONFLICT (content): Merge conflict in drivers/s390/net/ctcm_main.c Auto-merged drivers/s390/net/lcs.c CONFLICT (content): Merge conflict in drivers/s390/net/lcs.c Auto-merged drivers/s390/net/qeth_core_main.c Auto-merged scripts/mod/file2alias.c Resolved 'drivers/s390/block/dasd.c' using previous resolution. Resolved 'drivers/s390/block/dasd_eckd.c' using previous resolution. Resolved 'drivers/s390/block/dasd_fba.c' using previous resolution. Resolved 'drivers/s390/char/tape_core.c' using previous resolution. Resolved 'drivers/s390/cio/device_fsm.c' using previous resolution. Resolved 'drivers/s390/net/claw.c' using previous resolution. Resolved 'drivers/s390/net/ctcm_main.c' using previous resolution. Resolved 'drivers/s390/net/lcs.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-bus-css | 35 ++ arch/s390/Kconfig | 1 + arch/s390/kernel/Makefile | 7 +- arch/s390/kernel/binfmt_elf32.c | 214 -------- arch/s390/kernel/compat_ptrace.h | 4 +- arch/s390/kernel/early.c | 18 + arch/s390/kernel/process.c | 32 +-- arch/s390/kernel/ptrace.c | 363 ++++++++++++-- arch/s390/kernel/time.c | 634 ++++++++++++++++++------ arch/s390/kernel/vtime.c | 25 +- drivers/s390/block/dasd.c | 18 +- drivers/s390/block/dasd_3990_erp.c | 15 +- drivers/s390/block/dasd_eckd.c | 12 +- drivers/s390/block/dasd_fba.c | 12 +- drivers/s390/char/con3215.c | 6 +- drivers/s390/char/con3270.c | 6 +- drivers/s390/char/fs3270.c | 6 +- drivers/s390/char/raw3270.c | 16 +- drivers/s390/char/sclp_cpi_sys.c | 45 ++- drivers/s390/char/sclp_vt220.c | 55 +- drivers/s390/char/tape_34xx.c | 12 +- drivers/s390/char/tape_3590.c | 21 +- drivers/s390/char/tape_core.c | 15 +- drivers/s390/char/tty3270.c | 6 +- drivers/s390/char/vmur.c | 5 +- drivers/s390/cio/Makefile | 3 +- drivers/s390/cio/airq.c | 45 +- drivers/s390/cio/chp.c | 96 +++- drivers/s390/cio/chp.h | 15 +- drivers/s390/cio/chsc.c | 331 ++++-------- drivers/s390/cio/chsc.h | 7 +- drivers/s390/cio/cio.c | 270 ++++++---- drivers/s390/cio/cio.h | 12 +- drivers/s390/cio/cmf.c | 11 +- drivers/s390/cio/css.c | 280 +++++------ drivers/s390/cio/css.h | 46 +- drivers/s390/cio/device.c | 458 +++++++++++++---- drivers/s390/cio/device.h | 7 +- drivers/s390/cio/device_fsm.c | 210 +++----- drivers/s390/cio/device_id.c | 16 +- drivers/s390/cio/device_ops.c | 134 +++++- drivers/s390/cio/device_pgid.c | 26 +- drivers/s390/cio/device_status.c | 133 +++--- drivers/s390/cio/fcx.c | 350 +++++++++++++ drivers/s390/cio/io_sch.h | 46 ++- drivers/s390/cio/isc.c | 68 +++ drivers/s390/cio/itcw.c | 327 ++++++++++++ drivers/s390/cio/qdio.c | 15 +- drivers/s390/cio/qdio.h | 3 +- drivers/s390/cio/scsw.c | 843 +++++++++++++++++++++++++++++++ drivers/s390/net/claw.c | 77 ++-- drivers/s390/net/ctcm_fsms.c | 12 +- drivers/s390/net/ctcm_main.c | 28 +- drivers/s390/net/lcs.c | 37 +- drivers/s390/net/qeth_core_main.c | 12 +- drivers/s390/s390mach.c | 106 ++-- drivers/s390/s390mach.h | 10 + include/asm-s390/airq.h | 4 +- include/asm-s390/ccwdev.h | 12 + include/asm-s390/cio.h | 114 ++++- include/asm-s390/elf.h | 51 +-- include/asm-s390/etr.h | 45 ++- include/asm-s390/fcx.h | 311 ++++++++++++ include/asm-s390/isc.h | 24 + include/asm-s390/itcw.h | 30 ++ include/asm-s390/processor.h | 24 +- include/asm-s390/ptrace.h | 15 + include/asm-s390/timer.h | 12 + include/linux/mod_devicetable.h | 9 + scripts/mod/file2alias.c | 12 + 70 files changed, 4593 insertions(+), 1687 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-css delete mode 100644 arch/s390/kernel/binfmt_elf32.c create mode 100644 drivers/s390/cio/fcx.c create mode 100644 drivers/s390/cio/isc.c create mode 100644 drivers/s390/cio/itcw.c create mode 100644 drivers/s390/cio/scsw.c create mode 100644 include/asm-s390/fcx.h create mode 100644 include/asm-s390/isc.h create mode 100644 include/asm-s390/itcw.h Merging sh/master $ git merge sh/master Merge made by recursive. arch/sh/Kconfig | 18 + arch/sh/Makefile | 3 + arch/sh/boards/renesas/ap325rxa/Makefile | 1 + arch/sh/boards/renesas/ap325rxa/setup.c | 108 +++ arch/sh/boards/renesas/rsk7203/Makefile | 1 + arch/sh/boards/renesas/rsk7203/setup.c | 126 ++++ arch/sh/boards/renesas/sh7763rdp/Makefile | 1 + arch/sh/boards/renesas/sh7763rdp/irq.c | 45 ++ arch/sh/boards/renesas/sh7763rdp/setup.c | 128 ++++ arch/sh/configs/ap325rxa_defconfig | 947 ++++++++++++++++++++++++++ arch/sh/configs/sh7763rdp_defconfig | 1052 +++++++++++++++++++++++++++++ arch/sh/kernel/Makefile_32 | 2 +- arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 10 +- arch/sh/kernel/ptrace_32.c | 23 + arch/sh/kernel/signal_32.c | 25 +- arch/sh/mm/Kconfig | 12 +- arch/sh/tools/mach-types | 3 + drivers/serial/sh-sci.c | 17 +- drivers/serial/sh-sci.h | 38 +- fs/Kconfig.binfmt | 2 +- fs/binfmt_elf_fdpic.c | 45 +- include/asm-sh/elf.h | 53 ++- include/asm-sh/mmu.h | 4 + include/asm-sh/page.h | 2 + include/asm-sh/pgtable_32.h | 4 +- include/asm-sh/processor.h | 1 + include/asm-sh/processor_32.h | 4 - include/asm-sh/processor_64.h | 4 - include/asm-sh/ptrace.h | 5 + include/asm-sh/segment.h | 30 +- include/asm-sh/sh7763rdp.h | 54 ++ include/asm-sh/thread_info.h | 2 + include/asm-sh/uaccess.h | 222 ++++++ include/asm-sh/uaccess_32.h | 341 ++-------- include/asm-sh/uaccess_64.h | 206 ------ 35 files changed, 2990 insertions(+), 549 deletions(-) create mode 100644 arch/sh/boards/renesas/ap325rxa/Makefile create mode 100644 arch/sh/boards/renesas/ap325rxa/setup.c create mode 100644 arch/sh/boards/renesas/rsk7203/Makefile create mode 100644 arch/sh/boards/renesas/rsk7203/setup.c create mode 100644 arch/sh/boards/renesas/sh7763rdp/Makefile create mode 100644 arch/sh/boards/renesas/sh7763rdp/irq.c create mode 100644 arch/sh/boards/renesas/sh7763rdp/setup.c create mode 100644 arch/sh/configs/ap325rxa_defconfig create mode 100644 arch/sh/configs/sh7763rdp_defconfig create mode 100644 include/asm-sh/sh7763rdp.h Merging jfs/next $ git merge jfs/next Merge made by recursive. fs/jfs/jfs_debug.c | 62 ++++++++++++++++++++------------------------ fs/jfs/jfs_debug.h | 10 +++--- fs/jfs/jfs_dtree.h | 3 -- fs/jfs/jfs_imap.c | 2 +- fs/jfs/jfs_logmgr.c | 35 +++++++++++------------- fs/jfs/jfs_metapage.c | 36 ++++++++++++------------- fs/jfs/jfs_txnmgr.c | 68 ++++++++++++++++++++++-------------------------- fs/jfs/jfs_xtree.c | 36 ++++++++++++------------- fs/jfs/namei.c | 2 +- fs/jfs/super.c | 7 ++--- 10 files changed, 119 insertions(+), 142 deletions(-) Merging kbuild/master $ git merge kbuild/master Auto-merged Makefile Removed scripts/hdrcheck.sh Merge made by recursive. Makefile | 48 ++++++---- include/Kbuild | 4 +- scripts/Makefile.headersinst | 230 ++++++++++++------------------------------ scripts/hdrcheck.sh | 10 -- scripts/headers_check.pl | 56 ++++++++++ scripts/headers_install.pl | 45 ++++++++ 6 files changed, 200 insertions(+), 193 deletions(-) delete mode 100755 scripts/hdrcheck.sh create mode 100644 scripts/headers_check.pl create mode 100644 scripts/headers_install.pl Merging quilt/ide $ git merge quilt/ide Auto-merged Documentation/kernel-parameters.txt Auto-merged block/blk-core.c Removed drivers/ide/arm/bast-ide.c Auto-merged drivers/ide/ide-tape.c Removed drivers/ide/ppc/mpc8xx.c Merge made by recursive. Documentation/kernel-parameters.txt | 3 - block/blk-core.c | 12 +- block/blk-exec.c | 6 +- drivers/block/paride/pd.c | 20 +- drivers/ide/Kconfig | 38 +- drivers/ide/Makefile | 5 +- drivers/ide/arm/Makefile | 1 - drivers/ide/arm/bast-ide.c | 90 --- drivers/ide/arm/icside.c | 105 ++-- drivers/ide/arm/palm_bk3710.c | 26 +- drivers/ide/arm/rapide.c | 33 +- drivers/ide/h8300/ide-h8300.c | 25 +- drivers/ide/ide-acpi.c | 6 +- drivers/ide/ide-atapi.c | 296 ++++++++++ drivers/ide/ide-cd.c | 259 ++++----- drivers/ide/ide-cd.h | 4 +- drivers/ide/ide-cd_ioctl.c | 113 ++-- drivers/ide/ide-disk.c | 13 +- drivers/ide/ide-dma.c | 4 +- drivers/ide/ide-floppy.c | 388 +++---------- drivers/ide/ide-io.c | 114 +--- drivers/ide/ide-iops.c | 36 +- drivers/ide/ide-lib.c | 151 ----- drivers/ide/ide-pio-blacklist.c | 94 +++ drivers/ide/ide-pnp.c | 4 +- drivers/ide/ide-probe.c | 31 +- drivers/ide/ide-tape.c | 561 +++++------------- drivers/ide/ide-taskfile.c | 77 +-- drivers/ide/{ide-timing.h => ide-timings.c} | 205 +++---- drivers/ide/ide.c | 393 +------------ drivers/ide/legacy/ali14xx.c | 5 +- drivers/ide/legacy/buddha.c | 1 - drivers/ide/legacy/falconide.c | 1 - drivers/ide/legacy/gayle.c | 5 +- drivers/ide/legacy/ht6560b.c | 17 +- drivers/ide/legacy/ide-4drives.c | 25 +- drivers/ide/legacy/ide-cs.c | 9 +- drivers/ide/legacy/ide_platform.c | 9 +- drivers/ide/legacy/macide.c | 1 - drivers/ide/legacy/q40ide.c | 1 - drivers/ide/legacy/qd65xx.c | 23 +- drivers/ide/mips/au1xxx-ide.c | 13 +- drivers/ide/mips/swarm.c | 28 +- drivers/ide/pci/aec62xx.c | 2 +- drivers/ide/pci/alim15x3.c | 8 +- drivers/ide/pci/amd74xx.c | 18 +- drivers/ide/pci/cmd640.c | 139 ++--- drivers/ide/pci/cmd64x.c | 10 +- drivers/ide/pci/cs5535.c | 6 +- drivers/ide/pci/cy82c693.c | 11 +- drivers/ide/pci/delkin_cb.c | 1 - drivers/ide/pci/hpt366.c | 3 +- drivers/ide/pci/ns87415.c | 4 +- drivers/ide/pci/scc_pata.c | 19 +- drivers/ide/pci/sgiioc4.c | 30 +- drivers/ide/pci/siimage.c | 25 +- drivers/ide/pci/sis5513.c | 3 - drivers/ide/pci/sl82c105.c | 3 +- drivers/ide/pci/via82cxxx.c | 18 +- drivers/ide/ppc/Makefile | 1 - drivers/ide/ppc/mpc8xx.c | 851 --------------------------- drivers/ide/ppc/pmac.c | 27 +- drivers/ide/setup-pci.c | 30 +- drivers/scsi/ide-scsi.c | 302 +++------- include/linux/blkdev.h | 1 - include/linux/ide.h | 116 ++-- 66 files changed, 1531 insertions(+), 3348 deletions(-) delete mode 100644 drivers/ide/arm/bast-ide.c create mode 100644 drivers/ide/ide-atapi.c create mode 100644 drivers/ide/ide-pio-blacklist.c rename drivers/ide/{ide-timing.h => ide-timings.c} (56%) delete mode 100644 drivers/ide/ppc/mpc8xx.c Merging libata/NEXT $ git merge libata/NEXT Merge made by recursive. drivers/ata/Kconfig | 10 ++- drivers/ata/ahci.c | 344 ++++++++++++++++++++++++++++++++++++++++++++- drivers/ata/ata_piix.c | 7 + drivers/ata/libata-core.c | 60 +++++---- drivers/ata/libata-eh.c | 200 +++++++++++++++++++++----- drivers/ata/libata-pmp.c | 13 +-- drivers/ata/libata-scsi.c | 95 +++++++++++-- drivers/ata/libata-sff.c | 15 +- drivers/ata/libata.h | 4 +- drivers/ata/pata_bf54x.c | 6 +- drivers/ata/pata_scc.c | 2 +- drivers/ata/sata_mv.c | 21 +++ include/linux/libata.h | 55 ++++++-- 13 files changed, 720 insertions(+), 112 deletions(-) Merging nfs/linux-next $ git merge nfs/linux-next Merge made by recursive. fs/Kconfig | 115 +++++----- fs/nfs/dir.c | 26 ++- fs/nfs/direct.c | 4 +- fs/nfs/file.c | 150 +++++++++--- fs/nfs/inode.c | 8 +- fs/nfs/internal.h | 1 + fs/nfs/iostat.h | 119 +-------- fs/nfs/nfs3acl.c | 9 +- fs/nfs/nfs3proc.c | 4 +- fs/nfs/nfs4proc.c | 57 +++--- fs/nfs/nfsroot.c | 2 - fs/nfs/proc.c | 28 ++- fs/nfs/super.c | 428 ++++++++++++++++++++++++++------- fs/nfs/write.c | 234 +++++++++---------- fs/nfsd/nfs4callback.c | 2 +- include/linux/nfs_iostat.h | 119 +++++++++ include/linux/nfs_page.h | 9 +- include/linux/nfs_xdr.h | 3 +- include/linux/sunrpc/clnt.h | 4 +- include/linux/sunrpc/sched.h | 1 - net/sunrpc/auth_gss/auth_gss.c | 27 +-- net/sunrpc/auth_gss/gss_krb5_mech.c | 4 +- net/sunrpc/auth_gss/gss_spkm3_mech.c | 4 +- net/sunrpc/auth_gss/gss_spkm3_token.c | 2 +- net/sunrpc/auth_unix.c | 2 +- net/sunrpc/clnt.c | 153 +++++++----- net/sunrpc/sched.c | 14 +- net/sunrpc/xprt.c | 9 +- net/sunrpc/xprtsock.c | 2 - 29 files changed, 965 insertions(+), 575 deletions(-) create mode 100644 include/linux/nfs_iostat.h $ git revert 09491a874d4f9a8676567bc58bce9dec9539740d Finished one revert. Created commit b075f50: Revert "NFS: handle interface identifiers in incoming IPv6 addresses" 1 files changed, 1 insertions(+), 41 deletions(-) Merging xfs/master $ git merge xfs/master Auto-merged fs/xfs/linux-2.6/xfs_buf.c Auto-merged fs/xfs/linux-2.6/xfs_buf.h Auto-merged fs/xfs/xfs_inode.c Auto-merged fs/xfs/xfs_vnodeops.c Auto-merged fs/xfs/xfs_vnodeops.h Auto-merged include/linux/dcache.h Merge made by recursive. fs/dcache.c | 102 +++++++ fs/xfs/linux-2.6/kmem.c | 6 +- fs/xfs/linux-2.6/kmem.h | 4 +- fs/xfs/linux-2.6/xfs_aops.c | 5 +- fs/xfs/linux-2.6/xfs_buf.c | 14 +- fs/xfs/linux-2.6/xfs_buf.h | 2 +- fs/xfs/linux-2.6/xfs_export.c | 2 +- fs/xfs/linux-2.6/xfs_iops.c | 88 ++++++- fs/xfs/linux-2.6/xfs_iops.h | 1 + fs/xfs/linux-2.6/xfs_linux.h | 1 + fs/xfs/linux-2.6/xfs_super.c | 566 ++++++++++++++++++++++++++++++++++++++-- fs/xfs/linux-2.6/xfs_super.h | 3 - fs/xfs/quota/xfs_dquot.c | 3 +- fs/xfs/quota/xfs_dquot.h | 2 +- fs/xfs/quota/xfs_dquot_item.c | 4 +- fs/xfs/quota/xfs_qm.c | 14 +- fs/xfs/quota/xfs_qm_syscalls.c | 8 +- fs/xfs/support/ktrace.c | 4 +- fs/xfs/xfs_attr.c | 158 +++--------- fs/xfs/xfs_attr.h | 2 - fs/xfs/xfs_attr_leaf.c | 38 ++-- fs/xfs/xfs_attr_sf.h | 10 +- fs/xfs/xfs_bmap.c | 2 +- fs/xfs/xfs_buf_item.c | 8 +- fs/xfs/xfs_clnt.h | 1 + fs/xfs/xfs_da_btree.c | 46 +++- fs/xfs/xfs_da_btree.h | 36 +++- fs/xfs/xfs_dfrag.c | 4 +- fs/xfs/xfs_dir2.c | 125 ++++++++-- fs/xfs/xfs_dir2.h | 6 +- fs/xfs/xfs_dir2_block.c | 56 +++-- fs/xfs/xfs_dir2_data.c | 5 +- fs/xfs/xfs_dir2_leaf.c | 80 ++++-- fs/xfs/xfs_dir2_node.c | 387 ++++++++++++++++------------ fs/xfs/xfs_dir2_sf.c | 83 ++++--- fs/xfs/xfs_dir2_trace.c | 20 +- fs/xfs/xfs_error.c | 5 +- fs/xfs/xfs_extfree_item.c | 6 +- fs/xfs/xfs_fs.h | 1 + fs/xfs/xfs_fsops.c | 4 +- fs/xfs/xfs_inode.c | 95 ++------ fs/xfs/xfs_inode.h | 3 - fs/xfs/xfs_inode_item.c | 7 +- fs/xfs/xfs_itable.c | 6 +- fs/xfs/xfs_log.c | 49 ++-- fs/xfs/xfs_log_priv.h | 6 +- fs/xfs/xfs_log_recover.c | 21 +- fs/xfs/xfs_mount.c | 92 ++----- fs/xfs/xfs_mount.h | 15 +- fs/xfs/xfs_mru_cache.c | 8 +- fs/xfs/xfs_rtalloc.c | 2 +- fs/xfs/xfs_sb.h | 17 ++- fs/xfs/xfs_trans.c | 4 +- fs/xfs/xfs_trans_inode.c | 2 +- fs/xfs/xfs_trans_item.c | 8 +- fs/xfs/xfs_vfsops.c | 479 +--------------------------------- fs/xfs/xfs_vfsops.h | 5 - fs/xfs/xfs_vnodeops.c | 34 ++- fs/xfs/xfs_vnodeops.h | 2 +- include/linux/dcache.h | 1 + 60 files changed, 1525 insertions(+), 1243 deletions(-) Merging infiniband/for-next $ git merge infiniband/for-next Auto-merged drivers/infiniband/core/cm.c Merge made by recursive. drivers/infiniband/core/addr.c | 41 ++++---- drivers/infiniband/core/agent.h | 2 - drivers/infiniband/core/cache.c | 2 - drivers/infiniband/core/cm.c | 2 - drivers/infiniband/core/cma.c | 42 ++++---- drivers/infiniband/core/core_priv.h | 2 - drivers/infiniband/core/device.c | 2 - drivers/infiniband/core/fmr_pool.c | 2 - drivers/infiniband/core/mad_priv.h | 2 - drivers/infiniband/core/mad_rmpp.c | 2 - drivers/infiniband/core/mad_rmpp.h | 2 - drivers/infiniband/core/packer.c | 2 - drivers/infiniband/core/sa_query.c | 24 +++-- drivers/infiniband/core/sysfs.c | 2 - drivers/infiniband/core/ucm.c | 2 - drivers/infiniband/core/ud_header.c | 2 - drivers/infiniband/core/umem.c | 2 - drivers/infiniband/core/user_mad.c | 2 - drivers/infiniband/core/uverbs.h | 2 - drivers/infiniband/core/uverbs_cmd.c | 4 +- drivers/infiniband/core/uverbs_main.c | 2 - drivers/infiniband/core/verbs.c | 48 ++++++++- drivers/infiniband/hw/cxgb3/cxio_hal.c | 13 ++- drivers/infiniband/hw/cxgb3/cxio_hal.h | 1 + drivers/infiniband/hw/cxgb3/cxio_wr.h | 60 ++++++++--- drivers/infiniband/hw/cxgb3/iwch_cq.c | 14 ++- drivers/infiniband/hw/cxgb3/iwch_provider.c | 98 +++++++++++++++++- drivers/infiniband/hw/cxgb3/iwch_provider.h | 8 -- drivers/infiniband/hw/cxgb3/iwch_qp.c | 131 ++++++++++++++++-------- drivers/infiniband/hw/ehca/ehca_reqs.c | 2 +- drivers/infiniband/hw/ipath/ipath_cq.c | 2 +- drivers/infiniband/hw/ipath/ipath_iba7220.c | 4 +- drivers/infiniband/hw/ipath/ipath_rc.c | 4 +- drivers/infiniband/hw/ipath/ipath_ruc.c | 4 +- drivers/infiniband/hw/ipath/ipath_uc.c | 8 +- drivers/infiniband/hw/ipath/ipath_ud.c | 8 +- drivers/infiniband/hw/mlx4/cq.c | 12 +- drivers/infiniband/hw/mlx4/qp.c | 8 +- drivers/infiniband/hw/mthca/mthca_allocator.c | 2 - drivers/infiniband/hw/mthca/mthca_av.c | 2 - drivers/infiniband/hw/mthca/mthca_catas.c | 2 - drivers/infiniband/hw/mthca/mthca_cmd.c | 2 - drivers/infiniband/hw/mthca/mthca_cmd.h | 2 - drivers/infiniband/hw/mthca/mthca_config_reg.h | 2 - drivers/infiniband/hw/mthca/mthca_cq.c | 6 +- drivers/infiniband/hw/mthca/mthca_dev.h | 2 - drivers/infiniband/hw/mthca/mthca_doorbell.h | 2 - drivers/infiniband/hw/mthca/mthca_eq.c | 2 - drivers/infiniband/hw/mthca/mthca_mad.c | 2 - drivers/infiniband/hw/mthca/mthca_main.c | 2 - drivers/infiniband/hw/mthca/mthca_mcg.c | 2 - drivers/infiniband/hw/mthca/mthca_memfree.c | 2 - drivers/infiniband/hw/mthca/mthca_memfree.h | 2 - drivers/infiniband/hw/mthca/mthca_mr.c | 2 - drivers/infiniband/hw/mthca/mthca_pd.c | 2 - drivers/infiniband/hw/mthca/mthca_profile.c | 2 - drivers/infiniband/hw/mthca/mthca_profile.h | 2 - drivers/infiniband/hw/mthca/mthca_provider.c | 2 - drivers/infiniband/hw/mthca/mthca_provider.h | 2 - drivers/infiniband/hw/mthca/mthca_qp.c | 2 - drivers/infiniband/hw/mthca/mthca_reset.c | 2 - drivers/infiniband/hw/mthca/mthca_srq.c | 2 - drivers/infiniband/hw/mthca/mthca_uar.c | 2 - drivers/infiniband/hw/mthca/mthca_user.h | 1 - drivers/infiniband/hw/mthca/mthca_wqe.h | 2 - drivers/infiniband/hw/nes/nes_cm.c | 1 - drivers/infiniband/ulp/ipoib/ipoib.h | 3 +- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 21 ++++- drivers/infiniband/ulp/ipoib/ipoib_fs.c | 2 - drivers/infiniband/ulp/ipoib/ipoib_ib.c | 2 - drivers/infiniband/ulp/ipoib/ipoib_main.c | 8 +- drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 2 - drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 2 - drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 2 - drivers/infiniband/ulp/iser/iscsi_iser.c | 3 - drivers/infiniband/ulp/iser/iscsi_iser.h | 2 - drivers/infiniband/ulp/iser/iser_initiator.c | 2 - drivers/infiniband/ulp/iser/iser_memory.c | 2 - drivers/infiniband/ulp/iser/iser_verbs.c | 2 - drivers/infiniband/ulp/srp/ib_srp.c | 15 +-- drivers/infiniband/ulp/srp/ib_srp.h | 2 - include/rdma/ib_addr.h | 50 +++++---- include/rdma/ib_cache.h | 2 - include/rdma/ib_cm.h | 2 - include/rdma/ib_fmr_pool.h | 4 +- include/rdma/ib_mad.h | 17 ++-- include/rdma/ib_pack.h | 2 - include/rdma/ib_sa.h | 2 - include/rdma/ib_smi.h | 4 +- include/rdma/ib_user_cm.h | 2 - include/rdma/ib_user_mad.h | 2 - include/rdma/ib_user_verbs.h | 7 +- include/rdma/ib_verbs.h | 90 +++++++++++++++- include/rdma/iw_cm.h | 2 +- include/rdma/rdma_cm.h | 52 +++++----- include/rdma/rdma_cm_ib.h | 50 +++++---- 96 files changed, 599 insertions(+), 387 deletions(-) Merging acpi/test $ git merge acpi/test Auto-merged Documentation/kernel-parameters.txt Auto-merged MAINTAINERS Auto-merged arch/x86/kernel/srat_32.c Auto-merged drivers/acpi/fan.c Auto-merged drivers/acpi/numa.c Auto-merged drivers/acpi/processor_core.c Auto-merged drivers/acpi/processor_throttling.c CONFLICT (content): Merge conflict in drivers/acpi/processor_throttling.c Auto-merged drivers/acpi/scan.c Auto-merged drivers/acpi/sleep/main.c CONFLICT (content): Merge conflict in drivers/acpi/sleep/main.c Auto-merged drivers/acpi/video.c Auto-merged include/linux/sched.h Auto-merged kernel/cpu.c Auto-merged kernel/kthread.c Resolved 'drivers/acpi/processor_throttling.c' using previous resolution. Resolved 'drivers/acpi/sleep/main.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. Documentation/kernel-parameters.txt | 4 + MAINTAINERS | 11 + arch/x86/kernel/acpi/processor.c | 5 + arch/x86/kernel/srat_32.c | 5 +- drivers/acpi/ac.c | 8 +- drivers/acpi/bus.c | 2 +- drivers/acpi/dispatcher/dsfield.c | 11 +- drivers/acpi/dispatcher/dsinit.c | 2 +- drivers/acpi/dispatcher/dsmethod.c | 36 +- drivers/acpi/dispatcher/dsmthdat.c | 12 +- drivers/acpi/dispatcher/dsobject.c | 56 ++-- drivers/acpi/dispatcher/dsopcode.c | 52 +-- drivers/acpi/dispatcher/dsutils.c | 40 +- drivers/acpi/dispatcher/dswexec.c | 46 +-- drivers/acpi/dispatcher/dswload.c | 57 +-- drivers/acpi/dispatcher/dswscope.c | 20 +- drivers/acpi/dispatcher/dswstate.c | 27 +- drivers/acpi/events/evevent.c | 32 +- drivers/acpi/events/evgpe.c | 56 +-- drivers/acpi/events/evgpeblk.c | 68 ++-- drivers/acpi/events/evmisc.c | 15 +- drivers/acpi/events/evregion.c | 53 ++-- drivers/acpi/events/evrgnini.c | 9 +- drivers/acpi/events/evxface.c | 18 +- drivers/acpi/events/evxfevnt.c | 40 +- drivers/acpi/events/evxfregn.c | 4 +- drivers/acpi/executer/exconfig.c | 19 +- drivers/acpi/executer/exconvrt.c | 26 +- drivers/acpi/executer/excreate.c | 15 +- drivers/acpi/executer/exdump.c | 110 ++--- drivers/acpi/executer/exfield.c | 16 +- drivers/acpi/executer/exfldio.c | 126 +++--- drivers/acpi/executer/exmisc.c | 24 +- drivers/acpi/executer/exmutex.c | 4 +- drivers/acpi/executer/exoparg1.c | 32 +- drivers/acpi/executer/exoparg2.c | 23 +- drivers/acpi/executer/exoparg3.c | 4 +- drivers/acpi/executer/exoparg6.c | 2 +- drivers/acpi/executer/exprep.c | 18 +- drivers/acpi/executer/exregion.c | 8 +- drivers/acpi/executer/exresnte.c | 4 +- drivers/acpi/executer/exresolv.c | 30 +- drivers/acpi/executer/exresop.c | 23 +- drivers/acpi/executer/exstore.c | 66 ++-- drivers/acpi/executer/exsystem.c | 4 +- drivers/acpi/fan.c | 8 +- drivers/acpi/hardware/hwgpe.c | 36 +- drivers/acpi/hardware/hwregs.c | 45 +- drivers/acpi/hardware/hwsleep.c | 14 +- drivers/acpi/namespace/nsaccess.c | 14 +- drivers/acpi/namespace/nsdump.c | 98 ++--- drivers/acpi/namespace/nseval.c | 38 ++- drivers/acpi/namespace/nsinit.c | 3 +- drivers/acpi/namespace/nsload.c | 5 +- drivers/acpi/namespace/nsparse.c | 15 +- drivers/acpi/namespace/nsutils.c | 56 ++-- drivers/acpi/namespace/nsxfeval.c | 29 +- drivers/acpi/namespace/nsxfname.c | 4 +- drivers/acpi/namespace/nsxfobj.c | 4 +- drivers/acpi/numa.c | 4 +- drivers/acpi/parser/psargs.c | 4 +- drivers/acpi/parser/psloop.c | 34 +- drivers/acpi/parser/psparse.c | 56 ++-- drivers/acpi/parser/pstree.c | 2 +- drivers/acpi/parser/psutils.c | 2 +- drivers/acpi/parser/psxface.c | 16 +- drivers/acpi/processor_core.c | 72 +++- drivers/acpi/processor_idle.c | 8 +- drivers/acpi/processor_perflib.c | 18 +- drivers/acpi/processor_throttling.c | 38 ++- drivers/acpi/resources/rscalc.c | 28 +- drivers/acpi/resources/rscreate.c | 45 ++- drivers/acpi/resources/rsdump.c | 12 +- drivers/acpi/resources/rsinfo.c | 2 +- drivers/acpi/resources/rsmisc.c | 9 +- drivers/acpi/resources/rsutils.c | 22 +- drivers/acpi/resources/rsxface.c | 2 +- drivers/acpi/scan.c | 62 ++- drivers/acpi/sleep/main.c | 8 +- drivers/acpi/sleep/proc.c | 36 +- drivers/acpi/sleep/wakeup.c | 7 +- drivers/acpi/tables/tbfadt.c | 28 +- drivers/acpi/tables/tbfind.c | 18 +- drivers/acpi/tables/tbinstal.c | 63 ++-- drivers/acpi/tables/tbutils.c | 50 +-- drivers/acpi/tables/tbxface.c | 94 ++-- drivers/acpi/tables/tbxfroot.c | 4 +- drivers/acpi/utilities/utalloc.c | 5 +- drivers/acpi/utilities/utcache.c | 16 +- drivers/acpi/utilities/utcopy.c | 9 +- drivers/acpi/utilities/utdebug.c | 54 ++- drivers/acpi/utilities/utdelete.c | 52 +-- drivers/acpi/utilities/uteval.c | 15 +- drivers/acpi/utilities/utmisc.c | 50 +-- drivers/acpi/utilities/utmutex.c | 4 +- drivers/acpi/utilities/utobject.c | 9 +- drivers/acpi/utilities/utxface.c | 4 +- drivers/acpi/video.c | 3 +- drivers/char/apm-emulation.c | 346 +++++++++------ drivers/misc/Kconfig | 30 ++- drivers/misc/Makefile | 5 +- drivers/misc/compal-laptop.c | 437 ++++++++++++++++++ drivers/misc/fujitsu-laptop.c | 825 ++++++++++++++++++++++++++++++++--- drivers/pnp/base.h | 148 +++++-- drivers/pnp/core.c | 29 +- drivers/pnp/interface.c | 207 ++++----- drivers/pnp/isapnp/core.c | 253 ++++------- drivers/pnp/manager.c | 414 ++++++------------ drivers/pnp/pnpacpi/rsparser.c | 490 ++++++++++++--------- drivers/pnp/pnpbios/rsparser.c | 274 ++++++------ drivers/pnp/quirks.c | 307 +++++++------- drivers/pnp/resource.c | 455 +++++++++----------- drivers/pnp/support.c | 151 ++++++- drivers/pnp/system.c | 4 +- drivers/serial/8250_pnp.c | 24 +- include/acpi/acconfig.h | 4 +- include/acpi/acdebug.h | 2 +- include/acpi/acdisasm.h | 3 +- include/acpi/acdispat.h | 4 +- include/acpi/acevents.h | 2 +- include/acpi/acexcep.h | 14 +- include/acpi/acglobal.h | 6 +- include/acpi/achware.h | 9 +- include/acpi/acinterp.h | 9 +- include/acpi/aclocal.h | 6 +- include/acpi/acmacros.h | 46 +- include/acpi/acnames.h | 2 +- include/acpi/acnamesp.h | 36 +- include/acpi/acobject.h | 2 +- include/acpi/acopcode.h | 2 +- include/acpi/acoutput.h | 2 +- include/acpi/acparser.h | 6 +- include/acpi/acpi.h | 2 +- include/acpi/acpi_bus.h | 16 +- include/acpi/acpi_drivers.h | 4 + include/acpi/acpi_numa.h | 4 +- include/acpi/acpiosxf.h | 9 +- include/acpi/acpixf.h | 21 +- include/acpi/acresrc.h | 2 +- include/acpi/acstruct.h | 10 +- include/acpi/actables.h | 29 +- include/acpi/actbl.h | 2 +- include/acpi/actbl1.h | 26 +- include/acpi/actypes.h | 21 +- include/acpi/acutils.h | 78 ++-- include/acpi/amlcode.h | 2 +- include/acpi/container.h | 2 +- include/acpi/pdc_intel.h | 2 +- include/acpi/platform/acenv.h | 14 +- include/acpi/platform/acgcc.h | 2 +- include/acpi/platform/aclinux.h | 7 +- include/acpi/processor.h | 13 +- include/acpi/reboot.h | 1 - include/linux/freezer.h | 10 + include/linux/ioport.h | 5 + include/linux/pnp.h | 144 ++++--- include/linux/sched.h | 1 + kernel/cpu.c | 1 + kernel/kthread.c | 2 +- kernel/power/process.c | 97 ++--- kernel/power/user.c | 71 ++-- 161 files changed, 4536 insertions(+), 3193 deletions(-) create mode 100644 drivers/misc/compal-laptop.c Merging blackfin/for-linus $ git merge blackfin/for-linus Merge made by recursive. drivers/serial/bfin_5xx.c | 40 +++++++++----------- include/asm-blackfin/mach-bf527/bfin_serial_5xx.h | 2 +- include/asm-blackfin/mach-bf533/bfin_serial_5xx.h | 2 +- include/asm-blackfin/mach-bf537/bfin_serial_5xx.h | 2 +- include/asm-blackfin/mach-bf548/bfin_serial_5xx.h | 6 ++-- include/asm-blackfin/mach-bf561/bfin_serial_5xx.h | 2 +- 6 files changed, 25 insertions(+), 29 deletions(-) Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Auto-merged net/sunrpc/auth_gss/auth_gss.c CONFLICT (content): Merge conflict in net/sunrpc/auth_gss/auth_gss.c Auto-merged net/sunrpc/svc.c CONFLICT (content): Merge conflict in net/sunrpc/svc.c Resolved 'net/sunrpc/auth_gss/auth_gss.c' using previous resolution. Resolved 'net/sunrpc/svc.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. Documentation/filesystems/nfs-rdma.txt | 103 +++++++++------- fs/lockd/svc.c | 33 ++--- fs/nfsd/nfs4proc.c | 1 + fs/nfsd/nfs4state.c | 21 +++- fs/nfsd/nfs4xdr.c | 2 +- fs/nfsd/nfsctl.c | 103 ++++++++++++---- fs/nfsd/nfsproc.c | 1 + fs/nfsd/nfssvc.c | 134 ++++++++++++--------- include/linux/nfs4.h | 3 - include/linux/nfsd/nfsd.h | 1 + include/linux/nfsd/state.h | 2 - include/linux/sunrpc/gss_krb5.h | 28 +++++ include/linux/sunrpc/svc.h | 7 +- include/linux/sunrpc/svc_rdma.h | 36 +++++- net/sunrpc/auth_gss/Makefile | 4 +- net/sunrpc/auth_gss/auth_gss.c | 14 ++- net/sunrpc/auth_gss/gss_krb5_crypto.c | 64 +++++++++-- net/sunrpc/auth_gss/gss_krb5_seal.c | 26 ++-- net/sunrpc/auth_gss/gss_krb5_unseal.c | 16 ++-- net/sunrpc/auth_gss/gss_krb5_wrap.c | 79 +++++++----- net/sunrpc/auth_gss/gss_mech_switch.c | 14 ++ net/sunrpc/auth_gss/svcauth_gss.c | 15 +++ net/sunrpc/svc.c | 110 ++++++----------- net/sunrpc/xprtrdma/svc_rdma.c | 40 ++++++ net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 84 ++++++------- net/sunrpc/xprtrdma/svc_rdma_sendto.c | 125 +++++++++---------- net/sunrpc/xprtrdma/svc_rdma_transport.c | 195 +++++++++++------------------- 27 files changed, 721 insertions(+), 540 deletions(-) Merging ieee1394/for-next $ git merge ieee1394/for-next Auto-merged drivers/firewire/fw-cdev.c Auto-merged drivers/firewire/fw-sbp2.c Auto-merged drivers/firewire/fw-transaction.c Auto-merged drivers/ieee1394/raw1394.c Auto-merged drivers/ieee1394/sbp2.c Auto-merged drivers/ieee1394/video1394.c Auto-merged drivers/scsi/sd.c Auto-merged include/scsi/scsi_device.h Merge made by recursive. drivers/firewire/Kconfig | 32 +++++----- drivers/firewire/fw-card.c | 2 +- drivers/firewire/fw-cdev.c | 9 ++- drivers/firewire/fw-device.h | 1 - drivers/firewire/fw-ohci.c | 111 +++++++++++++++++----------------- drivers/firewire/fw-sbp2.c | 25 +++++++- drivers/firewire/fw-transaction.c | 84 ++++++++++++++++++-------- drivers/firewire/fw-transaction.h | 14 +++-- drivers/ieee1394/Kconfig | 118 +++++++++++++++++++++---------------- drivers/ieee1394/csr1212.c | 32 +++++++--- drivers/ieee1394/highlevel.c | 4 +- drivers/ieee1394/highlevel.h | 13 ++++- drivers/ieee1394/raw1394.c | 20 +++++-- drivers/ieee1394/sbp2.c | 22 ++++++- drivers/ieee1394/sbp2.h | 1 + drivers/ieee1394/video1394.c | 2 + drivers/scsi/sd.c | 5 ++ include/scsi/scsi_device.h | 1 + 18 files changed, 314 insertions(+), 182 deletions(-) Merging hwmon/testing $ git merge hwmon/testing Auto-merged MAINTAINERS Merge made by recursive. Documentation/hwmon/dme1737 | 4 + Documentation/hwmon/sysfs-interface | 33 ++--- MAINTAINERS | 6 +- drivers/hwmon/Kconfig | 25 ++- drivers/hwmon/abituguru3.c | 18 ++- drivers/hwmon/adt7473.c | 19 +-- drivers/hwmon/dme1737.c | 297 +++++++++++++++++++++------------- drivers/hwmon/lm75.c | 302 +++++++++++++++++++++++++---------- drivers/hwmon/lm85.c | 25 ++-- 9 files changed, 470 insertions(+), 259 deletions(-) Merging ubi/master $ git merge ubi/master Merge made by recursive. drivers/mtd/ubi/build.c | 72 +++++++++++++++++++++++++++++++++++++++------- drivers/mtd/ubi/cdev.c | 6 ++-- drivers/mtd/ubi/eba.c | 46 +++++------------------------ drivers/mtd/ubi/kapi.c | 6 ++-- drivers/mtd/ubi/misc.c | 2 +- drivers/mtd/ubi/ubi.h | 1 - drivers/mtd/ubi/upd.c | 6 ++-- drivers/mtd/ubi/vmt.c | 20 ++++++------ drivers/mtd/ubi/vtbl.c | 55 +++++++++++++++++++++-------------- drivers/mtd/ubi/wl.c | 3 +- 10 files changed, 123 insertions(+), 94 deletions(-) Merging kvm/master $ git merge kvm/master Merge made by recursive. arch/ia64/kvm/Makefile | 3 +- arch/ia64/kvm/kvm-ia64.c | 17 +-- arch/powerpc/kvm/Makefile | 2 +- arch/powerpc/kvm/powerpc.c | 7 +- arch/s390/kvm/kvm-s390.c | 4 - arch/x86/kvm/Makefile | 3 +- arch/x86/kvm/i8254.c | 17 ++- arch/x86/kvm/i8259.c | 3 +- arch/x86/kvm/lapic.c | 13 ++- arch/x86/kvm/lapic.h | 1 + arch/x86/kvm/mmu.c | 61 ++++++---- arch/x86/kvm/mmu.h | 3 +- arch/x86/kvm/paging_tmpl.h | 28 ++-- arch/x86/kvm/svm.c | 85 +++++++++---- arch/x86/kvm/vmx.c | 187 +++++++++++++++++++++------ arch/x86/kvm/vmx.h | 12 ++- arch/x86/kvm/x86.c | 257 ++++++++++++++++++++---------------- arch/x86/kvm/x86_emulate.c | 157 +++++++++++++++-------- include/asm-ia64/kvm_host.h | 3 + include/asm-powerpc/kvm_host.h | 2 + include/asm-x86/kvm.h | 1 + include/asm-x86/kvm_host.h | 43 ++++++- include/asm-x86/kvm_x86_emulate.h | 1 + include/linux/kvm.h | 33 +++++- include/linux/kvm_host.h | 11 +- virt/kvm/coalesced_mmio.c | 156 ++++++++++++++++++++++ virt/kvm/coalesced_mmio.h | 23 ++++ virt/kvm/ioapic.c | 54 +++++---- virt/kvm/iodev.h | 8 +- virt/kvm/kvm_main.c | 130 ++++++++++++++++--- virt/kvm/kvm_trace.c | 18 ++- 31 files changed, 979 insertions(+), 364 deletions(-) create mode 100644 virt/kvm/coalesced_mmio.c create mode 100644 virt/kvm/coalesced_mmio.h Merging dlm/next $ git merge dlm/next Merge made by recursive. fs/dlm/lock.c | 3 ++- fs/dlm/user.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) Merging scsi/master $ git merge scsi/master Auto-merged block/bsg.c Auto-merged drivers/infiniband/ulp/iser/iscsi_iser.c Auto-merged drivers/infiniband/ulp/iser/iscsi_iser.h Auto-merged drivers/infiniband/ulp/iser/iser_initiator.c Auto-merged drivers/infiniband/ulp/iser/iser_memory.c Auto-merged drivers/infiniband/ulp/iser/iser_verbs.c Removed drivers/md/dm-emc.c Removed drivers/md/dm-hw-handler.c Removed drivers/md/dm-hw-handler.h Removed drivers/md/dm-mpath-hp-sw.c Removed drivers/md/dm-mpath-rdac.c Auto-merged drivers/message/fusion/mptbase.h Auto-merged drivers/message/fusion/mptfc.c Auto-merged drivers/s390/scsi/zfcp_aux.c Auto-merged drivers/s390/scsi/zfcp_def.h Auto-merged drivers/scsi/Kconfig Auto-merged drivers/scsi/scsi_transport_iscsi.c Auto-merged include/scsi/scsi_device.h Auto-merged include/scsi/scsi_transport_iscsi.h Merge made by recursive. Documentation/scsi/aacraid.txt | 24 +- block/bsg.c | 9 +- drivers/infiniband/ulp/iser/iscsi_iser.c | 355 ++++--- drivers/infiniband/ulp/iser/iscsi_iser.h | 44 +- drivers/infiniband/ulp/iser/iser_initiator.c | 209 ++-- drivers/infiniband/ulp/iser/iser_memory.c | 77 +- drivers/infiniband/ulp/iser/iser_verbs.c | 28 +- drivers/md/Kconfig | 19 +- drivers/md/Makefile | 7 +- drivers/md/dm-emc.c | 345 ------- drivers/md/dm-hw-handler.c | 213 ---- drivers/md/dm-hw-handler.h | 63 -- drivers/md/dm-mpath-hp-sw.c | 247 ----- drivers/md/dm-mpath-rdac.c | 700 ------------- drivers/md/dm-mpath.c | 161 ++-- drivers/md/dm-mpath.h | 1 - drivers/message/fusion/lsi/mpi.h | 2 +- drivers/message/fusion/lsi/mpi_cnfg.h | 2 +- drivers/message/fusion/mptbase.c | 100 ++- drivers/message/fusion/mptbase.h | 17 +- drivers/message/fusion/mptctl.c | 4 +- drivers/message/fusion/mptctl.h | 2 +- drivers/message/fusion/mptdebug.h | 2 +- drivers/message/fusion/mptfc.c | 2 +- drivers/message/fusion/mptlan.c | 2 +- drivers/message/fusion/mptlan.h | 2 +- drivers/message/fusion/mptsas.c | 2 +- drivers/message/fusion/mptsas.h | 2 +- drivers/message/fusion/mptscsih.c | 2 +- drivers/message/fusion/mptscsih.h | 2 +- drivers/message/fusion/mptspi.c | 3 +- drivers/s390/scsi/zfcp_aux.c | 40 +- drivers/s390/scsi/zfcp_dbf.c | 33 +- drivers/s390/scsi/zfcp_dbf.h | 12 +- drivers/s390/scsi/zfcp_def.h | 30 +- drivers/s390/scsi/zfcp_erp.c | 37 +- drivers/s390/scsi/zfcp_ext.h | 8 +- drivers/s390/scsi/zfcp_fsf.c | 105 ++- drivers/s390/scsi/zfcp_fsf.h | 11 +- drivers/s390/scsi/zfcp_qdio.c | 27 +- drivers/s390/scsi/zfcp_scsi.c | 65 ++ drivers/scsi/Kconfig | 2 + drivers/scsi/Makefile | 1 + drivers/scsi/aacraid/commctrl.c | 33 + drivers/scsi/aacraid/linit.c | 2 +- drivers/scsi/device_handler/Kconfig | 32 + drivers/scsi/device_handler/Makefile | 7 + drivers/scsi/device_handler/scsi_dh.c | 162 +++ drivers/scsi/device_handler/scsi_dh_emc.c | 499 ++++++++++ drivers/scsi/device_handler/scsi_dh_hp_sw.c | 202 ++++ drivers/scsi/device_handler/scsi_dh_rdac.c | 691 +++++++++++++ drivers/scsi/iscsi_tcp.c | 515 +++++----- drivers/scsi/iscsi_tcp.h | 7 +- drivers/scsi/libiscsi.c | 1353 ++++++++++++++------------ drivers/scsi/mesh.c | 8 +- drivers/scsi/qla4xxx/ql4_os.c | 8 +- drivers/scsi/scsi.c | 9 + drivers/scsi/scsi_debug.c | 98 ++- drivers/scsi/scsi_error.c | 11 + drivers/scsi/scsi_lib.c | 8 + drivers/scsi/scsi_sysfs.c | 1 + drivers/scsi/scsi_transport_iscsi.c | 384 ++++++-- include/scsi/iscsi_if.h | 93 +- include/scsi/iscsi_proto.h | 3 +- include/scsi/libiscsi.h | 107 +- include/scsi/scsi.h | 1 + include/scsi/scsi_device.h | 22 + include/scsi/scsi_dh.h | 59 ++ include/scsi/scsi_transport_iscsi.h | 91 +- 69 files changed, 4127 insertions(+), 3298 deletions(-) delete mode 100644 drivers/md/dm-emc.c delete mode 100644 drivers/md/dm-hw-handler.c delete mode 100644 drivers/md/dm-hw-handler.h delete mode 100644 drivers/md/dm-mpath-hp-sw.c delete mode 100644 drivers/md/dm-mpath-rdac.c create mode 100644 drivers/scsi/device_handler/Kconfig create mode 100644 drivers/scsi/device_handler/Makefile create mode 100644 drivers/scsi/device_handler/scsi_dh.c create mode 100644 drivers/scsi/device_handler/scsi_dh_emc.c create mode 100644 drivers/scsi/device_handler/scsi_dh_hp_sw.c create mode 100644 drivers/scsi/device_handler/scsi_dh_rdac.c create mode 100644 include/scsi/scsi_dh.h $ git am -3 ../patches/0001-scsi-fix-fallout-from-the-class_find_device-API-cha.patch Applying scsi: fix fallout from the class_find_device API change $ git am -3 ../patches/0001-scsi-fix-fallout-from-KOBJ_NAME_LEN-removal.patch Applying scsi: fix fallout from KOBJ_NAME_LEN removal Merging ia64/test $ git merge ia64/test Merge made by recursive. Documentation/ia64/paravirt_ops.txt | 137 +++++++++++ arch/ia64/Makefile | 6 + arch/ia64/kernel/Makefile | 44 ++++ arch/ia64/kernel/entry.S | 115 ++++++---- arch/ia64/kernel/head.S | 41 +++ arch/ia64/kernel/iosapic.c | 45 +++-- arch/ia64/kernel/irq_ia64.c | 19 +- arch/ia64/kernel/ivt.S | 462 +++++++++++++++++----------------- arch/ia64/kernel/minstate.h | 13 +- arch/ia64/kernel/nr-irqs.c | 24 ++ arch/ia64/kernel/paravirt.c | 369 ++++++++++++++++++++++++++++ arch/ia64/kernel/paravirt_inst.h | 29 +++ arch/ia64/kernel/paravirtentry.S | 60 +++++ arch/ia64/kernel/setup.c | 10 + arch/ia64/kernel/smpboot.c | 2 + arch/ia64/kernel/time.c | 23 ++ arch/ia64/kernel/vmlinux.lds.S | 1 - arch/ia64/sn/kernel/sn2/sn2_smp.c | 2 + include/asm-ia64/Kbuild | 2 +- include/asm-ia64/gcc_intrin.h | 24 +- include/asm-ia64/hw_irq.h | 23 ++- include/asm-ia64/intel_intrin.h | 41 ++-- include/asm-ia64/intrinsics.h | 55 ++++ include/asm-ia64/iosapic.h | 18 ++- include/asm-ia64/irq.h | 9 +- include/asm-ia64/mmu_context.h | 6 +- include/asm-ia64/native/inst.h | 175 +++++++++++++ include/asm-ia64/native/irq.h | 35 +++ include/asm-ia64/paravirt.h | 255 +++++++++++++++++++ include/asm-ia64/paravirt_privop.h | 114 +++++++++ include/asm-ia64/smp.h | 2 + include/asm-ia64/system.h | 11 +- 32 files changed, 1815 insertions(+), 357 deletions(-) create mode 100644 Documentation/ia64/paravirt_ops.txt create mode 100644 arch/ia64/kernel/nr-irqs.c create mode 100644 arch/ia64/kernel/paravirt.c create mode 100644 arch/ia64/kernel/paravirt_inst.h create mode 100644 arch/ia64/kernel/paravirtentry.S create mode 100644 include/asm-ia64/native/inst.h create mode 100644 include/asm-ia64/native/irq.h create mode 100644 include/asm-ia64/paravirt.h create mode 100644 include/asm-ia64/paravirt_privop.h Merging tests/master $ git merge tests/master Renamed drivers/misc/lkdtm.c => tests/lkdtm.c Auto-merged tests/lkdtm.c Auto-merged Makefile Auto-merged drivers/misc/Makefile Auto-merged kernel/Makefile Auto-merged lib/Kconfig.debug CONFLICT (content): Merge conflict in lib/Kconfig.debug Auto-merged lib/Makefile Resolved 'lib/Kconfig.debug' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. Makefile | 1 + drivers/misc/Makefile | 1 - kernel/Makefile | 4 - lib/Kconfig.debug | 73 +-------------------- lib/Makefile | 1 - tests/Kconfig | 80 +++++++++++++++++++++++ tests/Makefile | 10 +++ {kernel => tests}/backtracetest.c | 0 {drivers/misc => tests}/lkdtm.c | 12 ++-- {lib => tests}/locking-selftest-hardirq.h | 0 {lib => tests}/locking-selftest-mutex.h | 0 {lib => tests}/locking-selftest-rlock-hardirq.h | 0 {lib => tests}/locking-selftest-rlock-softirq.h | 0 {lib => tests}/locking-selftest-rlock.h | 0 {lib => tests}/locking-selftest-rsem.h | 0 {lib => tests}/locking-selftest-softirq.h | 0 {lib => tests}/locking-selftest-spin-hardirq.h | 0 {lib => tests}/locking-selftest-spin-softirq.h | 0 {lib => tests}/locking-selftest-spin.h | 0 {lib => tests}/locking-selftest-wlock-hardirq.h | 0 {lib => tests}/locking-selftest-wlock-softirq.h | 0 {lib => tests}/locking-selftest-wlock.h | 0 {lib => tests}/locking-selftest-wsem.h | 0 {lib => tests}/locking-selftest.c | 0 {kernel => tests}/rcutorture.c | 0 {kernel => tests}/rtmutex-tester.c | 2 +- {kernel => tests}/test_kprobes.c | 0 27 files changed, 100 insertions(+), 84 deletions(-) create mode 100644 tests/Kconfig create mode 100644 tests/Makefile rename {kernel => tests}/backtracetest.c (100%) rename {drivers/misc => tests}/lkdtm.c (96%) rename {lib => tests}/locking-selftest-hardirq.h (100%) rename {lib => tests}/locking-selftest-mutex.h (100%) rename {lib => tests}/locking-selftest-rlock-hardirq.h (100%) rename {lib => tests}/locking-selftest-rlock-softirq.h (100%) rename {lib => tests}/locking-selftest-rlock.h (100%) rename {lib => tests}/locking-selftest-rsem.h (100%) rename {lib => tests}/locking-selftest-softirq.h (100%) rename {lib => tests}/locking-selftest-spin-hardirq.h (100%) rename {lib => tests}/locking-selftest-spin-softirq.h (100%) rename {lib => tests}/locking-selftest-spin.h (100%) rename {lib => tests}/locking-selftest-wlock-hardirq.h (100%) rename {lib => tests}/locking-selftest-wlock-softirq.h (100%) rename {lib => tests}/locking-selftest-wlock.h (100%) rename {lib => tests}/locking-selftest-wsem.h (100%) rename {lib => tests}/locking-selftest.c (100%) rename {kernel => tests}/rcutorture.c (100%) rename {kernel => tests}/rtmutex-tester.c (99%) rename {kernel => tests}/test_kprobes.c (100%) Merging ocfs2/linux-next $ git merge ocfs2/linux-next Auto-merged fs/Kconfig Auto-merged fs/ocfs2/cluster/nodemanager.c Auto-merged fs/ocfs2/stack_user.c Merge made by recursive. Documentation/filesystems/configfs/configfs.txt | 10 +- .../filesystems/configfs/configfs_example.c | 14 +- drivers/net/netconsole.c | 10 +- fs/Kconfig | 8 + fs/configfs/configfs_internal.h | 4 + fs/configfs/dir.c | 147 ++++++++++++++------ fs/configfs/inode.c | 2 + fs/configfs/symlink.c | 16 ++- fs/dlm/config.c | 45 ++++--- fs/ocfs2/cluster/heartbeat.c | 17 ++- fs/ocfs2/cluster/netdebug.c | 8 +- fs/ocfs2/cluster/nodemanager.c | 45 ++++--- fs/ocfs2/dlmglue.c | 122 ++++++++++++++++- fs/ocfs2/file.c | 2 +- fs/ocfs2/journal.c | 2 +- fs/ocfs2/localalloc.c | 2 +- fs/ocfs2/ocfs2.h | 12 ++ fs/ocfs2/ocfs2_fs.h | 2 +- fs/ocfs2/stack_user.c | 19 +-- fs/ocfs2/super.c | 6 +- include/linux/configfs.h | 4 +- 21 files changed, 373 insertions(+), 124 deletions(-) Merging selinux/for-akpm $ git merge selinux/for-akpm Merge made by recursive. fs/proc/base.c | 9 +- fs/proc/task_mmu.c | 8 +- fs/proc/task_nommu.c | 2 +- include/linux/ptrace.h | 8 +- include/linux/security.h | 16 +- kernel/ptrace.c | 15 +- security/commoncap.c | 3 +- security/dummy.c | 3 +- security/security.c | 11 +- security/selinux/hooks.c | 156 +++++++----- security/selinux/include/audit.h | 4 +- security/selinux/include/avc.h | 15 +- security/selinux/include/objsec.h | 1 - security/selinux/include/security.h | 7 +- security/selinux/netnode.c | 1 - security/selinux/netport.c | 3 +- security/selinux/selinuxfs.c | 15 +- security/selinux/ss/avtab.c | 2 +- security/selinux/ss/context.h | 27 ++- security/selinux/ss/mls.c | 19 +- security/selinux/ss/mls.h | 3 +- security/selinux/ss/policydb.c | 15 +- security/selinux/ss/services.c | 450 ++++++++++++++++++++++------------- security/selinux/ss/sidtab.c | 76 ++---- security/selinux/ss/sidtab.h | 7 +- security/smack/smack_lsm.c | 5 +- 26 files changed, 519 insertions(+), 362 deletions(-) Merging quilt/m68k $ git merge quilt/m68k Removed arch/m68k/mac/bootparse.c Removed arch/m68k/sun3/sbus.c Auto-merged init/main.c Merge made by recursive. arch/m68k/Makefile | 2 +- arch/m68k/amiga/config.c | 22 +++---- arch/m68k/atari/debug.c | 37 ++--------- arch/m68k/fpsp040/Makefile | 1 - arch/m68k/ifpsp060/Makefile | 1 - arch/m68k/kernel/Makefile | 2 - arch/m68k/kernel/setup.c | 6 ++ arch/m68k/kernel/vmlinux-std.lds | 3 +- arch/m68k/kernel/vmlinux-sun3.lds | 7 +- arch/m68k/lib/Makefile | 2 - arch/m68k/mac/Makefile | 2 +- arch/m68k/mac/baboon.c | 26 ++++---- arch/m68k/mac/bootparse.c | 122 ------------------------------------- arch/m68k/mac/config.c | 11 ++-- arch/m68k/mac/debug.c | 41 +++--------- arch/m68k/mac/oss.c | 8 +- arch/m68k/mac/psc.c | 4 +- arch/m68k/mac/via.c | 2 +- arch/m68k/math-emu/Makefile | 2 - arch/m68k/q40/config.c | 26 ++++---- arch/m68k/sun3/Makefile | 2 +- arch/m68k/sun3/config.c | 7 +- arch/m68k/sun3/dvma.c | 2 +- arch/m68k/sun3/idprom.c | 4 +- arch/m68k/sun3/mmu_emu.c | 2 +- arch/m68k/sun3/prom/Makefile | 1 - arch/m68k/sun3/prom/console.c | 6 +-- arch/m68k/sun3/prom/init.c | 11 +--- arch/m68k/sun3/prom/misc.c | 2 +- arch/m68k/sun3/prom/printf.c | 7 +-- arch/m68k/sun3/sbus.c | 27 -------- arch/m68k/sun3/sun3dvma.c | 2 +- arch/m68k/sun3/sun3ints.c | 2 +- drivers/block/ataflop.c | 4 +- drivers/char/nvram.c | 2 +- drivers/input/keyboard/atakbd.c | 2 +- drivers/net/ariadne.c | 47 +++++++-------- drivers/video/amifb.c | 3 + drivers/video/atafb.c | 5 +- drivers/video/c2p.c | 3 + drivers/zorro/proc.c | 4 +- drivers/zorro/zorro-sysfs.c | 10 +--- drivers/zorro/zorro.c | 2 - drivers/zorro/zorro.ids | 2 - include/asm-m68k/amigahw.h | 4 - include/asm-m68k/amigaints.h | 2 + include/asm-m68k/apollodma.h | 2 +- include/asm-m68k/dvma.h | 4 +- include/asm-m68k/fpu.h | 10 ++-- include/asm-m68k/irq.h | 2 +- include/asm-m68k/mac_baboon.h | 2 - include/asm-m68k/mac_via.h | 1 - include/asm-m68k/machines.h | 4 +- include/asm-m68k/macintosh.h | 5 -- include/asm-m68k/md.h | 2 +- include/asm-m68k/openprom.h | 1 - include/asm-m68k/oplib.h | 3 +- include/asm-m68k/sbus.h | 5 -- include/asm-m68k/sun3-head.h | 1 - include/asm-m68k/tlbflush.h | 8 +- init/main.c | 5 +- 61 files changed, 150 insertions(+), 397 deletions(-) delete mode 100644 arch/m68k/mac/bootparse.c delete mode 100644 arch/m68k/sun3/sbus.c Merging powerpc/powerpc-next $ git merge powerpc/powerpc-next Auto-merged arch/powerpc/boot/Makefile Auto-merged arch/powerpc/boot/dts/mpc8548cds.dts Auto-merged arch/powerpc/kernel/entry_32.S Auto-merged arch/powerpc/kernel/head_44x.S Auto-merged arch/powerpc/kernel/irq.c Auto-merged arch/powerpc/kernel/setup_32.c Auto-merged arch/powerpc/xmon/xmon.c Removed arch/ppc/.gitignore Removed arch/ppc/4xx_io/Makefile Removed arch/ppc/4xx_io/serial_sicc.c Removed arch/ppc/8260_io/Kconfig Removed arch/ppc/8260_io/Makefile Removed arch/ppc/8260_io/enet.c Removed arch/ppc/8260_io/fcc_enet.c Removed arch/ppc/8xx_io/Kconfig Removed arch/ppc/8xx_io/Makefile Removed arch/ppc/8xx_io/commproc.c Removed arch/ppc/8xx_io/enet.c Removed arch/ppc/8xx_io/fec.c Removed arch/ppc/8xx_io/micropatch.c Removed arch/ppc/Kconfig Removed arch/ppc/Kconfig.debug Removed arch/ppc/Makefile Removed arch/ppc/boot/Makefile Removed arch/ppc/boot/common/Makefile Removed arch/ppc/boot/common/bootinfo.c Removed arch/ppc/boot/common/crt0.S Removed arch/ppc/boot/common/misc-common.c Removed arch/ppc/boot/common/ns16550.c Removed arch/ppc/boot/common/serial_stub.c Removed arch/ppc/boot/common/string.S Removed arch/ppc/boot/common/util.S Removed arch/ppc/boot/images/.gitignore Removed arch/ppc/boot/images/Makefile Removed arch/ppc/boot/include/cpc700.h Removed arch/ppc/boot/include/iso_font.h Removed arch/ppc/boot/include/mpc10x.h Removed arch/ppc/boot/include/mpsc_defs.h Removed arch/ppc/boot/include/nonstdio.h Removed arch/ppc/boot/include/of1275.h Removed arch/ppc/boot/include/rs6000.h Removed arch/ppc/boot/include/serial.h Removed arch/ppc/boot/ld.script Removed arch/ppc/boot/lib/.gitignore Removed arch/ppc/boot/lib/Makefile Removed arch/ppc/boot/lib/div64.S Removed arch/ppc/boot/lib/kbd.c Removed arch/ppc/boot/lib/vreset.c Removed arch/ppc/boot/of1275/Makefile Removed arch/ppc/boot/of1275/call_prom.c Removed arch/ppc/boot/of1275/claim.c Removed arch/ppc/boot/of1275/enter.c Removed arch/ppc/boot/of1275/exit.c Removed arch/ppc/boot/of1275/finddevice.c Removed arch/ppc/boot/of1275/getprop.c Removed arch/ppc/boot/of1275/map.c Removed arch/ppc/boot/of1275/ofinit.c Removed arch/ppc/boot/of1275/ofstdio.c Removed arch/ppc/boot/of1275/read.c Removed arch/ppc/boot/of1275/release.c Removed arch/ppc/boot/of1275/write.c Removed arch/ppc/boot/simple/Makefile Removed arch/ppc/boot/simple/chrpmap.c Removed arch/ppc/boot/simple/clear.S Removed arch/ppc/boot/simple/cpc700_memory.c Removed arch/ppc/boot/simple/dummy.c Removed arch/ppc/boot/simple/embed_config.c Removed arch/ppc/boot/simple/head.S Removed arch/ppc/boot/simple/iic.c Removed arch/ppc/boot/simple/m8260_tty.c Removed arch/ppc/boot/simple/m8xx_tty.c Removed arch/ppc/boot/simple/misc-chestnut.c Removed arch/ppc/boot/simple/misc-cpci690.c Removed arch/ppc/boot/simple/misc-embedded.c Removed arch/ppc/boot/simple/misc-ev64260.c Removed arch/ppc/boot/simple/misc-ev64360.c Removed arch/ppc/boot/simple/misc-katana.c Removed arch/ppc/boot/simple/misc-mv64x60.c Removed arch/ppc/boot/simple/misc-prep.c Removed arch/ppc/boot/simple/misc-radstone_ppc7d.c Removed arch/ppc/boot/simple/misc-spruce.c Removed arch/ppc/boot/simple/misc.c Removed arch/ppc/boot/simple/mpc10x_memory.c Removed arch/ppc/boot/simple/mpc52xx_tty.c Removed arch/ppc/boot/simple/mv64x60_tty.c Removed arch/ppc/boot/simple/openbios.c Removed arch/ppc/boot/simple/pci.c Removed arch/ppc/boot/simple/pibs.c Removed arch/ppc/boot/simple/prepmap.c Removed arch/ppc/boot/simple/qspan_pci.c Removed arch/ppc/boot/simple/relocate.S Removed arch/ppc/boot/simple/rw4/ppc_40x.h Removed arch/ppc/boot/simple/rw4/rw4_init.S Removed arch/ppc/boot/simple/rw4/rw4_init_brd.S Removed arch/ppc/boot/simple/rw4/stb.h Removed arch/ppc/boot/simple/uartlite_tty.c Removed arch/ppc/boot/utils/.gitignore Removed arch/ppc/boot/utils/elf.pl Removed arch/ppc/boot/utils/mkbugboot.c Removed arch/ppc/boot/utils/mkprep.c Removed arch/ppc/boot/utils/mktree.c Removed arch/ppc/configs/FADS_defconfig Removed arch/ppc/configs/IVMS8_defconfig Removed arch/ppc/configs/TQM823L_defconfig Removed arch/ppc/configs/TQM8260_defconfig Removed arch/ppc/configs/TQM850L_defconfig Removed arch/ppc/configs/TQM860L_defconfig Removed arch/ppc/configs/bamboo_defconfig Removed arch/ppc/configs/bseip_defconfig Removed arch/ppc/configs/bubinga_defconfig Removed arch/ppc/configs/chestnut_defconfig Removed arch/ppc/configs/cpci405_defconfig Removed arch/ppc/configs/cpci690_defconfig Removed arch/ppc/configs/ebony_defconfig Removed arch/ppc/configs/ep405_defconfig Removed arch/ppc/configs/est8260_defconfig Removed arch/ppc/configs/ev64260_defconfig Removed arch/ppc/configs/ev64360_defconfig Removed arch/ppc/configs/hdpu_defconfig Removed arch/ppc/configs/katana_defconfig Removed arch/ppc/configs/lite5200_defconfig Removed arch/ppc/configs/lopec_defconfig Removed arch/ppc/configs/luan_defconfig Removed arch/ppc/configs/mbx_defconfig Removed arch/ppc/configs/ml300_defconfig Removed arch/ppc/configs/ml403_defconfig Removed arch/ppc/configs/mvme5100_defconfig Removed arch/ppc/configs/ocotea_defconfig Removed arch/ppc/configs/pplus_defconfig Removed arch/ppc/configs/prep_defconfig Removed arch/ppc/configs/prpmc750_defconfig Removed arch/ppc/configs/prpmc800_defconfig Removed arch/ppc/configs/radstone_ppc7d_defconfig Removed arch/ppc/configs/redwood5_defconfig Removed arch/ppc/configs/redwood6_defconfig Removed arch/ppc/configs/rpx8260_defconfig Removed arch/ppc/configs/rpxcllf_defconfig Removed arch/ppc/configs/rpxlite_defconfig Removed arch/ppc/configs/sandpoint_defconfig Removed arch/ppc/configs/spruce_defconfig Removed arch/ppc/configs/sycamore_defconfig Removed arch/ppc/configs/taishan_defconfig Removed arch/ppc/configs/walnut_defconfig Removed arch/ppc/kernel/Makefile Removed arch/ppc/kernel/asm-offsets.c Removed arch/ppc/kernel/cpu_setup_power4.S Removed arch/ppc/kernel/entry.S Removed arch/ppc/kernel/head.S Removed arch/ppc/kernel/head_44x.S Removed arch/ppc/kernel/head_4xx.S Removed arch/ppc/kernel/head_8xx.S Removed arch/ppc/kernel/head_booke.h Removed arch/ppc/kernel/machine_kexec.c Removed arch/ppc/kernel/misc.S Removed arch/ppc/kernel/pci.c Removed arch/ppc/kernel/ppc-stub.c Removed arch/ppc/kernel/ppc_htab.c Removed arch/ppc/kernel/ppc_ksyms.c Removed arch/ppc/kernel/relocate_kernel.S Removed arch/ppc/kernel/setup.c Removed arch/ppc/kernel/smp-tbsync.c Removed arch/ppc/kernel/smp.c Removed arch/ppc/kernel/softemu8xx.c Removed arch/ppc/kernel/time.c Removed arch/ppc/kernel/traps.c Removed arch/ppc/kernel/vmlinux.lds.S Removed arch/ppc/lib/Makefile Removed arch/ppc/lib/checksum.S Removed arch/ppc/lib/div64.S Removed arch/ppc/lib/locks.c Removed arch/ppc/lib/string.S Removed arch/ppc/mm/44x_mmu.c Removed arch/ppc/mm/4xx_mmu.c Removed arch/ppc/mm/Makefile Removed arch/ppc/mm/fault.c Removed arch/ppc/mm/hashtable.S Removed arch/ppc/mm/init.c Removed arch/ppc/mm/mem_pieces.c Removed arch/ppc/mm/mem_pieces.h Removed arch/ppc/mm/mmu_context.c Removed arch/ppc/mm/mmu_decl.h Removed arch/ppc/mm/pgtable.c Removed arch/ppc/mm/ppc_mmu.c Removed arch/ppc/mm/tlb.c Removed arch/ppc/platforms/4xx/Kconfig Removed arch/ppc/platforms/4xx/Makefile Removed arch/ppc/platforms/4xx/bamboo.c Removed arch/ppc/platforms/4xx/bamboo.h Removed arch/ppc/platforms/4xx/bubinga.c Removed arch/ppc/platforms/4xx/bubinga.h Removed arch/ppc/platforms/4xx/cpci405.c Removed arch/ppc/platforms/4xx/cpci405.h Removed arch/ppc/platforms/4xx/ebony.c Removed arch/ppc/platforms/4xx/ebony.h Removed arch/ppc/platforms/4xx/ep405.c Removed arch/ppc/platforms/4xx/ep405.h Removed arch/ppc/platforms/4xx/ibm405ep.c Removed arch/ppc/platforms/4xx/ibm405ep.h Removed arch/ppc/platforms/4xx/ibm405gp.c Removed arch/ppc/platforms/4xx/ibm405gp.h Removed arch/ppc/platforms/4xx/ibm405gpr.c Removed arch/ppc/platforms/4xx/ibm405gpr.h Removed arch/ppc/platforms/4xx/ibm440ep.c Removed arch/ppc/platforms/4xx/ibm440ep.h Removed arch/ppc/platforms/4xx/ibm440gp.c Removed arch/ppc/platforms/4xx/ibm440gp.h Removed arch/ppc/platforms/4xx/ibm440gx.c Removed arch/ppc/platforms/4xx/ibm440gx.h Removed arch/ppc/platforms/4xx/ibm440sp.c Removed arch/ppc/platforms/4xx/ibm440sp.h Removed arch/ppc/platforms/4xx/ibmnp405h.c Removed arch/ppc/platforms/4xx/ibmnp405h.h Removed arch/ppc/platforms/4xx/ibmstb4.c Removed arch/ppc/platforms/4xx/ibmstb4.h Removed arch/ppc/platforms/4xx/ibmstbx25.c Removed arch/ppc/platforms/4xx/ibmstbx25.h Removed arch/ppc/platforms/4xx/luan.c Removed arch/ppc/platforms/4xx/luan.h Removed arch/ppc/platforms/4xx/ocotea.c Removed arch/ppc/platforms/4xx/ocotea.h Removed arch/ppc/platforms/4xx/ppc440spe.c Removed arch/ppc/platforms/4xx/ppc440spe.h Removed arch/ppc/platforms/4xx/redwood5.c Removed arch/ppc/platforms/4xx/redwood5.h Removed arch/ppc/platforms/4xx/redwood6.c Removed arch/ppc/platforms/4xx/redwood6.h Removed arch/ppc/platforms/4xx/sycamore.c Removed arch/ppc/platforms/4xx/sycamore.h Removed arch/ppc/platforms/4xx/taishan.c Removed arch/ppc/platforms/4xx/taishan.h Removed arch/ppc/platforms/4xx/virtex.h Removed arch/ppc/platforms/4xx/walnut.c Removed arch/ppc/platforms/4xx/walnut.h Removed arch/ppc/platforms/4xx/xilinx_ml300.c Removed arch/ppc/platforms/4xx/xilinx_ml403.c Removed arch/ppc/platforms/4xx/xparameters/xparameters.h Removed arch/ppc/platforms/4xx/xparameters/xparameters_ml300.h Removed arch/ppc/platforms/4xx/xparameters/xparameters_ml403.h Removed arch/ppc/platforms/4xx/yucca.c Removed arch/ppc/platforms/4xx/yucca.h Removed arch/ppc/platforms/Makefile Removed arch/ppc/platforms/bseip.h Removed arch/ppc/platforms/ccm.h Removed arch/ppc/platforms/chestnut.c Removed arch/ppc/platforms/chestnut.h Removed arch/ppc/platforms/cpci690.c Removed arch/ppc/platforms/cpci690.h Removed arch/ppc/platforms/est8260.h Removed arch/ppc/platforms/ev64260.c Removed arch/ppc/platforms/ev64260.h Removed arch/ppc/platforms/ev64360.c Removed arch/ppc/platforms/ev64360.h Removed arch/ppc/platforms/fads.h Removed arch/ppc/platforms/hdpu.c Removed arch/ppc/platforms/hdpu.h Removed arch/ppc/platforms/hermes.h Removed arch/ppc/platforms/ip860.h Removed arch/ppc/platforms/ivms8.h Removed arch/ppc/platforms/katana.c Removed arch/ppc/platforms/katana.h Removed arch/ppc/platforms/lantec.h Removed arch/ppc/platforms/lite5200.c Removed arch/ppc/platforms/lite5200.h Removed arch/ppc/platforms/lopec.c Removed arch/ppc/platforms/lopec.h Removed arch/ppc/platforms/lwmon.h Removed arch/ppc/platforms/mbx.h Removed arch/ppc/platforms/mpc866ads_setup.c Removed arch/ppc/platforms/mvme5100.c Removed arch/ppc/platforms/mvme5100.h Removed arch/ppc/platforms/pal4.h Removed arch/ppc/platforms/pal4_pci.c Removed arch/ppc/platforms/pal4_serial.h Removed arch/ppc/platforms/pal4_setup.c Removed arch/ppc/platforms/pcu_e.h Removed arch/ppc/platforms/powerpmc250.c Removed arch/ppc/platforms/powerpmc250.h Removed arch/ppc/platforms/pplus.c Removed arch/ppc/platforms/pplus.h Removed arch/ppc/platforms/prep_pci.c Removed arch/ppc/platforms/prep_setup.c Removed arch/ppc/platforms/prpmc750.c Removed arch/ppc/platforms/prpmc750.h Removed arch/ppc/platforms/prpmc800.c Removed arch/ppc/platforms/prpmc800.h Removed arch/ppc/platforms/radstone_ppc7d.c Removed arch/ppc/platforms/radstone_ppc7d.h Removed arch/ppc/platforms/residual.c Removed arch/ppc/platforms/rpx8260.h Removed arch/ppc/platforms/rpxclassic.h Removed arch/ppc/platforms/rpxlite.h Removed arch/ppc/platforms/sandpoint.c Removed arch/ppc/platforms/sandpoint.h Removed arch/ppc/platforms/sbc82xx.c Removed arch/ppc/platforms/sbc82xx.h Removed arch/ppc/platforms/sbs8260.h Removed arch/ppc/platforms/spruce.c Removed arch/ppc/platforms/spruce.h Removed arch/ppc/platforms/tqm8260.h Removed arch/ppc/platforms/tqm8260_setup.c Removed arch/ppc/platforms/tqm8xx.h Removed arch/ppc/syslib/Makefile Removed arch/ppc/syslib/btext.c Removed arch/ppc/syslib/cpc700.h Removed arch/ppc/syslib/cpc700_pic.c Removed arch/ppc/syslib/cpm2_common.c Removed arch/ppc/syslib/cpm2_pic.c Removed arch/ppc/syslib/cpm2_pic.h Removed arch/ppc/syslib/gen550.h Removed arch/ppc/syslib/gen550_dbg.c Removed arch/ppc/syslib/gen550_kgdb.c Removed arch/ppc/syslib/gt64260_pic.c Removed arch/ppc/syslib/harrier.c Removed arch/ppc/syslib/hawk_common.c Removed arch/ppc/syslib/i8259.c Removed arch/ppc/syslib/ibm440gp_common.c Removed arch/ppc/syslib/ibm440gp_common.h Removed arch/ppc/syslib/ibm440gx_common.c Removed arch/ppc/syslib/ibm440gx_common.h Removed arch/ppc/syslib/ibm440sp_common.c Removed arch/ppc/syslib/ibm440sp_common.h Removed arch/ppc/syslib/ibm44x_common.c Removed arch/ppc/syslib/ibm44x_common.h Removed arch/ppc/syslib/ibm_ocp.c Removed arch/ppc/syslib/indirect_pci.c Removed arch/ppc/syslib/m8260_pci_erratum9.c Removed arch/ppc/syslib/m8260_setup.c Removed arch/ppc/syslib/m82xx_pci.c Removed arch/ppc/syslib/m82xx_pci.h Removed arch/ppc/syslib/m8xx_setup.c Removed arch/ppc/syslib/m8xx_wdt.c Removed arch/ppc/syslib/m8xx_wdt.h Removed arch/ppc/syslib/mpc10x_common.c Removed arch/ppc/syslib/mpc52xx_devices.c Removed arch/ppc/syslib/mpc52xx_pci.c Removed arch/ppc/syslib/mpc52xx_pci.h Removed arch/ppc/syslib/mpc52xx_pic.c Removed arch/ppc/syslib/mpc52xx_setup.c Removed arch/ppc/syslib/mpc52xx_sys.c Removed arch/ppc/syslib/mpc8xx_devices.c Removed arch/ppc/syslib/mpc8xx_sys.c Removed arch/ppc/syslib/mv64360_pic.c Removed arch/ppc/syslib/mv64x60.c Removed arch/ppc/syslib/mv64x60_dbg.c Removed arch/ppc/syslib/mv64x60_win.c Removed arch/ppc/syslib/ocp.c Removed arch/ppc/syslib/open_pic.c Removed arch/ppc/syslib/open_pic2.c Removed arch/ppc/syslib/open_pic_defs.h Removed arch/ppc/syslib/pci_auto.c Removed arch/ppc/syslib/ppc403_pic.c Removed arch/ppc/syslib/ppc405_pci.c Removed arch/ppc/syslib/ppc440spe_pcie.c Removed arch/ppc/syslib/ppc440spe_pcie.h Removed arch/ppc/syslib/ppc4xx_dma.c Removed arch/ppc/syslib/ppc4xx_pic.c Removed arch/ppc/syslib/ppc4xx_setup.c Removed arch/ppc/syslib/ppc4xx_sgdma.c Removed arch/ppc/syslib/ppc8xx_pic.c Removed arch/ppc/syslib/ppc8xx_pic.h Removed arch/ppc/syslib/ppc_sys.c Removed arch/ppc/syslib/pq2_devices.c Removed arch/ppc/syslib/pq2_sys.c Removed arch/ppc/syslib/prep_nvram.c Removed arch/ppc/syslib/qspan_pci.c Removed arch/ppc/syslib/todc_time.c Removed arch/ppc/syslib/virtex_devices.c Removed arch/ppc/syslib/virtex_devices.h Removed arch/ppc/syslib/xilinx_pic.c Removed arch/ppc/xmon/Makefile Removed arch/ppc/xmon/ansidecl.h Removed arch/ppc/xmon/nonstdio.h Removed arch/ppc/xmon/ppc-dis.c Removed arch/ppc/xmon/ppc-opc.c Removed arch/ppc/xmon/ppc.h Removed arch/ppc/xmon/privinst.h Removed arch/ppc/xmon/setjmp.c Removed arch/ppc/xmon/start.c Removed arch/ppc/xmon/start_8xx.c Removed arch/ppc/xmon/subr_prf.c Removed arch/ppc/xmon/xmon.c Removed drivers/net/fec_8xx/Kconfig Removed drivers/net/fec_8xx/Makefile Removed drivers/net/fec_8xx/fec_8xx-netta.c Removed drivers/net/fec_8xx/fec_8xx.h Removed drivers/net/fec_8xx/fec_main.c Removed drivers/net/fec_8xx/fec_mii.c Auto-merged include/asm-powerpc/system.h Removed include/asm-ppc/8xx_immap.h Removed include/asm-ppc/amigayle.h Removed include/asm-ppc/amipcmcia.h Removed include/asm-ppc/bootinfo.h Removed include/asm-ppc/bootx.h Removed include/asm-ppc/btext.h Removed include/asm-ppc/cpm1.h Removed include/asm-ppc/cpm2.h Removed include/asm-ppc/delay.h Removed include/asm-ppc/device.h Removed include/asm-ppc/floppy.h Removed include/asm-ppc/fs_pd.h Removed include/asm-ppc/gg2.h Removed include/asm-ppc/gt64260.h Removed include/asm-ppc/gt64260_defs.h Removed include/asm-ppc/harrier.h Removed include/asm-ppc/hawk.h Removed include/asm-ppc/hawk_defs.h Removed include/asm-ppc/highmem.h Removed include/asm-ppc/hydra.h Removed include/asm-ppc/ibm403.h Removed include/asm-ppc/ibm405.h Removed include/asm-ppc/ibm44x.h Removed include/asm-ppc/ibm4xx.h Removed include/asm-ppc/ibm_ocp.h Removed include/asm-ppc/ibm_ocp_pci.h Removed include/asm-ppc/immap_cpm2.h Removed include/asm-ppc/io.h Removed include/asm-ppc/irq_regs.h Removed include/asm-ppc/kdebug.h Removed include/asm-ppc/kgdb.h Removed include/asm-ppc/m8260_pci.h Removed include/asm-ppc/machdep.h Removed include/asm-ppc/md.h Removed include/asm-ppc/mk48t59.h Removed include/asm-ppc/mmu.h Removed include/asm-ppc/mmu_context.h Removed include/asm-ppc/mpc10x.h Removed include/asm-ppc/mpc52xx.h Removed include/asm-ppc/mpc52xx_psc.h Removed include/asm-ppc/mpc8260.h Removed include/asm-ppc/mpc8260_pci9.h Removed include/asm-ppc/mpc8xx.h Removed include/asm-ppc/mv64x60.h Removed include/asm-ppc/mv64x60_defs.h Removed include/asm-ppc/ocp.h Removed include/asm-ppc/ocp_ids.h Removed include/asm-ppc/open_pic.h Removed include/asm-ppc/page.h Removed include/asm-ppc/pc_serial.h Removed include/asm-ppc/pci-bridge.h Removed include/asm-ppc/pci.h Removed include/asm-ppc/pgalloc.h Removed include/asm-ppc/pgtable.h Removed include/asm-ppc/pnp.h Removed include/asm-ppc/ppc4xx_dma.h Removed include/asm-ppc/ppc4xx_pic.h Removed include/asm-ppc/ppc_sys.h Removed include/asm-ppc/ppcboot.h Removed include/asm-ppc/prep_nvram.h Removed include/asm-ppc/prom.h Removed include/asm-ppc/raven.h Removed include/asm-ppc/reg_booke.h Removed include/asm-ppc/residual.h Removed include/asm-ppc/rtc.h Removed include/asm-ppc/serial.h Removed include/asm-ppc/smp.h Removed include/asm-ppc/spinlock.h Removed include/asm-ppc/suspend.h Removed include/asm-ppc/system.h Removed include/asm-ppc/time.h Removed include/asm-ppc/todc.h Removed include/asm-ppc/traps.h Removed include/asm-ppc/zorro.h Merge made by recursive. Documentation/powerpc/booting-without-of.txt | 49 +- arch/powerpc/boot/Makefile | 6 +- arch/powerpc/boot/cuboot-c2k.c | 190 ++ arch/powerpc/boot/cuboot-warp.c | 47 +- arch/powerpc/boot/dts/asp834x-redboot.dts | 247 ++ arch/powerpc/boot/dts/bamboo.dts | 142 +- arch/powerpc/boot/dts/c2k.dts | 371 +++ arch/powerpc/boot/dts/canyonlands.dts | 222 +- arch/powerpc/boot/dts/ebony.dts | 164 +- arch/powerpc/boot/dts/ep405.dts | 100 +- arch/powerpc/boot/dts/glacier.dts | 262 +- arch/powerpc/boot/dts/haleakala.dts | 136 +- arch/powerpc/boot/dts/holly.dts | 122 +- arch/powerpc/boot/dts/katmai.dts | 210 +- arch/powerpc/boot/dts/kilauea.dts | 182 +- arch/powerpc/boot/dts/ksi8560.dts | 3 +- arch/powerpc/boot/dts/makalu.dts | 182 +- arch/powerpc/boot/dts/mpc7448hpc2.dts | 2 - arch/powerpc/boot/dts/mpc8540ads.dts | 5 +- arch/powerpc/boot/dts/mpc8541cds.dts | 5 +- arch/powerpc/boot/dts/mpc8544ds.dts | 21 +- arch/powerpc/boot/dts/mpc8548cds.dts | 5 +- arch/powerpc/boot/dts/mpc8555cds.dts | 5 +- arch/powerpc/boot/dts/mpc8560ads.dts | 3 +- arch/powerpc/boot/dts/mpc8568mds.dts | 5 +- arch/powerpc/boot/dts/mpc8572ds.dts | 22 +- arch/powerpc/boot/dts/mpc8610_hpcd.dts | 18 +- arch/powerpc/boot/dts/mpc8641_hpcn.dts | 2 - arch/powerpc/boot/dts/ps3.dts | 16 +- arch/powerpc/boot/dts/rainier.dts | 163 +- arch/powerpc/boot/dts/sbc8548.dts | 5 +- arch/powerpc/boot/dts/sbc8560.dts | 5 +- arch/powerpc/boot/dts/sequoia.dts | 172 +- arch/powerpc/boot/dts/storcenter.dts | 1 + arch/powerpc/boot/dts/stx_gp3_8560.dts | 4 +- arch/powerpc/boot/dts/taishan.dts | 212 +- arch/powerpc/boot/dts/tqm8540.dts | 4 +- arch/powerpc/boot/dts/tqm8541.dts | 4 +- arch/powerpc/boot/dts/tqm8555.dts | 4 +- arch/powerpc/boot/dts/tqm8560.dts | 4 +- arch/powerpc/boot/dts/walnut.dts | 118 +- arch/powerpc/boot/dts/warp.dts | 145 +- arch/powerpc/boot/dts/yosemite.dts | 146 +- arch/powerpc/boot/redboot-83xx.c | 60 + arch/powerpc/boot/wrapper | 6 +- arch/powerpc/configs/asp8347_defconfig | 1214 +++++++++ arch/powerpc/configs/c2k_defconfig | 1872 ++++++++++++++ arch/powerpc/kernel/asm-offsets.c | 23 + arch/powerpc/kernel/entry_32.S | 150 +- arch/powerpc/kernel/head_40x.S | 24 +- arch/powerpc/kernel/head_44x.S | 9 - arch/powerpc/kernel/head_booke.h | 102 +- arch/powerpc/kernel/head_fsl_booke.S | 9 - arch/powerpc/kernel/irq.c | 35 +- arch/powerpc/kernel/kprobes.c | 2 +- arch/powerpc/kernel/lparcfg.c | 6 +- arch/powerpc/kernel/machine_kexec_64.c | 4 +- arch/powerpc/kernel/msi.c | 2 +- arch/powerpc/kernel/of_device.c | 48 - arch/powerpc/kernel/rtas-proc.c | 14 +- arch/powerpc/kernel/rtas.c | 6 +- arch/powerpc/kernel/rtas_flash.c | 4 +- arch/powerpc/kernel/rtas_pci.c | 4 +- arch/powerpc/kernel/setup-common.c | 2 + arch/powerpc/kernel/setup_32.c | 24 + arch/powerpc/kernel/signal.c | 12 +- arch/powerpc/kernel/signal_32.c | 2 +- arch/powerpc/kernel/smp.c | 4 - arch/powerpc/kernel/time.c | 10 +- arch/powerpc/kernel/vdso64/vdso64.lds.S | 6 +- arch/powerpc/mm/hash_utils_64.c | 6 +- arch/powerpc/mm/init_32.c | 3 +- arch/powerpc/mm/init_64.c | 4 +- arch/powerpc/mm/stab.c | 4 +- arch/powerpc/mm/tlb_64.c | 7 +- arch/powerpc/platforms/44x/warp-nand.c | 49 +- arch/powerpc/platforms/44x/warp.c | 293 ++- arch/powerpc/platforms/83xx/Kconfig | 9 + arch/powerpc/platforms/83xx/Makefile | 1 + arch/powerpc/platforms/83xx/asp834x.c | 90 + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 4 +- arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 3 +- arch/powerpc/platforms/cell/axon_msi.c | 76 +- arch/powerpc/platforms/cell/spider-pic.c | 2 +- arch/powerpc/platforms/chrp/setup.c | 7 - arch/powerpc/platforms/embedded6xx/Kconfig | 10 + arch/powerpc/platforms/embedded6xx/Makefile | 1 + arch/powerpc/platforms/embedded6xx/c2k.c | 158 ++ arch/powerpc/platforms/maple/time.c | 2 - arch/powerpc/platforms/powermac/pic.c | 8 +- arch/powerpc/platforms/pseries/firmware.c | 1 + arch/powerpc/platforms/pseries/iommu.c | 15 +- arch/powerpc/platforms/pseries/lpar.c | 2 +- arch/powerpc/platforms/pseries/ras.c | 2 +- arch/powerpc/platforms/pseries/rtasd.c | 4 +- arch/powerpc/platforms/pseries/setup.c | 4 +- arch/powerpc/sysdev/6xx-suspend.S | 52 + arch/powerpc/sysdev/Makefile | 7 +- arch/powerpc/sysdev/cpm1.c | 2 +- arch/powerpc/sysdev/cpm2_pic.c | 2 +- arch/powerpc/sysdev/dcr.c | 156 +- arch/powerpc/sysdev/fsl_msi.c | 429 +++ arch/powerpc/sysdev/fsl_msi.h | 42 + arch/powerpc/sysdev/fsl_pci.c | 12 + arch/powerpc/sysdev/fsl_soc.c | 15 +- arch/powerpc/sysdev/i8259.c | 2 +- arch/powerpc/sysdev/ipic.c | 16 +- arch/powerpc/sysdev/mpic.c | 18 +- arch/powerpc/sysdev/mpic_msi.c | 1 + arch/powerpc/sysdev/mpic_pasemi_msi.c | 6 +- arch/powerpc/sysdev/mpic_u3msi.c | 8 +- arch/powerpc/sysdev/mv64x60_dev.c | 10 + arch/powerpc/sysdev/qe_lib/qe_ic.c | 14 +- arch/powerpc/sysdev/tsi108_pci.c | 3 +- arch/powerpc/sysdev/uic.c | 6 +- arch/powerpc/xmon/xmon.c | 66 +- arch/ppc/.gitignore | 1 - arch/ppc/4xx_io/Makefile | 6 - arch/ppc/4xx_io/serial_sicc.c | 2005 --------------- arch/ppc/8260_io/Kconfig | 65 - arch/ppc/8260_io/Makefile | 6 - arch/ppc/8260_io/enet.c | 865 ------- arch/ppc/8260_io/fcc_enet.c | 2379 ----------------- arch/ppc/8xx_io/Kconfig | 134 - arch/ppc/8xx_io/Makefile | 9 - arch/ppc/8xx_io/commproc.c | 432 ---- arch/ppc/8xx_io/enet.c | 982 ------- arch/ppc/8xx_io/fec.c | 1983 -------------- arch/ppc/8xx_io/micropatch.c | 743 ------ arch/ppc/Kconfig | 1186 --------- arch/ppc/Kconfig.debug | 66 - arch/ppc/Makefile | 135 - arch/ppc/boot/Makefile | 37 - arch/ppc/boot/common/Makefile | 10 - arch/ppc/boot/common/bootinfo.c | 68 - arch/ppc/boot/common/crt0.S | 80 - arch/ppc/boot/common/misc-common.c | 555 ---- arch/ppc/boot/common/ns16550.c | 103 - arch/ppc/boot/common/serial_stub.c | 21 - arch/ppc/boot/common/string.S | 150 -- arch/ppc/boot/common/util.S | 293 --- arch/ppc/boot/images/.gitignore | 6 - arch/ppc/boot/images/Makefile | 34 - arch/ppc/boot/include/cpc700.h | 26 - arch/ppc/boot/include/iso_font.h | 257 -- arch/ppc/boot/include/mpc10x.h | 63 - arch/ppc/boot/include/mpsc_defs.h | 146 -- arch/ppc/boot/include/nonstdio.h | 34 - arch/ppc/boot/include/of1275.h | 42 - arch/ppc/boot/include/rs6000.h | 243 -- arch/ppc/boot/include/serial.h | 46 - arch/ppc/boot/ld.script | 85 - arch/ppc/boot/lib/.gitignore | 3 - arch/ppc/boot/lib/Makefile | 23 - arch/ppc/boot/lib/div64.S | 58 - arch/ppc/boot/lib/kbd.c | 248 -- arch/ppc/boot/lib/vreset.c | 805 ------ arch/ppc/boot/of1275/Makefile | 6 - arch/ppc/boot/of1275/call_prom.c | 74 - arch/ppc/boot/of1275/claim.c | 92 - arch/ppc/boot/of1275/enter.c | 22 - arch/ppc/boot/of1275/exit.c | 24 - arch/ppc/boot/of1275/finddevice.c | 16 - arch/ppc/boot/of1275/getprop.c | 37 - arch/ppc/boot/of1275/map.c | 48 - arch/ppc/boot/of1275/ofinit.c | 27 - arch/ppc/boot/of1275/ofstdio.c | 32 - arch/ppc/boot/of1275/read.c | 35 - arch/ppc/boot/of1275/release.c | 30 - arch/ppc/boot/of1275/write.c | 35 - arch/ppc/boot/simple/Makefile | 277 -- arch/ppc/boot/simple/chrpmap.c | 12 - arch/ppc/boot/simple/clear.S | 19 - arch/ppc/boot/simple/cpc700_memory.c | 34 - arch/ppc/boot/simple/dummy.c | 4 - arch/ppc/boot/simple/embed_config.c | 938 ------- arch/ppc/boot/simple/head.S | 137 - arch/ppc/boot/simple/iic.c | 214 -- arch/ppc/boot/simple/m8260_tty.c | 325 --- arch/ppc/boot/simple/m8xx_tty.c | 289 --- arch/ppc/boot/simple/misc-chestnut.c | 32 - arch/ppc/boot/simple/misc-cpci690.c | 65 - arch/ppc/boot/simple/misc-embedded.c | 276 -- arch/ppc/boot/simple/misc-ev64260.c | 54 - arch/ppc/boot/simple/misc-ev64360.c | 42 - arch/ppc/boot/simple/misc-katana.c | 42 - arch/ppc/boot/simple/misc-mv64x60.c | 85 - arch/ppc/boot/simple/misc-prep.c | 209 -- arch/ppc/boot/simple/misc-radstone_ppc7d.c | 24 - arch/ppc/boot/simple/misc-spruce.c | 271 -- arch/ppc/boot/simple/misc.c | 278 -- arch/ppc/boot/simple/mpc10x_memory.c | 109 - arch/ppc/boot/simple/mpc52xx_tty.c | 137 - arch/ppc/boot/simple/mv64x60_tty.c | 364 --- arch/ppc/boot/simple/openbios.c | 128 - arch/ppc/boot/simple/pci.c | 274 -- arch/ppc/boot/simple/pibs.c | 104 - arch/ppc/boot/simple/prepmap.c | 12 - arch/ppc/boot/simple/qspan_pci.c | 269 -- arch/ppc/boot/simple/relocate.S | 213 -- arch/ppc/boot/simple/rw4/ppc_40x.h | 664 ----- arch/ppc/boot/simple/rw4/rw4_init.S | 78 - arch/ppc/boot/simple/rw4/rw4_init_brd.S | 1125 -------- arch/ppc/boot/simple/rw4/stb.h | 239 -- arch/ppc/boot/simple/uartlite_tty.c | 45 - arch/ppc/boot/utils/.gitignore | 3 - arch/ppc/boot/utils/elf.pl | 33 - arch/ppc/boot/utils/mkbugboot.c | 147 -- arch/ppc/boot/utils/mkprep.c | 241 -- arch/ppc/boot/utils/mktree.c | 152 -- arch/ppc/configs/FADS_defconfig | 520 ---- arch/ppc/configs/IVMS8_defconfig | 548 ---- arch/ppc/configs/TQM823L_defconfig | 521 ---- arch/ppc/configs/TQM8260_defconfig | 499 ---- arch/ppc/configs/TQM850L_defconfig | 521 ---- arch/ppc/configs/TQM860L_defconfig | 549 ---- arch/ppc/configs/bamboo_defconfig | 944 ------- arch/ppc/configs/bseip_defconfig | 517 ---- arch/ppc/configs/bubinga_defconfig | 592 ----- arch/ppc/configs/chestnut_defconfig | 794 ------ arch/ppc/configs/cpci405_defconfig | 631 ----- arch/ppc/configs/cpci690_defconfig | 798 ------ arch/ppc/configs/ebony_defconfig | 585 ----- arch/ppc/configs/ep405_defconfig | 572 ---- arch/ppc/configs/est8260_defconfig | 491 ---- arch/ppc/configs/ev64260_defconfig | 758 ------ arch/ppc/configs/ev64360_defconfig | 817 ------ arch/ppc/configs/hdpu_defconfig | 890 ------- arch/ppc/configs/katana_defconfig | 948 ------- arch/ppc/configs/lite5200_defconfig | 436 ---- arch/ppc/configs/lopec_defconfig | 814 ------ arch/ppc/configs/luan_defconfig | 668 ----- arch/ppc/configs/mbx_defconfig | 512 ---- arch/ppc/configs/ml300_defconfig | 739 ------ arch/ppc/configs/ml403_defconfig | 740 ------ arch/ppc/configs/mvme5100_defconfig | 746 ------ arch/ppc/configs/ocotea_defconfig | 599 ----- arch/ppc/configs/pplus_defconfig | 720 ------ arch/ppc/configs/prep_defconfig | 1679 ------------ arch/ppc/configs/prpmc750_defconfig | 594 ----- arch/ppc/configs/prpmc800_defconfig | 656 ----- arch/ppc/configs/radstone_ppc7d_defconfig | 991 ------- arch/ppc/configs/redwood5_defconfig | 557 ---- arch/ppc/configs/redwood6_defconfig | 535 ---- arch/ppc/configs/rpx8260_defconfig | 555 ---- arch/ppc/configs/rpxcllf_defconfig | 582 ----- arch/ppc/configs/rpxlite_defconfig | 581 ----- arch/ppc/configs/sandpoint_defconfig | 737 ------ arch/ppc/configs/spruce_defconfig | 577 ----- arch/ppc/configs/sycamore_defconfig | 663 ----- arch/ppc/configs/taishan_defconfig | 1077 -------- arch/ppc/configs/walnut_defconfig | 578 ----- arch/ppc/kernel/Makefile | 21 - arch/ppc/kernel/asm-offsets.c | 164 -- arch/ppc/kernel/cpu_setup_power4.S | 197 -- arch/ppc/kernel/entry.S | 960 ------- arch/ppc/kernel/head.S | 1220 --------- arch/ppc/kernel/head_44x.S | 769 ------ arch/ppc/kernel/head_4xx.S | 1021 -------- arch/ppc/kernel/head_8xx.S | 959 ------- arch/ppc/kernel/head_booke.h | 308 --- arch/ppc/kernel/machine_kexec.c | 118 - arch/ppc/kernel/misc.S | 868 ------- arch/ppc/kernel/pci.c | 1233 --------- arch/ppc/kernel/ppc-stub.c | 866 ------- arch/ppc/kernel/ppc_htab.c | 464 ---- arch/ppc/kernel/ppc_ksyms.c | 258 -- arch/ppc/kernel/relocate_kernel.S | 123 - arch/ppc/kernel/setup.c | 572 ---- arch/ppc/kernel/smp-tbsync.c | 180 -- arch/ppc/kernel/smp.c | 414 --- arch/ppc/kernel/softemu8xx.c | 147 -- arch/ppc/kernel/time.c | 445 ---- arch/ppc/kernel/traps.c | 826 ------ arch/ppc/kernel/vmlinux.lds.S | 164 -- arch/ppc/lib/Makefile | 5 - arch/ppc/lib/checksum.S | 225 -- arch/ppc/lib/div64.S | 58 - arch/ppc/lib/locks.c | 189 -- arch/ppc/lib/string.S | 732 ------ arch/ppc/mm/44x_mmu.c | 101 - arch/ppc/mm/4xx_mmu.c | 135 - arch/ppc/mm/Makefile | 10 - arch/ppc/mm/fault.c | 436 ---- arch/ppc/mm/hashtable.S | 617 ----- arch/ppc/mm/init.c | 603 ----- arch/ppc/mm/mem_pieces.c | 162 -- arch/ppc/mm/mem_pieces.h | 48 - arch/ppc/mm/mmu_context.c | 85 - arch/ppc/mm/mmu_decl.h | 79 - arch/ppc/mm/pgtable.c | 403 --- arch/ppc/mm/ppc_mmu.c | 269 -- arch/ppc/mm/tlb.c | 183 -- arch/ppc/platforms/4xx/Kconfig | 285 -- arch/ppc/platforms/4xx/Makefile | 31 - arch/ppc/platforms/4xx/bamboo.c | 442 ---- arch/ppc/platforms/4xx/bamboo.h | 133 - arch/ppc/platforms/4xx/bubinga.c | 265 -- arch/ppc/platforms/4xx/bubinga.h | 54 - arch/ppc/platforms/4xx/cpci405.c | 201 -- arch/ppc/platforms/4xx/cpci405.h | 28 - arch/ppc/platforms/4xx/ebony.c | 334 --- arch/ppc/platforms/4xx/ebony.h | 97 - arch/ppc/platforms/4xx/ep405.c | 196 -- arch/ppc/platforms/4xx/ep405.h | 52 - arch/ppc/platforms/4xx/ibm405ep.c | 141 - arch/ppc/platforms/4xx/ibm405ep.h | 145 -- arch/ppc/platforms/4xx/ibm405gp.c | 120 - arch/ppc/platforms/4xx/ibm405gp.h | 148 -- arch/ppc/platforms/4xx/ibm405gpr.c | 115 - arch/ppc/platforms/4xx/ibm405gpr.h | 148 -- arch/ppc/platforms/4xx/ibm440ep.c | 220 -- arch/ppc/platforms/4xx/ibm440ep.h | 73 - arch/ppc/platforms/4xx/ibm440gp.c | 163 -- arch/ppc/platforms/4xx/ibm440gp.h | 63 - arch/ppc/platforms/4xx/ibm440gx.c | 231 -- arch/ppc/platforms/4xx/ibm440gx.h | 71 - arch/ppc/platforms/4xx/ibm440sp.c | 129 - arch/ppc/platforms/4xx/ibm440sp.h | 61 - arch/ppc/platforms/4xx/ibmnp405h.c | 170 -- arch/ppc/platforms/4xx/ibmnp405h.h | 154 -- arch/ppc/platforms/4xx/ibmstb4.c | 122 - arch/ppc/platforms/4xx/ibmstb4.h | 235 -- arch/ppc/platforms/4xx/ibmstbx25.c | 66 - arch/ppc/platforms/4xx/ibmstbx25.h | 258 -- arch/ppc/platforms/4xx/luan.c | 371 --- arch/ppc/platforms/4xx/luan.h | 77 - arch/ppc/platforms/4xx/ocotea.c | 350 --- arch/ppc/platforms/4xx/ocotea.h | 94 - arch/ppc/platforms/4xx/ppc440spe.c | 146 -- arch/ppc/platforms/4xx/ppc440spe.h | 63 - arch/ppc/platforms/4xx/redwood5.c | 120 - arch/ppc/platforms/4xx/redwood5.h | 52 - arch/ppc/platforms/4xx/redwood6.c | 156 -- arch/ppc/platforms/4xx/redwood6.h | 53 - arch/ppc/platforms/4xx/sycamore.c | 272 -- arch/ppc/platforms/4xx/sycamore.h | 49 - arch/ppc/platforms/4xx/taishan.c | 395 --- arch/ppc/platforms/4xx/taishan.h | 67 - arch/ppc/platforms/4xx/virtex.h | 35 - arch/ppc/platforms/4xx/walnut.c | 246 -- arch/ppc/platforms/4xx/walnut.h | 52 - arch/ppc/platforms/4xx/xilinx_ml300.c | 118 - arch/ppc/platforms/4xx/xilinx_ml403.c | 120 - arch/ppc/platforms/4xx/xparameters/xparameters.h | 104 - .../platforms/4xx/xparameters/xparameters_ml300.h | 310 --- .../platforms/4xx/xparameters/xparameters_ml403.h | 243 -- arch/ppc/platforms/4xx/yucca.c | 393 --- arch/ppc/platforms/4xx/yucca.h | 108 - arch/ppc/platforms/Makefile | 25 - arch/ppc/platforms/bseip.h | 38 - arch/ppc/platforms/ccm.h | 27 - arch/ppc/platforms/chestnut.c | 574 ----- arch/ppc/platforms/chestnut.h | 127 - arch/ppc/platforms/cpci690.c | 453 ---- arch/ppc/platforms/cpci690.h | 74 - arch/ppc/platforms/est8260.h | 35 - arch/ppc/platforms/ev64260.c | 649 ----- arch/ppc/platforms/ev64260.h | 126 - arch/ppc/platforms/ev64360.c | 517 ---- arch/ppc/platforms/ev64360.h | 114 - arch/ppc/platforms/fads.h | 130 - arch/ppc/platforms/hdpu.c | 1015 -------- arch/ppc/platforms/hdpu.h | 80 - arch/ppc/platforms/hermes.h | 26 - arch/ppc/platforms/ip860.h | 35 - arch/ppc/platforms/ivms8.h | 55 - arch/ppc/platforms/katana.c | 902 ------- arch/ppc/platforms/katana.h | 253 -- arch/ppc/platforms/lantec.h | 20 - arch/ppc/platforms/lite5200.c | 245 -- arch/ppc/platforms/lite5200.h | 21 - arch/ppc/platforms/lopec.c | 310 --- arch/ppc/platforms/lopec.h | 39 - arch/ppc/platforms/lwmon.h | 59 - arch/ppc/platforms/mbx.h | 117 - arch/ppc/platforms/mpc866ads_setup.c | 413 --- arch/ppc/platforms/mvme5100.c | 340 --- arch/ppc/platforms/mvme5100.h | 91 - arch/ppc/platforms/pal4.h | 40 - arch/ppc/platforms/pal4_pci.c | 75 - arch/ppc/platforms/pal4_serial.h | 37 - arch/ppc/platforms/pal4_setup.c | 173 -- arch/ppc/platforms/pcu_e.h | 27 - arch/ppc/platforms/powerpmc250.c | 378 --- arch/ppc/platforms/powerpmc250.h | 52 - arch/ppc/platforms/pplus.c | 844 ------ arch/ppc/platforms/pplus.h | 65 - arch/ppc/platforms/prep_pci.c | 1339 ---------- arch/ppc/platforms/prep_setup.c | 1043 -------- arch/ppc/platforms/prpmc750.c | 360 --- arch/ppc/platforms/prpmc750.h | 95 - arch/ppc/platforms/prpmc800.c | 472 ---- arch/ppc/platforms/prpmc800.h | 82 - arch/ppc/platforms/radstone_ppc7d.c | 1492 ----------- arch/ppc/platforms/radstone_ppc7d.h | 433 ---- arch/ppc/platforms/residual.c | 1034 -------- arch/ppc/platforms/rpx8260.h | 81 - arch/ppc/platforms/rpxclassic.h | 114 - arch/ppc/platforms/rpxlite.h | 91 - arch/ppc/platforms/sandpoint.c | 651 ----- arch/ppc/platforms/sandpoint.h | 75 - arch/ppc/platforms/sbc82xx.c | 256 -- arch/ppc/platforms/sbc82xx.h | 36 - arch/ppc/platforms/sbs8260.h | 28 - arch/ppc/platforms/spruce.c | 322 --- arch/ppc/platforms/spruce.h | 71 - arch/ppc/platforms/tqm8260.h | 22 - arch/ppc/platforms/tqm8260_setup.c | 42 - arch/ppc/platforms/tqm8xx.h | 155 -- arch/ppc/syslib/Makefile | 96 - arch/ppc/syslib/btext.c | 860 ------- arch/ppc/syslib/cpc700.h | 96 - arch/ppc/syslib/cpc700_pic.c | 181 -- arch/ppc/syslib/cpm2_common.c | 196 -- arch/ppc/syslib/cpm2_pic.c | 177 -- arch/ppc/syslib/cpm2_pic.h | 8 - arch/ppc/syslib/gen550.h | 14 - arch/ppc/syslib/gen550_dbg.c | 179 -- arch/ppc/syslib/gen550_kgdb.c | 83 - arch/ppc/syslib/gt64260_pic.c | 323 --- arch/ppc/syslib/harrier.c | 300 --- arch/ppc/syslib/hawk_common.c | 317 --- arch/ppc/syslib/i8259.c | 213 -- arch/ppc/syslib/ibm440gp_common.c | 73 - arch/ppc/syslib/ibm440gp_common.h | 32 - arch/ppc/syslib/ibm440gx_common.c | 294 --- arch/ppc/syslib/ibm440gx_common.h | 58 - arch/ppc/syslib/ibm440sp_common.c | 68 - arch/ppc/syslib/ibm440sp_common.h | 23 - arch/ppc/syslib/ibm44x_common.c | 235 -- arch/ppc/syslib/ibm44x_common.h | 45 - arch/ppc/syslib/ibm_ocp.c | 10 - arch/ppc/syslib/indirect_pci.c | 134 - arch/ppc/syslib/m8260_pci_erratum9.c | 455 ---- arch/ppc/syslib/m8260_setup.c | 266 -- arch/ppc/syslib/m82xx_pci.c | 346 --- arch/ppc/syslib/m82xx_pci.h | 92 - arch/ppc/syslib/m8xx_setup.c | 465 ---- arch/ppc/syslib/m8xx_wdt.c | 148 -- arch/ppc/syslib/m8xx_wdt.h | 20 - arch/ppc/syslib/mpc10x_common.c | 654 ----- arch/ppc/syslib/mpc52xx_devices.c | 317 --- arch/ppc/syslib/mpc52xx_pci.c | 289 --- arch/ppc/syslib/mpc52xx_pci.h | 137 - arch/ppc/syslib/mpc52xx_pic.c | 254 -- arch/ppc/syslib/mpc52xx_setup.c | 313 --- arch/ppc/syslib/mpc52xx_sys.c | 36 - arch/ppc/syslib/mpc8xx_devices.c | 243 -- arch/ppc/syslib/mpc8xx_sys.c | 61 - arch/ppc/syslib/mv64360_pic.c | 423 --- arch/ppc/syslib/mv64x60.c | 2485 ------------------ arch/ppc/syslib/mv64x60_dbg.c | 121 - arch/ppc/syslib/mv64x60_win.c | 1165 --------- arch/ppc/syslib/ocp.c | 482 ---- arch/ppc/syslib/open_pic.c | 1087 -------- arch/ppc/syslib/open_pic2.c | 710 ----- arch/ppc/syslib/open_pic_defs.h | 287 -- arch/ppc/syslib/pci_auto.c | 515 ---- arch/ppc/syslib/ppc403_pic.c | 125 - arch/ppc/syslib/ppc405_pci.c | 170 -- arch/ppc/syslib/ppc440spe_pcie.c | 441 ---- arch/ppc/syslib/ppc440spe_pcie.h | 149 -- arch/ppc/syslib/ppc4xx_dma.c | 710 ----- arch/ppc/syslib/ppc4xx_pic.c | 284 -- arch/ppc/syslib/ppc4xx_setup.c | 271 -- arch/ppc/syslib/ppc4xx_sgdma.c | 464 ---- arch/ppc/syslib/ppc8xx_pic.c | 126 - arch/ppc/syslib/ppc8xx_pic.h | 19 - arch/ppc/syslib/ppc_sys.c | 329 --- arch/ppc/syslib/pq2_devices.c | 393 --- arch/ppc/syslib/pq2_sys.c | 203 -- arch/ppc/syslib/prep_nvram.c | 135 - arch/ppc/syslib/qspan_pci.c | 380 --- arch/ppc/syslib/todc_time.c | 511 ---- arch/ppc/syslib/virtex_devices.c | 276 -- arch/ppc/syslib/virtex_devices.h | 35 - arch/ppc/syslib/xilinx_pic.c | 153 -- arch/ppc/xmon/Makefile | 8 - arch/ppc/xmon/ansidecl.h | 141 - arch/ppc/xmon/nonstdio.h | 22 - arch/ppc/xmon/ppc-dis.c | 190 -- arch/ppc/xmon/ppc-opc.c | 2720 -------------------- arch/ppc/xmon/ppc.h | 240 -- arch/ppc/xmon/privinst.h | 90 - arch/ppc/xmon/setjmp.c | 29 - arch/ppc/xmon/start.c | 342 --- arch/ppc/xmon/start_8xx.c | 287 -- arch/ppc/xmon/subr_prf.c | 55 - arch/ppc/xmon/xmon.c | 1780 ------------- drivers/char/hvc_console.c | 8 +- drivers/char/hvc_console.h | 10 + drivers/macintosh/macio_sysfs.c | 12 +- drivers/net/Kconfig | 1 - drivers/net/Makefile | 1 - drivers/net/fec_8xx/Kconfig | 20 - drivers/net/fec_8xx/Makefile | 12 - drivers/net/fec_8xx/fec_8xx-netta.c | 151 -- drivers/net/fec_8xx/fec_8xx.h | 220 -- drivers/net/fec_8xx/fec_main.c | 1264 --------- drivers/net/fec_8xx/fec_mii.c | 418 --- drivers/of/device.c | 84 +- drivers/of/gpio.c | 38 +- drivers/of/platform.c | 3 + drivers/serial/of_serial.c | 2 +- drivers/video/platinumfb.c | 4 +- include/asm-powerpc/dcr-generic.h | 49 + include/asm-powerpc/dcr-mmio.h | 20 +- include/asm-powerpc/dcr-native.h | 16 +- include/asm-powerpc/dcr.h | 39 +- include/asm-powerpc/io.h | 57 +- include/asm-powerpc/ioctl.h | 58 +- include/asm-powerpc/irq.h | 13 + include/asm-powerpc/mmu-hash64.h | 1 + include/asm-powerpc/mpc6xx.h | 6 + include/asm-powerpc/mpic.h | 2 + include/asm-powerpc/of_device.h | 2 - include/asm-powerpc/ppc_asm.h | 6 + include/asm-powerpc/processor.h | 4 + include/asm-powerpc/ptrace.h | 1 + include/asm-powerpc/smp.h | 2 + include/asm-powerpc/system.h | 1 + include/asm-powerpc/thread_info.h | 19 +- include/asm-powerpc/time.h | 1 + include/asm-powerpc/xmon.h | 9 + include/asm-ppc/8xx_immap.h | 564 ---- include/asm-ppc/amigayle.h | 1 - include/asm-ppc/amipcmcia.h | 1 - include/asm-ppc/bootinfo.h | 46 - include/asm-ppc/bootx.h | 135 - include/asm-ppc/btext.h | 34 - include/asm-ppc/cpm1.h | 688 ----- include/asm-ppc/cpm2.h | 1248 --------- include/asm-ppc/delay.h | 66 - include/asm-ppc/device.h | 7 - include/asm-ppc/floppy.h | 178 -- include/asm-ppc/fs_pd.h | 36 - include/asm-ppc/gg2.h | 61 - include/asm-ppc/gt64260.h | 322 --- include/asm-ppc/gt64260_defs.h | 1010 -------- include/asm-ppc/harrier.h | 43 - include/asm-ppc/hawk.h | 32 - include/asm-ppc/hawk_defs.h | 76 - include/asm-ppc/highmem.h | 135 - include/asm-ppc/hydra.h | 102 - include/asm-ppc/ibm403.h | 478 ---- include/asm-ppc/ibm405.h | 299 --- include/asm-ppc/ibm44x.h | 674 ----- include/asm-ppc/ibm4xx.h | 124 - include/asm-ppc/ibm_ocp.h | 204 -- include/asm-ppc/ibm_ocp_pci.h | 32 - include/asm-ppc/immap_cpm2.h | 648 ----- include/asm-ppc/io.h | 502 ---- include/asm-ppc/irq_regs.h | 1 - include/asm-ppc/kdebug.h | 1 - include/asm-ppc/kgdb.h | 57 - include/asm-ppc/m8260_pci.h | 187 -- include/asm-ppc/machdep.h | 178 -- include/asm-ppc/md.h | 15 - include/asm-ppc/mk48t59.h | 27 - include/asm-ppc/mmu.h | 444 ---- include/asm-ppc/mmu_context.h | 198 -- include/asm-ppc/mpc10x.h | 180 -- include/asm-ppc/mpc52xx.h | 450 ---- include/asm-ppc/mpc52xx_psc.h | 200 -- include/asm-ppc/mpc8260.h | 98 - include/asm-ppc/mpc8260_pci9.h | 47 - include/asm-ppc/mpc8xx.h | 122 - include/asm-ppc/mv64x60.h | 353 --- include/asm-ppc/mv64x60_defs.h | 976 ------- include/asm-ppc/ocp.h | 204 -- include/asm-ppc/ocp_ids.h | 73 - include/asm-ppc/open_pic.h | 98 - include/asm-ppc/page.h | 140 - include/asm-ppc/pc_serial.h | 42 - include/asm-ppc/pci-bridge.h | 151 -- include/asm-ppc/pci.h | 156 -- include/asm-ppc/pgalloc.h | 45 - include/asm-ppc/pgtable.h | 771 ------ include/asm-ppc/pnp.h | 645 ----- include/asm-ppc/ppc4xx_dma.h | 579 ----- include/asm-ppc/ppc4xx_pic.h | 52 - include/asm-ppc/ppc_sys.h | 106 - include/asm-ppc/ppcboot.h | 100 - include/asm-ppc/prep_nvram.h | 153 -- include/asm-ppc/prom.h | 40 - include/asm-ppc/raven.h | 35 - include/asm-ppc/reg_booke.h | 443 ---- include/asm-ppc/residual.h | 350 --- include/asm-ppc/rtc.h | 95 - include/asm-ppc/serial.h | 43 - include/asm-ppc/smp.h | 75 - include/asm-ppc/spinlock.h | 168 -- include/asm-ppc/suspend.h | 12 - include/asm-ppc/system.h | 289 --- include/asm-ppc/time.h | 161 -- include/asm-ppc/todc.h | 488 ---- include/asm-ppc/traps.h | 1 - include/asm-ppc/zorro.h | 30 - include/linux/of_device.h | 3 + 600 files changed, 7558 insertions(+), 141488 deletions(-) create mode 100644 arch/powerpc/boot/cuboot-c2k.c create mode 100644 arch/powerpc/boot/dts/asp834x-redboot.dts create mode 100644 arch/powerpc/boot/dts/c2k.dts create mode 100644 arch/powerpc/boot/redboot-83xx.c create mode 100644 arch/powerpc/configs/asp8347_defconfig create mode 100644 arch/powerpc/configs/c2k_defconfig create mode 100644 arch/powerpc/platforms/83xx/asp834x.c create mode 100644 arch/powerpc/platforms/embedded6xx/c2k.c create mode 100644 arch/powerpc/sysdev/6xx-suspend.S create mode 100644 arch/powerpc/sysdev/fsl_msi.c create mode 100644 arch/powerpc/sysdev/fsl_msi.h delete mode 100644 arch/ppc/.gitignore delete mode 100644 arch/ppc/4xx_io/Makefile delete mode 100644 arch/ppc/4xx_io/serial_sicc.c delete mode 100644 arch/ppc/8260_io/Kconfig delete mode 100644 arch/ppc/8260_io/Makefile delete mode 100644 arch/ppc/8260_io/enet.c delete mode 100644 arch/ppc/8260_io/fcc_enet.c delete mode 100644 arch/ppc/8xx_io/Kconfig delete mode 100644 arch/ppc/8xx_io/Makefile delete mode 100644 arch/ppc/8xx_io/commproc.c delete mode 100644 arch/ppc/8xx_io/enet.c delete mode 100644 arch/ppc/8xx_io/fec.c delete mode 100644 arch/ppc/8xx_io/micropatch.c delete mode 100644 arch/ppc/Kconfig delete mode 100644 arch/ppc/Kconfig.debug delete mode 100644 arch/ppc/Makefile delete mode 100644 arch/ppc/boot/Makefile delete mode 100644 arch/ppc/boot/common/Makefile delete mode 100644 arch/ppc/boot/common/bootinfo.c delete mode 100644 arch/ppc/boot/common/crt0.S delete mode 100644 arch/ppc/boot/common/misc-common.c delete mode 100644 arch/ppc/boot/common/ns16550.c delete mode 100644 arch/ppc/boot/common/serial_stub.c delete mode 100644 arch/ppc/boot/common/string.S delete mode 100644 arch/ppc/boot/common/util.S delete mode 100644 arch/ppc/boot/images/.gitignore delete mode 100644 arch/ppc/boot/images/Makefile delete mode 100644 arch/ppc/boot/include/cpc700.h delete mode 100644 arch/ppc/boot/include/iso_font.h delete mode 100644 arch/ppc/boot/include/mpc10x.h delete mode 100644 arch/ppc/boot/include/mpsc_defs.h delete mode 100644 arch/ppc/boot/include/nonstdio.h delete mode 100644 arch/ppc/boot/include/of1275.h delete mode 100644 arch/ppc/boot/include/rs6000.h delete mode 100644 arch/ppc/boot/include/serial.h delete mode 100644 arch/ppc/boot/ld.script delete mode 100644 arch/ppc/boot/lib/.gitignore delete mode 100644 arch/ppc/boot/lib/Makefile delete mode 100644 arch/ppc/boot/lib/div64.S delete mode 100644 arch/ppc/boot/lib/kbd.c delete mode 100644 arch/ppc/boot/lib/vreset.c delete mode 100644 arch/ppc/boot/of1275/Makefile delete mode 100644 arch/ppc/boot/of1275/call_prom.c delete mode 100644 arch/ppc/boot/of1275/claim.c delete mode 100644 arch/ppc/boot/of1275/enter.c delete mode 100644 arch/ppc/boot/of1275/exit.c delete mode 100644 arch/ppc/boot/of1275/finddevice.c delete mode 100644 arch/ppc/boot/of1275/getprop.c delete mode 100644 arch/ppc/boot/of1275/map.c delete mode 100644 arch/ppc/boot/of1275/ofinit.c delete mode 100644 arch/ppc/boot/of1275/ofstdio.c delete mode 100644 arch/ppc/boot/of1275/read.c delete mode 100644 arch/ppc/boot/of1275/release.c delete mode 100644 arch/ppc/boot/of1275/write.c delete mode 100644 arch/ppc/boot/simple/Makefile delete mode 100644 arch/ppc/boot/simple/chrpmap.c delete mode 100644 arch/ppc/boot/simple/clear.S delete mode 100644 arch/ppc/boot/simple/cpc700_memory.c delete mode 100644 arch/ppc/boot/simple/dummy.c delete mode 100644 arch/ppc/boot/simple/embed_config.c delete mode 100644 arch/ppc/boot/simple/head.S delete mode 100644 arch/ppc/boot/simple/iic.c delete mode 100644 arch/ppc/boot/simple/m8260_tty.c delete mode 100644 arch/ppc/boot/simple/m8xx_tty.c delete mode 100644 arch/ppc/boot/simple/misc-chestnut.c delete mode 100644 arch/ppc/boot/simple/misc-cpci690.c delete mode 100644 arch/ppc/boot/simple/misc-embedded.c delete mode 100644 arch/ppc/boot/simple/misc-ev64260.c delete mode 100644 arch/ppc/boot/simple/misc-ev64360.c delete mode 100644 arch/ppc/boot/simple/misc-katana.c delete mode 100644 arch/ppc/boot/simple/misc-mv64x60.c delete mode 100644 arch/ppc/boot/simple/misc-prep.c delete mode 100644 arch/ppc/boot/simple/misc-radstone_ppc7d.c delete mode 100644 arch/ppc/boot/simple/misc-spruce.c delete mode 100644 arch/ppc/boot/simple/misc.c delete mode 100644 arch/ppc/boot/simple/mpc10x_memory.c delete mode 100644 arch/ppc/boot/simple/mpc52xx_tty.c delete mode 100644 arch/ppc/boot/simple/mv64x60_tty.c delete mode 100644 arch/ppc/boot/simple/openbios.c delete mode 100644 arch/ppc/boot/simple/pci.c delete mode 100644 arch/ppc/boot/simple/pibs.c delete mode 100644 arch/ppc/boot/simple/prepmap.c delete mode 100644 arch/ppc/boot/simple/qspan_pci.c delete mode 100644 arch/ppc/boot/simple/relocate.S delete mode 100644 arch/ppc/boot/simple/rw4/ppc_40x.h delete mode 100644 arch/ppc/boot/simple/rw4/rw4_init.S delete mode 100644 arch/ppc/boot/simple/rw4/rw4_init_brd.S delete mode 100644 arch/ppc/boot/simple/rw4/stb.h delete mode 100644 arch/ppc/boot/simple/uartlite_tty.c delete mode 100644 arch/ppc/boot/utils/.gitignore delete mode 100644 arch/ppc/boot/utils/elf.pl delete mode 100644 arch/ppc/boot/utils/mkbugboot.c delete mode 100644 arch/ppc/boot/utils/mkprep.c delete mode 100644 arch/ppc/boot/utils/mktree.c delete mode 100644 arch/ppc/configs/FADS_defconfig delete mode 100644 arch/ppc/configs/IVMS8_defconfig delete mode 100644 arch/ppc/configs/TQM823L_defconfig delete mode 100644 arch/ppc/configs/TQM8260_defconfig delete mode 100644 arch/ppc/configs/TQM850L_defconfig delete mode 100644 arch/ppc/configs/TQM860L_defconfig delete mode 100644 arch/ppc/configs/bamboo_defconfig delete mode 100644 arch/ppc/configs/bseip_defconfig delete mode 100644 arch/ppc/configs/bubinga_defconfig delete mode 100644 arch/ppc/configs/chestnut_defconfig delete mode 100644 arch/ppc/configs/cpci405_defconfig delete mode 100644 arch/ppc/configs/cpci690_defconfig delete mode 100644 arch/ppc/configs/ebony_defconfig delete mode 100644 arch/ppc/configs/ep405_defconfig delete mode 100644 arch/ppc/configs/est8260_defconfig delete mode 100644 arch/ppc/configs/ev64260_defconfig delete mode 100644 arch/ppc/configs/ev64360_defconfig delete mode 100644 arch/ppc/configs/hdpu_defconfig delete mode 100644 arch/ppc/configs/katana_defconfig delete mode 100644 arch/ppc/configs/lite5200_defconfig delete mode 100644 arch/ppc/configs/lopec_defconfig delete mode 100644 arch/ppc/configs/luan_defconfig delete mode 100644 arch/ppc/configs/mbx_defconfig delete mode 100644 arch/ppc/configs/ml300_defconfig delete mode 100644 arch/ppc/configs/ml403_defconfig delete mode 100644 arch/ppc/configs/mvme5100_defconfig delete mode 100644 arch/ppc/configs/ocotea_defconfig delete mode 100644 arch/ppc/configs/pplus_defconfig delete mode 100644 arch/ppc/configs/prep_defconfig delete mode 100644 arch/ppc/configs/prpmc750_defconfig delete mode 100644 arch/ppc/configs/prpmc800_defconfig delete mode 100644 arch/ppc/configs/radstone_ppc7d_defconfig delete mode 100644 arch/ppc/configs/redwood5_defconfig delete mode 100644 arch/ppc/configs/redwood6_defconfig delete mode 100644 arch/ppc/configs/rpx8260_defconfig delete mode 100644 arch/ppc/configs/rpxcllf_defconfig delete mode 100644 arch/ppc/configs/rpxlite_defconfig delete mode 100644 arch/ppc/configs/sandpoint_defconfig delete mode 100644 arch/ppc/configs/spruce_defconfig delete mode 100644 arch/ppc/configs/sycamore_defconfig delete mode 100644 arch/ppc/configs/taishan_defconfig delete mode 100644 arch/ppc/configs/walnut_defconfig delete mode 100644 arch/ppc/kernel/Makefile delete mode 100644 arch/ppc/kernel/asm-offsets.c delete mode 100644 arch/ppc/kernel/cpu_setup_power4.S delete mode 100644 arch/ppc/kernel/entry.S delete mode 100644 arch/ppc/kernel/head.S delete mode 100644 arch/ppc/kernel/head_44x.S delete mode 100644 arch/ppc/kernel/head_4xx.S delete mode 100644 arch/ppc/kernel/head_8xx.S delete mode 100644 arch/ppc/kernel/head_booke.h delete mode 100644 arch/ppc/kernel/machine_kexec.c delete mode 100644 arch/ppc/kernel/misc.S delete mode 100644 arch/ppc/kernel/pci.c delete mode 100644 arch/ppc/kernel/ppc-stub.c delete mode 100644 arch/ppc/kernel/ppc_htab.c delete mode 100644 arch/ppc/kernel/ppc_ksyms.c delete mode 100644 arch/ppc/kernel/relocate_kernel.S delete mode 100644 arch/ppc/kernel/setup.c delete mode 100644 arch/ppc/kernel/smp-tbsync.c delete mode 100644 arch/ppc/kernel/smp.c delete mode 100644 arch/ppc/kernel/softemu8xx.c delete mode 100644 arch/ppc/kernel/time.c delete mode 100644 arch/ppc/kernel/traps.c delete mode 100644 arch/ppc/kernel/vmlinux.lds.S delete mode 100644 arch/ppc/lib/Makefile delete mode 100644 arch/ppc/lib/checksum.S delete mode 100644 arch/ppc/lib/div64.S delete mode 100644 arch/ppc/lib/locks.c delete mode 100644 arch/ppc/lib/string.S delete mode 100644 arch/ppc/mm/44x_mmu.c delete mode 100644 arch/ppc/mm/4xx_mmu.c delete mode 100644 arch/ppc/mm/Makefile delete mode 100644 arch/ppc/mm/fault.c delete mode 100644 arch/ppc/mm/hashtable.S delete mode 100644 arch/ppc/mm/init.c delete mode 100644 arch/ppc/mm/mem_pieces.c delete mode 100644 arch/ppc/mm/mem_pieces.h delete mode 100644 arch/ppc/mm/mmu_context.c delete mode 100644 arch/ppc/mm/mmu_decl.h delete mode 100644 arch/ppc/mm/pgtable.c delete mode 100644 arch/ppc/mm/ppc_mmu.c delete mode 100644 arch/ppc/mm/tlb.c delete mode 100644 arch/ppc/platforms/4xx/Kconfig delete mode 100644 arch/ppc/platforms/4xx/Makefile delete mode 100644 arch/ppc/platforms/4xx/bamboo.c delete mode 100644 arch/ppc/platforms/4xx/bamboo.h delete mode 100644 arch/ppc/platforms/4xx/bubinga.c delete mode 100644 arch/ppc/platforms/4xx/bubinga.h delete mode 100644 arch/ppc/platforms/4xx/cpci405.c delete mode 100644 arch/ppc/platforms/4xx/cpci405.h delete mode 100644 arch/ppc/platforms/4xx/ebony.c delete mode 100644 arch/ppc/platforms/4xx/ebony.h delete mode 100644 arch/ppc/platforms/4xx/ep405.c delete mode 100644 arch/ppc/platforms/4xx/ep405.h delete mode 100644 arch/ppc/platforms/4xx/ibm405ep.c delete mode 100644 arch/ppc/platforms/4xx/ibm405ep.h delete mode 100644 arch/ppc/platforms/4xx/ibm405gp.c delete mode 100644 arch/ppc/platforms/4xx/ibm405gp.h delete mode 100644 arch/ppc/platforms/4xx/ibm405gpr.c delete mode 100644 arch/ppc/platforms/4xx/ibm405gpr.h delete mode 100644 arch/ppc/platforms/4xx/ibm440ep.c delete mode 100644 arch/ppc/platforms/4xx/ibm440ep.h delete mode 100644 arch/ppc/platforms/4xx/ibm440gp.c delete mode 100644 arch/ppc/platforms/4xx/ibm440gp.h delete mode 100644 arch/ppc/platforms/4xx/ibm440gx.c delete mode 100644 arch/ppc/platforms/4xx/ibm440gx.h delete mode 100644 arch/ppc/platforms/4xx/ibm440sp.c delete mode 100644 arch/ppc/platforms/4xx/ibm440sp.h delete mode 100644 arch/ppc/platforms/4xx/ibmnp405h.c delete mode 100644 arch/ppc/platforms/4xx/ibmnp405h.h delete mode 100644 arch/ppc/platforms/4xx/ibmstb4.c delete mode 100644 arch/ppc/platforms/4xx/ibmstb4.h delete mode 100644 arch/ppc/platforms/4xx/ibmstbx25.c delete mode 100644 arch/ppc/platforms/4xx/ibmstbx25.h delete mode 100644 arch/ppc/platforms/4xx/luan.c delete mode 100644 arch/ppc/platforms/4xx/luan.h delete mode 100644 arch/ppc/platforms/4xx/ocotea.c delete mode 100644 arch/ppc/platforms/4xx/ocotea.h delete mode 100644 arch/ppc/platforms/4xx/ppc440spe.c delete mode 100644 arch/ppc/platforms/4xx/ppc440spe.h delete mode 100644 arch/ppc/platforms/4xx/redwood5.c delete mode 100644 arch/ppc/platforms/4xx/redwood5.h delete mode 100644 arch/ppc/platforms/4xx/redwood6.c delete mode 100644 arch/ppc/platforms/4xx/redwood6.h delete mode 100644 arch/ppc/platforms/4xx/sycamore.c delete mode 100644 arch/ppc/platforms/4xx/sycamore.h delete mode 100644 arch/ppc/platforms/4xx/taishan.c delete mode 100644 arch/ppc/platforms/4xx/taishan.h delete mode 100644 arch/ppc/platforms/4xx/virtex.h delete mode 100644 arch/ppc/platforms/4xx/walnut.c delete mode 100644 arch/ppc/platforms/4xx/walnut.h delete mode 100644 arch/ppc/platforms/4xx/xilinx_ml300.c delete mode 100644 arch/ppc/platforms/4xx/xilinx_ml403.c delete mode 100644 arch/ppc/platforms/4xx/xparameters/xparameters.h delete mode 100644 arch/ppc/platforms/4xx/xparameters/xparameters_ml300.h delete mode 100644 arch/ppc/platforms/4xx/xparameters/xparameters_ml403.h delete mode 100644 arch/ppc/platforms/4xx/yucca.c delete mode 100644 arch/ppc/platforms/4xx/yucca.h delete mode 100644 arch/ppc/platforms/Makefile delete mode 100644 arch/ppc/platforms/bseip.h delete mode 100644 arch/ppc/platforms/ccm.h delete mode 100644 arch/ppc/platforms/chestnut.c delete mode 100644 arch/ppc/platforms/chestnut.h delete mode 100644 arch/ppc/platforms/cpci690.c delete mode 100644 arch/ppc/platforms/cpci690.h delete mode 100644 arch/ppc/platforms/est8260.h delete mode 100644 arch/ppc/platforms/ev64260.c delete mode 100644 arch/ppc/platforms/ev64260.h delete mode 100644 arch/ppc/platforms/ev64360.c delete mode 100644 arch/ppc/platforms/ev64360.h delete mode 100644 arch/ppc/platforms/fads.h delete mode 100644 arch/ppc/platforms/hdpu.c delete mode 100644 arch/ppc/platforms/hdpu.h delete mode 100644 arch/ppc/platforms/hermes.h delete mode 100644 arch/ppc/platforms/ip860.h delete mode 100644 arch/ppc/platforms/ivms8.h delete mode 100644 arch/ppc/platforms/katana.c delete mode 100644 arch/ppc/platforms/katana.h delete mode 100644 arch/ppc/platforms/lantec.h delete mode 100644 arch/ppc/platforms/lite5200.c delete mode 100644 arch/ppc/platforms/lite5200.h delete mode 100644 arch/ppc/platforms/lopec.c delete mode 100644 arch/ppc/platforms/lopec.h delete mode 100644 arch/ppc/platforms/lwmon.h delete mode 100644 arch/ppc/platforms/mbx.h delete mode 100644 arch/ppc/platforms/mpc866ads_setup.c delete mode 100644 arch/ppc/platforms/mvme5100.c delete mode 100644 arch/ppc/platforms/mvme5100.h delete mode 100644 arch/ppc/platforms/pal4.h delete mode 100644 arch/ppc/platforms/pal4_pci.c delete mode 100644 arch/ppc/platforms/pal4_serial.h delete mode 100644 arch/ppc/platforms/pal4_setup.c delete mode 100644 arch/ppc/platforms/pcu_e.h delete mode 100644 arch/ppc/platforms/powerpmc250.c delete mode 100644 arch/ppc/platforms/powerpmc250.h delete mode 100644 arch/ppc/platforms/pplus.c delete mode 100644 arch/ppc/platforms/pplus.h delete mode 100644 arch/ppc/platforms/prep_pci.c delete mode 100644 arch/ppc/platforms/prep_setup.c delete mode 100644 arch/ppc/platforms/prpmc750.c delete mode 100644 arch/ppc/platforms/prpmc750.h delete mode 100644 arch/ppc/platforms/prpmc800.c delete mode 100644 arch/ppc/platforms/prpmc800.h delete mode 100644 arch/ppc/platforms/radstone_ppc7d.c delete mode 100644 arch/ppc/platforms/radstone_ppc7d.h delete mode 100644 arch/ppc/platforms/residual.c delete mode 100644 arch/ppc/platforms/rpx8260.h delete mode 100644 arch/ppc/platforms/rpxclassic.h delete mode 100644 arch/ppc/platforms/rpxlite.h delete mode 100644 arch/ppc/platforms/sandpoint.c delete mode 100644 arch/ppc/platforms/sandpoint.h delete mode 100644 arch/ppc/platforms/sbc82xx.c delete mode 100644 arch/ppc/platforms/sbc82xx.h delete mode 100644 arch/ppc/platforms/sbs8260.h delete mode 100644 arch/ppc/platforms/spruce.c delete mode 100644 arch/ppc/platforms/spruce.h delete mode 100644 arch/ppc/platforms/tqm8260.h delete mode 100644 arch/ppc/platforms/tqm8260_setup.c delete mode 100644 arch/ppc/platforms/tqm8xx.h delete mode 100644 arch/ppc/syslib/Makefile delete mode 100644 arch/ppc/syslib/btext.c delete mode 100644 arch/ppc/syslib/cpc700.h delete mode 100644 arch/ppc/syslib/cpc700_pic.c delete mode 100644 arch/ppc/syslib/cpm2_common.c delete mode 100644 arch/ppc/syslib/cpm2_pic.c delete mode 100644 arch/ppc/syslib/cpm2_pic.h delete mode 100644 arch/ppc/syslib/gen550.h delete mode 100644 arch/ppc/syslib/gen550_dbg.c delete mode 100644 arch/ppc/syslib/gen550_kgdb.c delete mode 100644 arch/ppc/syslib/gt64260_pic.c delete mode 100644 arch/ppc/syslib/harrier.c delete mode 100644 arch/ppc/syslib/hawk_common.c delete mode 100644 arch/ppc/syslib/i8259.c delete mode 100644 arch/ppc/syslib/ibm440gp_common.c delete mode 100644 arch/ppc/syslib/ibm440gp_common.h delete mode 100644 arch/ppc/syslib/ibm440gx_common.c delete mode 100644 arch/ppc/syslib/ibm440gx_common.h delete mode 100644 arch/ppc/syslib/ibm440sp_common.c delete mode 100644 arch/ppc/syslib/ibm440sp_common.h delete mode 100644 arch/ppc/syslib/ibm44x_common.c delete mode 100644 arch/ppc/syslib/ibm44x_common.h delete mode 100644 arch/ppc/syslib/ibm_ocp.c delete mode 100644 arch/ppc/syslib/indirect_pci.c delete mode 100644 arch/ppc/syslib/m8260_pci_erratum9.c delete mode 100644 arch/ppc/syslib/m8260_setup.c delete mode 100644 arch/ppc/syslib/m82xx_pci.c delete mode 100644 arch/ppc/syslib/m82xx_pci.h delete mode 100644 arch/ppc/syslib/m8xx_setup.c delete mode 100644 arch/ppc/syslib/m8xx_wdt.c delete mode 100644 arch/ppc/syslib/m8xx_wdt.h delete mode 100644 arch/ppc/syslib/mpc10x_common.c delete mode 100644 arch/ppc/syslib/mpc52xx_devices.c delete mode 100644 arch/ppc/syslib/mpc52xx_pci.c delete mode 100644 arch/ppc/syslib/mpc52xx_pci.h delete mode 100644 arch/ppc/syslib/mpc52xx_pic.c delete mode 100644 arch/ppc/syslib/mpc52xx_setup.c delete mode 100644 arch/ppc/syslib/mpc52xx_sys.c delete mode 100644 arch/ppc/syslib/mpc8xx_devices.c delete mode 100644 arch/ppc/syslib/mpc8xx_sys.c delete mode 100644 arch/ppc/syslib/mv64360_pic.c delete mode 100644 arch/ppc/syslib/mv64x60.c delete mode 100644 arch/ppc/syslib/mv64x60_dbg.c delete mode 100644 arch/ppc/syslib/mv64x60_win.c delete mode 100644 arch/ppc/syslib/ocp.c delete mode 100644 arch/ppc/syslib/open_pic.c delete mode 100644 arch/ppc/syslib/open_pic2.c delete mode 100644 arch/ppc/syslib/open_pic_defs.h delete mode 100644 arch/ppc/syslib/pci_auto.c delete mode 100644 arch/ppc/syslib/ppc403_pic.c delete mode 100644 arch/ppc/syslib/ppc405_pci.c delete mode 100644 arch/ppc/syslib/ppc440spe_pcie.c delete mode 100644 arch/ppc/syslib/ppc440spe_pcie.h delete mode 100644 arch/ppc/syslib/ppc4xx_dma.c delete mode 100644 arch/ppc/syslib/ppc4xx_pic.c delete mode 100644 arch/ppc/syslib/ppc4xx_setup.c delete mode 100644 arch/ppc/syslib/ppc4xx_sgdma.c delete mode 100644 arch/ppc/syslib/ppc8xx_pic.c delete mode 100644 arch/ppc/syslib/ppc8xx_pic.h delete mode 100644 arch/ppc/syslib/ppc_sys.c delete mode 100644 arch/ppc/syslib/pq2_devices.c delete mode 100644 arch/ppc/syslib/pq2_sys.c delete mode 100644 arch/ppc/syslib/prep_nvram.c delete mode 100644 arch/ppc/syslib/qspan_pci.c delete mode 100644 arch/ppc/syslib/todc_time.c delete mode 100644 arch/ppc/syslib/virtex_devices.c delete mode 100644 arch/ppc/syslib/virtex_devices.h delete mode 100644 arch/ppc/syslib/xilinx_pic.c delete mode 100644 arch/ppc/xmon/Makefile delete mode 100644 arch/ppc/xmon/ansidecl.h delete mode 100644 arch/ppc/xmon/nonstdio.h delete mode 100644 arch/ppc/xmon/ppc-dis.c delete mode 100644 arch/ppc/xmon/ppc-opc.c delete mode 100644 arch/ppc/xmon/ppc.h delete mode 100644 arch/ppc/xmon/privinst.h delete mode 100644 arch/ppc/xmon/setjmp.c delete mode 100644 arch/ppc/xmon/start.c delete mode 100644 arch/ppc/xmon/start_8xx.c delete mode 100644 arch/ppc/xmon/subr_prf.c delete mode 100644 arch/ppc/xmon/xmon.c delete mode 100644 drivers/net/fec_8xx/Kconfig delete mode 100644 drivers/net/fec_8xx/Makefile delete mode 100644 drivers/net/fec_8xx/fec_8xx-netta.c delete mode 100644 drivers/net/fec_8xx/fec_8xx.h delete mode 100644 drivers/net/fec_8xx/fec_main.c delete mode 100644 drivers/net/fec_8xx/fec_mii.c create mode 100644 include/asm-powerpc/dcr-generic.h create mode 100644 include/asm-powerpc/mpc6xx.h delete mode 100644 include/asm-ppc/8xx_immap.h delete mode 100644 include/asm-ppc/amigayle.h delete mode 100644 include/asm-ppc/amipcmcia.h delete mode 100644 include/asm-ppc/bootinfo.h delete mode 100644 include/asm-ppc/bootx.h delete mode 100644 include/asm-ppc/btext.h delete mode 100644 include/asm-ppc/cpm1.h delete mode 100644 include/asm-ppc/cpm2.h delete mode 100644 include/asm-ppc/delay.h delete mode 100644 include/asm-ppc/device.h delete mode 100644 include/asm-ppc/floppy.h delete mode 100644 include/asm-ppc/fs_pd.h delete mode 100644 include/asm-ppc/gg2.h delete mode 100644 include/asm-ppc/gt64260.h delete mode 100644 include/asm-ppc/gt64260_defs.h delete mode 100644 include/asm-ppc/harrier.h delete mode 100644 include/asm-ppc/hawk.h delete mode 100644 include/asm-ppc/hawk_defs.h delete mode 100644 include/asm-ppc/highmem.h delete mode 100644 include/asm-ppc/hydra.h delete mode 100644 include/asm-ppc/ibm403.h delete mode 100644 include/asm-ppc/ibm405.h delete mode 100644 include/asm-ppc/ibm44x.h delete mode 100644 include/asm-ppc/ibm4xx.h delete mode 100644 include/asm-ppc/ibm_ocp.h delete mode 100644 include/asm-ppc/ibm_ocp_pci.h delete mode 100644 include/asm-ppc/immap_cpm2.h delete mode 100644 include/asm-ppc/io.h delete mode 100644 include/asm-ppc/irq_regs.h delete mode 100644 include/asm-ppc/kdebug.h delete mode 100644 include/asm-ppc/kgdb.h delete mode 100644 include/asm-ppc/m8260_pci.h delete mode 100644 include/asm-ppc/machdep.h delete mode 100644 include/asm-ppc/md.h delete mode 100644 include/asm-ppc/mk48t59.h delete mode 100644 include/asm-ppc/mmu.h delete mode 100644 include/asm-ppc/mmu_context.h delete mode 100644 include/asm-ppc/mpc10x.h delete mode 100644 include/asm-ppc/mpc52xx.h delete mode 100644 include/asm-ppc/mpc52xx_psc.h delete mode 100644 include/asm-ppc/mpc8260.h delete mode 100644 include/asm-ppc/mpc8260_pci9.h delete mode 100644 include/asm-ppc/mpc8xx.h delete mode 100644 include/asm-ppc/mv64x60.h delete mode 100644 include/asm-ppc/mv64x60_defs.h delete mode 100644 include/asm-ppc/ocp.h delete mode 100644 include/asm-ppc/ocp_ids.h delete mode 100644 include/asm-ppc/open_pic.h delete mode 100644 include/asm-ppc/page.h delete mode 100644 include/asm-ppc/pc_serial.h delete mode 100644 include/asm-ppc/pci-bridge.h delete mode 100644 include/asm-ppc/pci.h delete mode 100644 include/asm-ppc/pgalloc.h delete mode 100644 include/asm-ppc/pgtable.h delete mode 100644 include/asm-ppc/pnp.h delete mode 100644 include/asm-ppc/ppc4xx_dma.h delete mode 100644 include/asm-ppc/ppc4xx_pic.h delete mode 100644 include/asm-ppc/ppc_sys.h delete mode 100644 include/asm-ppc/ppcboot.h delete mode 100644 include/asm-ppc/prep_nvram.h delete mode 100644 include/asm-ppc/prom.h delete mode 100644 include/asm-ppc/raven.h delete mode 100644 include/asm-ppc/reg_booke.h delete mode 100644 include/asm-ppc/residual.h delete mode 100644 include/asm-ppc/rtc.h delete mode 100644 include/asm-ppc/serial.h delete mode 100644 include/asm-ppc/smp.h delete mode 100644 include/asm-ppc/spinlock.h delete mode 100644 include/asm-ppc/suspend.h delete mode 100644 include/asm-ppc/system.h delete mode 100644 include/asm-ppc/time.h delete mode 100644 include/asm-ppc/todc.h delete mode 100644 include/asm-ppc/traps.h delete mode 100644 include/asm-ppc/zorro.h Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging ext4/next $ git merge ext4/next Auto-merged fs/ext4/balloc.c Auto-merged fs/ext4/mballoc.c Auto-merged fs/jbd2/commit.c Auto-merged include/linux/jbd2.h Merge made by recursive. fs/ext4/balloc.c | 12 ++++++-- fs/ext4/ext4.h | 7 ++-- fs/ext4/ext4_i.h | 2 +- fs/ext4/ext4_sb.h | 2 +- fs/ext4/inode.c | 20 ++++++++----- fs/ext4/mballoc.c | 78 +++++++++++++++++++++++++------------------------ fs/jbd2/commit.c | 3 ++ include/linux/jbd2.h | 2 + 8 files changed, 72 insertions(+), 54 deletions(-) Merging 4xx/next $ git merge 4xx/next Auto-merged arch/powerpc/boot/Makefile Merge made by recursive. arch/powerpc/boot/Makefile | 3 +- arch/powerpc/boot/cuboot-sam440ep.c | 49 ++ arch/powerpc/boot/dts/sam440ep.dts | 293 +++++++ arch/powerpc/boot/dts/taishan.dts | 29 +- arch/powerpc/configs/44x/sam440ep_defconfig | 1192 +++++++++++++++++++++++++++ arch/powerpc/configs/44x/taishan_defconfig | 79 ++- arch/powerpc/kernel/cpu_setup_44x.S | 1 + arch/powerpc/kernel/cputable.c | 4 +- arch/powerpc/platforms/44x/Kconfig | 9 + arch/powerpc/platforms/44x/Makefile | 1 + arch/powerpc/platforms/44x/sam440ep.c | 79 ++ arch/powerpc/platforms/44x/warp-nand.c | 3 +- arch/powerpc/sysdev/indirect_pci.c | 6 + arch/powerpc/sysdev/ppc4xx_pci.c | 14 + include/asm-powerpc/pci-bridge.h | 3 + 15 files changed, 1759 insertions(+), 6 deletions(-) create mode 100644 arch/powerpc/boot/cuboot-sam440ep.c create mode 100644 arch/powerpc/boot/dts/sam440ep.dts create mode 100644 arch/powerpc/configs/44x/sam440ep_defconfig create mode 100644 arch/powerpc/platforms/44x/sam440ep.c Merging async_tx/next $ git merge async_tx/next Merge made by recursive. drivers/dma/fsldma.c | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) Merging udf/for_next $ git merge udf/for_next Merge made by recursive. fs/udf/super.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Merging security-testing/next $ git merge security-testing/next Already up-to-date. Merging net/master $ git merge net/master Auto-merged Documentation/powerpc/booting-without-of.txt CONFLICT (content): Merge conflict in Documentation/powerpc/booting-without-of.txt Auto-merged MAINTAINERS Removed drivers/atm/fore200e_firmware_copyright Removed drivers/atm/fore200e_mkfirm.c Removed drivers/atm/pca200e.data Removed drivers/atm/pca200e_ecd.data Removed drivers/atm/sba200e_ecd.data Auto-merged drivers/net/Kconfig Auto-merged drivers/net/Makefile Auto-merged drivers/net/cxgb3/common.h Removed drivers/net/ibm_emac/Kconfig Removed drivers/net/ibm_emac/Makefile Removed drivers/net/ibm_emac/ibm_emac.h Removed drivers/net/ibm_emac/ibm_emac_core.c Removed drivers/net/ibm_emac/ibm_emac_core.h Removed drivers/net/ibm_emac/ibm_emac_debug.c Removed drivers/net/ibm_emac/ibm_emac_debug.h Removed drivers/net/ibm_emac/ibm_emac_mal.c Removed drivers/net/ibm_emac/ibm_emac_mal.h Removed drivers/net/ibm_emac/ibm_emac_phy.c Removed drivers/net/ibm_emac/ibm_emac_phy.h Removed drivers/net/ibm_emac/ibm_emac_rgmii.c Removed drivers/net/ibm_emac/ibm_emac_rgmii.h Removed drivers/net/ibm_emac/ibm_emac_tah.c Removed drivers/net/ibm_emac/ibm_emac_tah.h Removed drivers/net/ibm_emac/ibm_emac_zmii.c Removed drivers/net/ibm_emac/ibm_emac_zmii.h Auto-merged drivers/net/myri10ge/myri10ge.c Auto-merged drivers/net/ppp_generic.c Removed drivers/net/sfc/i2c-direct.c Removed drivers/net/sfc/i2c-direct.h Auto-merged drivers/net/wireless/atmel.c Auto-merged drivers/net/wireless/libertas/if_cs.c Auto-merged drivers/net/wireless/libertas/if_usb.c Auto-merged drivers/net/wireless/rt2x00/rt2x00.h Auto-merged drivers/net/wireless/rt2x00/rt2x00pci.h Auto-merged drivers/net/wireless/rt2x00/rt61pci.c Auto-merged drivers/net/wireless/rt2x00/rt73usb.c Auto-merged net/bridge/br_fdb.c Auto-merged net/bridge/br_stp.c Auto-merged net/core/dev.c Auto-merged net/iucv/iucv.c Auto-merged net/netfilter/nf_conntrack_netlink.c Auto-merged net/sunrpc/auth_gss/auth_gss.c Resolved 'Documentation/powerpc/booting-without-of.txt' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. Documentation/networking/bonding.txt | 110 +- Documentation/networking/mac80211_hwsim/README | 67 + .../networking/mac80211_hwsim/hostapd.conf | 11 + .../networking/mac80211_hwsim/wpa_supplicant.conf | 10 + Documentation/powerpc/booting-without-of.txt | 20 + MAINTAINERS | 18 +- drivers/atm/Kconfig | 79 +- drivers/atm/Makefile | 39 - drivers/atm/fore200e.c | 130 +- drivers/atm/fore200e.h | 3 - drivers/atm/fore200e_firmware_copyright | 31 - drivers/atm/fore200e_mkfirm.c | 154 - drivers/atm/he.c | 152 - drivers/atm/he.h | 26 - drivers/atm/iphase.c | 30 +- drivers/atm/pca200e.data | 850 ---- drivers/atm/pca200e_ecd.data | 906 ---- drivers/atm/sba200e_ecd.data | 928 ---- drivers/atm/suni.c | 130 +- drivers/atm/suni.h | 40 +- drivers/bluetooth/Kconfig | 1 + drivers/bluetooth/hci_bcsp.c | 44 +- drivers/net/3c515.c | 4 + drivers/net/3c523.c | 37 +- drivers/net/3c527.c | 45 +- drivers/net/8139cp.c | 43 +- drivers/net/8139too.c | 53 +- drivers/net/8390.h | 1 - drivers/net/Kconfig | 34 +- drivers/net/Makefile | 3 +- drivers/net/a2065.c | 4 - drivers/net/acenic.c | 21 +- drivers/net/acenic.h | 1 - drivers/net/atarilance.c | 2 +- drivers/net/atlx/atl1.c | 3 +- drivers/net/bnx2.c | 242 +- drivers/net/bnx2.h | 4 +- drivers/net/bnx2_fw.h | 80 + drivers/net/bonding/bond_main.c | 754 ++-- drivers/net/bonding/bond_sysfs.c | 103 +- drivers/net/bonding/bonding.h | 17 +- drivers/net/cxgb3/adapter.h | 18 + drivers/net/cxgb3/common.h | 1 + drivers/net/cxgb3/cxgb3_ioctl.h | 1 + drivers/net/cxgb3/cxgb3_main.c | 19 + drivers/net/cxgb3/sge.c | 391 ++- drivers/net/cxgb3/t3_cpl.h | 11 + drivers/net/declance.c | 4 - drivers/net/dl2k.c | 8 +- drivers/net/dm9000.c | 6 +- drivers/net/e1000e/netdev.c | 5 + drivers/net/forcedeth.c | 61 +- drivers/net/fs_enet/fs_enet-main.c | 31 +- drivers/net/gianfar.c | 2 +- drivers/net/hamachi.c | 12 +- drivers/net/hamradio/6pack.c | 24 +- drivers/net/hplance.c | 4 +- drivers/net/ibm_emac/Kconfig | 70 - drivers/net/ibm_emac/Makefile | 11 - drivers/net/ibm_emac/ibm_emac.h | 329 -- drivers/net/ibm_emac/ibm_emac_core.c | 2263 ---------- drivers/net/ibm_emac/ibm_emac_core.h | 222 - drivers/net/ibm_emac/ibm_emac_debug.c | 211 - drivers/net/ibm_emac/ibm_emac_debug.h | 62 - drivers/net/ibm_emac/ibm_emac_mal.c | 570 --- drivers/net/ibm_emac/ibm_emac_mal.h | 267 -- drivers/net/ibm_emac/ibm_emac_phy.c | 398 -- drivers/net/ibm_emac/ibm_emac_phy.h | 80 - drivers/net/ibm_emac/ibm_emac_rgmii.c | 200 - drivers/net/ibm_emac/ibm_emac_rgmii.h | 64 - drivers/net/ibm_emac/ibm_emac_tah.c | 110 - drivers/net/ibm_emac/ibm_emac_tah.h | 87 - drivers/net/ibm_emac/ibm_emac_zmii.c | 253 -- drivers/net/ibm_emac/ibm_emac_zmii.h | 82 - drivers/net/igb/igb_main.c | 7 +- drivers/net/irda/donauboe.c | 6 +- drivers/net/irda/smsc-ircc2.c | 1 - drivers/net/irda/smsc-ircc2.h | 1 - drivers/net/ixgbe/ixgbe_main.c | 7 +- drivers/net/ixp2000/ixpdev.c | 4 +- drivers/net/lib8390.c | 100 +- drivers/net/mac8390.c | 8 +- drivers/net/macb.c | 6 +- drivers/net/macsonic.c | 19 +- drivers/net/mv643xx_eth.c | 4557 ++++++++----------- drivers/net/myri10ge/myri10ge.c | 1076 ++++- drivers/net/natsemi.c | 4 +- drivers/net/niu.h | 2 +- drivers/net/ns83820.c | 9 +- drivers/net/pcmcia/3c574_cs.c | 47 +- drivers/net/pcmcia/3c589_cs.c | 49 +- drivers/net/pcmcia/axnet_cs.c | 70 +- drivers/net/pcnet32.c | 6 +- drivers/net/phy/Kconfig | 9 +- drivers/net/phy/Makefile | 1 + drivers/net/phy/broadcom.c | 201 +- drivers/net/phy/mdio-ofgpio.c | 205 + drivers/net/ppp_generic.c | 22 +- drivers/net/ps3_gelic_net.c | 10 +- drivers/net/ps3_gelic_net.h | 2 +- drivers/net/ps3_gelic_wireless.c | 206 +- drivers/net/ps3_gelic_wireless.h | 7 +- drivers/net/qla3xxx.c | 4 +- drivers/net/s2io.c | 6 +- drivers/net/s2io.h | 2 +- drivers/net/sb1250-mac.c | 2 +- drivers/net/sfc/Kconfig | 2 + drivers/net/sfc/Makefile | 2 +- drivers/net/sfc/boards.c | 2 +- drivers/net/sfc/boards.h | 3 +- drivers/net/sfc/efx.c | 2 + drivers/net/sfc/falcon.c | 74 +- drivers/net/sfc/i2c-direct.c | 381 -- drivers/net/sfc/i2c-direct.h | 91 - drivers/net/sfc/net_driver.h | 11 +- drivers/net/sfc/sfe4001.c | 126 +- drivers/net/sh_eth.c | 1174 +++++ drivers/net/sh_eth.h | 464 ++ drivers/net/sis190.c | 2 +- drivers/net/sis900.c | 2 +- drivers/net/sky2.c | 241 +- drivers/net/sky2.h | 24 +- drivers/net/smc911x.c | 422 +- drivers/net/smc911x.h | 494 ++- drivers/net/spider_net.c | 4 +- drivers/net/sunlance.c | 4 - drivers/net/tg3.c | 1268 ++++-- drivers/net/tg3.h | 40 +- drivers/net/tlan.c | 490 ++- drivers/net/tlan.h | 26 +- drivers/net/tokenring/3c359.c | 20 +- drivers/net/tokenring/3c359.h | 2 - drivers/net/tsi108_eth.c | 10 +- drivers/net/ucc_geth_ethtool.c | 4 +- drivers/net/usb/Kconfig | 10 + drivers/net/usb/Makefile | 1 + drivers/net/usb/hso.c | 2836 ++++++++++++ drivers/net/via-velocity.c | 25 +- drivers/net/wireless/Kconfig | 13 + drivers/net/wireless/Makefile | 2 + drivers/net/wireless/adm8211.c | 49 +- drivers/net/wireless/adm8211.h | 1 - drivers/net/wireless/airo.c | 72 +- drivers/net/wireless/arlan-main.c | 40 +- drivers/net/wireless/arlan.h | 1 - drivers/net/wireless/ath5k/base.c | 105 +- drivers/net/wireless/ath5k/base.h | 4 +- drivers/net/wireless/atmel.c | 46 +- drivers/net/wireless/b43/b43.h | 47 +- drivers/net/wireless/b43/debugfs.c | 77 +- drivers/net/wireless/b43/debugfs.h | 1 + drivers/net/wireless/b43/dma.c | 54 +- drivers/net/wireless/b43/dma.h | 3 +- drivers/net/wireless/b43/lo.c | 731 ++-- drivers/net/wireless/b43/lo.h | 115 +- drivers/net/wireless/b43/main.c | 283 +- drivers/net/wireless/b43/main.h | 3 + drivers/net/wireless/b43/nphy.c | 2 - drivers/net/wireless/b43/phy.c | 291 +- drivers/net/wireless/b43/phy.h | 16 +- drivers/net/wireless/b43/pio.c | 44 +- drivers/net/wireless/b43/pio.h | 8 +- drivers/net/wireless/b43/xmit.c | 70 +- drivers/net/wireless/b43/xmit.h | 4 +- drivers/net/wireless/b43legacy/b43legacy.h | 17 - drivers/net/wireless/b43legacy/dma.c | 43 +- drivers/net/wireless/b43legacy/dma.h | 7 +- drivers/net/wireless/b43legacy/main.c | 31 +- drivers/net/wireless/b43legacy/phy.c | 14 +- drivers/net/wireless/b43legacy/pio.c | 27 +- drivers/net/wireless/b43legacy/pio.h | 7 +- drivers/net/wireless/b43legacy/radio.c | 12 +- drivers/net/wireless/b43legacy/xmit.c | 51 +- drivers/net/wireless/b43legacy/xmit.h | 2 +- drivers/net/wireless/iwlwifi/Kconfig | 26 +- drivers/net/wireless/iwlwifi/Makefile | 11 +- drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 13 +- drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 17 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 81 +- drivers/net/wireless/iwlwifi/iwl-3945.h | 11 +- drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 633 +--- drivers/net/wireless/iwlwifi/iwl-4965-rs.c | 1209 +++--- drivers/net/wireless/iwlwifi/iwl-4965-rs.h | 97 +- drivers/net/wireless/iwlwifi/iwl-4965.c | 3309 ++++---------- drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 133 + drivers/net/wireless/iwlwifi/iwl-5000.c | 1547 +++++++ drivers/net/wireless/iwlwifi/iwl-calib.c | 802 ++++ drivers/net/wireless/iwlwifi/iwl-calib.h | 84 + .../{iwl-4965-commands.h => iwl-commands.h} | 420 ++- drivers/net/wireless/iwlwifi/iwl-core.c | 1220 +++++- drivers/net/wireless/iwlwifi/iwl-core.h | 184 +- drivers/net/wireless/iwlwifi/iwl-csr.h | 38 +- drivers/net/wireless/iwlwifi/iwl-debug.h | 31 +- drivers/net/wireless/iwlwifi/iwl-debugfs.c | 103 +- .../net/wireless/iwlwifi/{iwl-4965.h => iwl-dev.h} | 524 +-- drivers/net/wireless/iwlwifi/iwl-eeprom.c | 171 +- drivers/net/wireless/iwlwifi/iwl-eeprom.h | 206 +- drivers/net/wireless/iwlwifi/iwl-fh.h | 391 ++ drivers/net/wireless/iwlwifi/iwl-hcmd.c | 14 +- drivers/net/wireless/iwlwifi/iwl-helpers.h | 92 +- drivers/net/wireless/iwlwifi/iwl-led.c | 2 +- drivers/net/wireless/iwlwifi/iwl-power.c | 423 ++ drivers/net/wireless/iwlwifi/iwl-power.h | 76 + drivers/net/wireless/iwlwifi/iwl-prph.h | 333 ++- drivers/net/wireless/iwlwifi/iwl-rfkill.c | 6 +- drivers/net/wireless/iwlwifi/iwl-rfkill.h | 1 - drivers/net/wireless/iwlwifi/iwl-rx.c | 468 ++ drivers/net/wireless/iwlwifi/iwl-scan.c | 921 ++++ drivers/net/wireless/iwlwifi/iwl-sta.c | 665 +++- drivers/net/wireless/iwlwifi/iwl-sta.h | 28 +- drivers/net/wireless/iwlwifi/iwl-tx.c | 1382 ++++++ drivers/net/wireless/iwlwifi/iwl3945-base.c | 195 +- drivers/net/wireless/iwlwifi/iwl4965-base.c | 4654 +++----------------- drivers/net/wireless/libertas/Makefile | 8 +- drivers/net/wireless/libertas/assoc.c | 8 +- drivers/net/wireless/libertas/cmd.c | 192 +- drivers/net/wireless/libertas/cmd.h | 8 +- drivers/net/wireless/libertas/cmdresp.c | 25 +- drivers/net/wireless/libertas/decl.h | 8 +- drivers/net/wireless/libertas/defs.h | 14 +- drivers/net/wireless/libertas/dev.h | 8 +- drivers/net/wireless/libertas/host.h | 17 + drivers/net/wireless/libertas/hostcmd.h | 4 +- drivers/net/wireless/libertas/if_cs.c | 315 +- drivers/net/wireless/libertas/if_usb.c | 22 + drivers/net/wireless/libertas/main.c | 254 +- drivers/net/wireless/libertas/persistcfg.c | 453 ++ drivers/net/wireless/libertas/rx.c | 4 +- drivers/net/wireless/libertas/types.h | 30 + drivers/net/wireless/libertas/wext.c | 32 +- drivers/net/wireless/mac80211_hwsim.c | 514 +++ drivers/net/wireless/p54/p54.h | 2 +- drivers/net/wireless/p54/p54common.c | 137 +- drivers/net/wireless/p54/p54common.h | 1 - drivers/net/wireless/p54/p54pci.c | 2 +- drivers/net/wireless/rndis_wlan.c | 169 +- drivers/net/wireless/rt2x00/Kconfig | 55 +- drivers/net/wireless/rt2x00/rt2400pci.c | 265 +- drivers/net/wireless/rt2x00/rt2400pci.h | 7 +- drivers/net/wireless/rt2x00/rt2500pci.c | 250 +- drivers/net/wireless/rt2x00/rt2500pci.h | 7 +- drivers/net/wireless/rt2x00/rt2500usb.c | 193 +- drivers/net/wireless/rt2x00/rt2500usb.h | 7 +- drivers/net/wireless/rt2x00/rt2x00.h | 79 +- drivers/net/wireless/rt2x00/rt2x00debug.c | 10 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 255 +- drivers/net/wireless/rt2x00/rt2x00lib.h | 7 +- drivers/net/wireless/rt2x00/rt2x00mac.c | 131 +- drivers/net/wireless/rt2x00/rt2x00pci.c | 149 +- drivers/net/wireless/rt2x00/rt2x00pci.h | 33 +- drivers/net/wireless/rt2x00/rt2x00queue.c | 262 ++- drivers/net/wireless/rt2x00/rt2x00queue.h | 111 +- drivers/net/wireless/rt2x00/rt2x00reg.h | 145 +- drivers/net/wireless/rt2x00/rt2x00usb.c | 288 +- drivers/net/wireless/rt2x00/rt2x00usb.h | 63 +- drivers/net/wireless/rt2x00/rt61pci.c | 274 +- drivers/net/wireless/rt2x00/rt61pci.h | 7 +- drivers/net/wireless/rt2x00/rt73usb.c | 191 +- drivers/net/wireless/rt2x00/rt73usb.h | 7 +- drivers/net/wireless/rtl8180_dev.c | 71 +- drivers/net/wireless/rtl8187.h | 6 - drivers/net/wireless/rtl8187_dev.c | 57 +- drivers/net/wireless/zd1211rw/zd_mac.c | 184 +- drivers/net/wireless/zd1211rw/zd_mac.h | 16 - drivers/net/wireless/zd1211rw/zd_usb.c | 29 +- drivers/ssb/pci.c | 20 +- include/linux/brcmphy.h | 6 + include/linux/ieee80211.h | 429 ++- include/linux/if_bridge.h | 2 - include/linux/if_ppp.h | 2 - include/linux/if_tun.h | 2 - include/linux/ip6_tunnel.h | 4 - include/linux/mv643xx_eth.h | 65 +- include/linux/netdevice.h | 13 +- include/linux/netfilter/nfnetlink_conntrack.h | 10 + include/linux/netfilter_bridge/ebt_ip6.h | 40 + include/linux/netfilter_bridge/ebt_log.h | 3 +- include/linux/netfilter_ipv4.h | 1 + include/linux/netfilter_ipv6.h | 1 + include/linux/netlink.h | 2 +- include/linux/nl80211.h | 8 +- include/linux/notifier.h | 1 + include/linux/pci_ids.h | 1 + include/linux/ppp-comp.h | 2 - include/linux/ppp_defs.h | 2 - include/linux/skbuff.h | 14 + include/linux/smc911x.h | 12 + include/linux/sonet.h | 2 +- include/linux/sunrpc/auth_gss.h | 2 - include/linux/sunrpc/gss_api.h | 2 - include/linux/sunrpc/svcauth_gss.h | 3 - include/linux/tcp.h | 50 +- include/linux/tipc_config.h | 10 +- include/linux/udp.h | 6 + include/linux/wanrouter.h | 2 +- include/linux/wireless.h | 2 + include/net/addrconf.h | 3 +- include/net/ieee80211.h | 11 - include/net/if_inet6.h | 1 - include/net/inet6_hashtables.h | 10 +- include/net/inet_hashtables.h | 12 +- include/net/inet_sock.h | 9 +- include/net/inetpeer.h | 2 - include/net/ip6_tunnel.h | 5 - include/net/ipconfig.h | 2 - include/net/ipip.h | 1 - include/net/ipv6.h | 2 - include/net/mac80211.h | 474 ++- include/net/net_namespace.h | 3 + include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 2 - include/net/netfilter/nf_conntrack.h | 19 + include/net/netns/hash.h | 21 + include/net/netns/ipv4.h | 1 + include/net/netns/ipv6.h | 1 + include/net/rose.h | 2 +- include/net/sctp/sctp.h | 4 +- include/net/sctp/structs.h | 6 +- include/net/sctp/user.h | 36 +- include/net/snmp.h | 2 - include/net/sock.h | 37 +- include/net/tcp.h | 23 +- include/net/tipc/tipc_port.h | 3 +- include/net/transp_v6.h | 2 +- include/net/udp.h | 2 +- include/net/wireless.h | 6 + ipc/mqueue.c | 2 +- net/atm/addr.c | 10 +- net/atm/addr.h | 4 +- net/atm/br2684.c | 14 +- net/atm/common.c | 8 +- net/atm/lec.c | 55 +- net/atm/lec.h | 10 +- net/ax25/af_ax25.c | 6 +- net/ax25/ax25_std_timer.c | 8 +- net/bluetooth/bnep/bnep.h | 4 - net/bluetooth/bnep/core.c | 4 - net/bluetooth/bnep/netdev.c | 4 - net/bluetooth/bnep/sock.c | 4 - net/bluetooth/rfcomm/core.c | 2 - net/bluetooth/rfcomm/sock.c | 2 - net/bluetooth/rfcomm/tty.c | 2 - net/bridge/br.c | 2 - net/bridge/br_device.c | 14 +- net/bridge/br_fdb.c | 2 - net/bridge/br_forward.c | 6 +- net/bridge/br_if.c | 3 +- net/bridge/br_input.c | 25 +- net/bridge/br_ioctl.c | 2 - net/bridge/br_notify.c | 2 - net/bridge/br_private.h | 5 +- net/bridge/br_private_stp.h | 2 - net/bridge/br_stp.c | 2 - net/bridge/br_stp_bpdu.c | 2 - net/bridge/br_stp_if.c | 6 +- net/bridge/br_stp_timer.c | 2 - net/bridge/netfilter/Kconfig | 9 + net/bridge/netfilter/Makefile | 1 + net/bridge/netfilter/ebt_ip6.c | 144 + net/bridge/netfilter/ebt_log.c | 66 +- net/core/dev.c | 85 +- net/core/net-sysfs.c | 22 +- net/core/rtnetlink.c | 20 +- net/core/skbuff.c | 10 +- net/core/sock.c | 6 +- net/core/sysctl_net_core.c | 39 +- net/dccp/dccp.h | 2 +- net/dccp/ipv6.c | 4 +- net/dccp/proto.c | 4 +- net/decnet/af_decnet.c | 30 +- net/econet/af_econet.c | 4 +- net/ieee80211/ieee80211_rx.c | 2 +- net/ieee80211/ieee80211_tx.c | 86 - net/ieee80211/ieee80211_wx.c | 89 - net/ipv4/af_inet.c | 2 - net/ipv4/arp.c | 2 - net/ipv4/devinet.c | 27 +- net/ipv4/fib_frontend.c | 2 - net/ipv4/fib_hash.c | 2 - net/ipv4/fib_semantics.c | 2 - net/ipv4/fib_trie.c | 2 - net/ipv4/icmp.c | 2 - net/ipv4/igmp.c | 2 - net/ipv4/inet_connection_sock.c | 6 +- net/ipv4/inet_diag.c | 2 - net/ipv4/inet_hashtables.c | 19 +- net/ipv4/inet_timewait_sock.c | 6 +- net/ipv4/inetpeer.c | 2 - net/ipv4/ip_forward.c | 5 +- net/ipv4/ip_fragment.c | 36 +- net/ipv4/ip_gre.c | 32 +- net/ipv4/ip_input.c | 2 - net/ipv4/ip_options.c | 2 - net/ipv4/ip_output.c | 2 - net/ipv4/ip_sockglue.c | 2 - net/ipv4/ipconfig.c | 2 - net/ipv4/ipip.c | 24 +- net/ipv4/ipmr.c | 31 +- net/ipv4/ipvs/ip_vs_app.c | 2 - net/ipv4/ipvs/ip_vs_conn.c | 2 - net/ipv4/ipvs/ip_vs_core.c | 2 - net/ipv4/ipvs/ip_vs_ctl.c | 2 - net/ipv4/ipvs/ip_vs_dh.c | 2 - net/ipv4/ipvs/ip_vs_est.c | 2 - net/ipv4/ipvs/ip_vs_ftp.c | 2 - net/ipv4/ipvs/ip_vs_lblc.c | 2 - net/ipv4/ipvs/ip_vs_lblcr.c | 2 - net/ipv4/ipvs/ip_vs_lc.c | 2 - net/ipv4/ipvs/ip_vs_nq.c | 2 - net/ipv4/ipvs/ip_vs_proto.c | 2 - net/ipv4/ipvs/ip_vs_proto_ah.c | 2 - net/ipv4/ipvs/ip_vs_proto_esp.c | 2 - net/ipv4/ipvs/ip_vs_proto_tcp.c | 2 - net/ipv4/ipvs/ip_vs_proto_udp.c | 2 - net/ipv4/ipvs/ip_vs_rr.c | 2 - net/ipv4/ipvs/ip_vs_sched.c | 2 - net/ipv4/ipvs/ip_vs_sed.c | 2 - net/ipv4/ipvs/ip_vs_sh.c | 2 - net/ipv4/ipvs/ip_vs_sync.c | 2 - net/ipv4/ipvs/ip_vs_wlc.c | 2 - net/ipv4/ipvs/ip_vs_wrr.c | 2 - net/ipv4/ipvs/ip_vs_xmit.c | 2 - net/ipv4/netfilter/Kconfig | 12 + net/ipv4/netfilter/Makefile | 1 + net/ipv4/netfilter/ip_queue.c | 3 - net/ipv4/netfilter/iptable_security.c | 180 + net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 5 +- net/ipv4/proc.c | 2 - net/ipv4/protocol.c | 2 - net/ipv4/raw.c | 7 +- net/ipv4/route.c | 2 - net/ipv4/syncookies.c | 2 - net/ipv4/sysctl_net_ipv4.c | 2 - net/ipv4/tcp.c | 72 +- net/ipv4/tcp_diag.c | 2 - net/ipv4/tcp_input.c | 42 +- net/ipv4/tcp_ipv4.c | 170 +- net/ipv4/tcp_minisocks.c | 2 - net/ipv4/tcp_output.c | 5 +- net/ipv4/tcp_timer.c | 2 - net/ipv4/udp.c | 37 +- net/ipv4/udp_impl.h | 2 +- net/ipv4/udplite.c | 2 - net/ipv6/addrconf.c | 30 +- net/ipv6/addrlabel.c | 106 +- net/ipv6/af_inet6.c | 6 +- net/ipv6/datagram.c | 2 - net/ipv6/exthdrs.c | 2 - net/ipv6/icmp.c | 2 - net/ipv6/inet6_hashtables.c | 9 +- net/ipv6/ip6_fib.c | 2 - net/ipv6/ip6_input.c | 2 - net/ipv6/ip6_output.c | 5 +- net/ipv6/ip6_tunnel.c | 28 +- net/ipv6/ip6mr.c | 24 +- net/ipv6/ipv6_sockglue.c | 2 - net/ipv6/mcast.c | 3 - net/ipv6/netfilter/Kconfig | 12 + net/ipv6/netfilter/Makefile | 1 + net/ipv6/netfilter/ip6_queue.c | 3 - net/ipv6/netfilter/ip6table_security.c | 172 + net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 5 +- net/ipv6/proc.c | 2 - net/ipv6/protocol.c | 2 - net/ipv6/raw.c | 8 +- net/ipv6/reassembly.c | 63 +- net/ipv6/route.c | 2 - net/ipv6/sit.c | 26 +- net/ipv6/sysctl_net_ipv6.c | 29 +- net/ipv6/tcp_ipv6.c | 144 +- net/ipv6/udp.c | 33 +- net/ipv6/udp_impl.h | 2 +- net/ipv6/udplite.c | 2 - net/irda/irnet/irnet_ppp.c | 54 +- net/irda/irnet/irnet_ppp.h | 7 +- net/iucv/af_iucv.c | 1 + net/iucv/iucv.c | 13 +- net/key/af_key.c | 622 +-- net/llc/af_llc.c | 4 +- net/mac80211/Kconfig | 14 +- net/mac80211/Makefile | 2 +- net/mac80211/aes_ccm.c | 2 +- net/mac80211/aes_ccm.h | 2 +- net/mac80211/cfg.c | 6 +- net/mac80211/debugfs.c | 43 - net/mac80211/debugfs_key.c | 8 +- net/mac80211/debugfs_netdev.c | 11 +- net/mac80211/debugfs_sta.c | 56 +- net/mac80211/ieee80211_i.h | 92 +- net/mac80211/iface.c | 6 +- net/mac80211/key.c | 11 +- net/mac80211/key.h | 17 +- net/mac80211/main.c | 332 +- net/mac80211/mesh.c | 38 +- net/mac80211/mesh.h | 2 +- net/mac80211/mesh_hwmp.c | 2 +- net/mac80211/mesh_pathtbl.c | 53 +- net/mac80211/mesh_plink.c | 88 +- net/mac80211/michael.c | 106 +- net/mac80211/michael.h | 8 +- net/mac80211/mlme.c | 240 +- net/mac80211/rate.c | 12 +- net/mac80211/rate.h | 33 +- net/mac80211/rc80211_pid.h | 4 +- net/mac80211/rc80211_pid_algo.c | 22 +- net/mac80211/rc80211_pid_debugfs.c | 8 +- net/mac80211/rx.c | 320 +- net/mac80211/sta_info.c | 22 +- net/mac80211/sta_info.h | 80 +- net/mac80211/tkip.c | 258 +- net/mac80211/tkip.h | 8 +- net/mac80211/tx.c | 874 ++-- net/mac80211/util.c | 140 +- net/mac80211/wep.c | 19 +- net/mac80211/wep.h | 2 +- net/mac80211/wext.c | 28 +- net/mac80211/wme.c | 165 +- net/mac80211/wme.h | 2 +- net/mac80211/wpa.c | 198 +- net/netfilter/nf_conntrack_core.c | 19 + net/netfilter/nf_conntrack_extend.c | 10 +- net/netfilter/nf_conntrack_netlink.c | 30 +- net/netfilter/nf_conntrack_proto_dccp.c | 3 +- net/netfilter/nf_conntrack_proto_sctp.c | 80 + net/netfilter/nf_conntrack_proto_tcp.c | 9 +- net/netfilter/nfnetlink_queue.c | 1 - net/netfilter/xt_CONNSECMARK.c | 10 +- net/netfilter/xt_SECMARK.c | 10 +- net/netlink/af_netlink.c | 4 +- net/netrom/af_netrom.c | 8 +- net/packet/af_packet.c | 2 - net/rose/af_rose.c | 10 +- net/rose/rose_route.c | 29 +- net/sched/sch_htb.c | 2 - net/sctp/associola.c | 4 + net/sctp/input.c | 27 +- net/sctp/output.c | 7 +- net/sctp/outqueue.c | 34 +- net/sctp/proc.c | 141 + net/sctp/protocol.c | 5 + net/sctp/sm_sideeffect.c | 44 +- net/sctp/sm_statefuns.c | 16 +- net/sctp/socket.c | 309 +- net/sunrpc/auth_gss/auth_gss.c | 2 - net/sysctl_net.c | 31 +- net/tipc/bcast.c | 4 +- net/tipc/cluster.c | 2 +- net/tipc/config.c | 11 +- net/tipc/core.c | 13 +- net/tipc/core.h | 126 +- net/tipc/dbg.c | 231 +- net/tipc/dbg.h | 12 +- net/tipc/discover.c | 14 +- net/tipc/discover.h | 2 +- net/tipc/link.c | 80 +- net/tipc/msg.c | 13 +- net/tipc/msg.h | 42 +- net/tipc/name_distr.c | 6 +- net/tipc/name_table.c | 14 +- net/tipc/net.c | 10 +- net/tipc/net.h | 2 +- net/tipc/netlink.c | 16 +- net/tipc/node.c | 26 + net/tipc/port.c | 79 +- net/tipc/ref.c | 12 +- net/tipc/socket.c | 5 +- net/tipc/subscr.c | 249 +- net/tipc/subscr.h | 34 +- net/unix/af_unix.c | 2 - net/wanrouter/wanmain.c | 6 +- net/wanrouter/wanproc.c | 2 +- net/wireless/core.c | 33 +- net/wireless/radiotap.c | 16 +- net/wireless/reg.c | 18 + net/x25/af_x25.c | 9 +- 574 files changed, 33182 insertions(+), 30814 deletions(-) create mode 100644 Documentation/networking/mac80211_hwsim/README create mode 100644 Documentation/networking/mac80211_hwsim/hostapd.conf create mode 100644 Documentation/networking/mac80211_hwsim/wpa_supplicant.conf delete mode 100644 drivers/atm/fore200e_firmware_copyright delete mode 100644 drivers/atm/fore200e_mkfirm.c delete mode 100644 drivers/atm/pca200e.data delete mode 100644 drivers/atm/pca200e_ecd.data delete mode 100644 drivers/atm/sba200e_ecd.data delete mode 100644 drivers/net/ibm_emac/Kconfig delete mode 100644 drivers/net/ibm_emac/Makefile delete mode 100644 drivers/net/ibm_emac/ibm_emac.h delete mode 100644 drivers/net/ibm_emac/ibm_emac_core.c delete mode 100644 drivers/net/ibm_emac/ibm_emac_core.h delete mode 100644 drivers/net/ibm_emac/ibm_emac_debug.c delete mode 100644 drivers/net/ibm_emac/ibm_emac_debug.h delete mode 100644 drivers/net/ibm_emac/ibm_emac_mal.c delete mode 100644 drivers/net/ibm_emac/ibm_emac_mal.h delete mode 100644 drivers/net/ibm_emac/ibm_emac_phy.c delete mode 100644 drivers/net/ibm_emac/ibm_emac_phy.h delete mode 100644 drivers/net/ibm_emac/ibm_emac_rgmii.c delete mode 100644 drivers/net/ibm_emac/ibm_emac_rgmii.h delete mode 100644 drivers/net/ibm_emac/ibm_emac_tah.c delete mode 100644 drivers/net/ibm_emac/ibm_emac_tah.h delete mode 100644 drivers/net/ibm_emac/ibm_emac_zmii.c delete mode 100644 drivers/net/ibm_emac/ibm_emac_zmii.h create mode 100644 drivers/net/phy/mdio-ofgpio.c delete mode 100644 drivers/net/sfc/i2c-direct.c delete mode 100644 drivers/net/sfc/i2c-direct.h create mode 100644 drivers/net/sh_eth.c create mode 100644 drivers/net/sh_eth.h create mode 100644 drivers/net/usb/hso.c create mode 100644 drivers/net/wireless/iwlwifi/iwl-5000-hw.h create mode 100644 drivers/net/wireless/iwlwifi/iwl-5000.c create mode 100644 drivers/net/wireless/iwlwifi/iwl-calib.c create mode 100644 drivers/net/wireless/iwlwifi/iwl-calib.h rename drivers/net/wireless/iwlwifi/{iwl-4965-commands.h => iwl-commands.h} (90%) rename drivers/net/wireless/iwlwifi/{iwl-4965.h => iwl-dev.h} (69%) create mode 100644 drivers/net/wireless/iwlwifi/iwl-fh.h create mode 100644 drivers/net/wireless/iwlwifi/iwl-power.c create mode 100644 drivers/net/wireless/iwlwifi/iwl-power.h create mode 100644 drivers/net/wireless/iwlwifi/iwl-rx.c create mode 100644 drivers/net/wireless/iwlwifi/iwl-scan.c create mode 100644 drivers/net/wireless/iwlwifi/iwl-tx.c create mode 100644 drivers/net/wireless/libertas/persistcfg.c create mode 100644 drivers/net/wireless/mac80211_hwsim.c create mode 100644 include/linux/brcmphy.h create mode 100644 include/linux/netfilter_bridge/ebt_ip6.h create mode 100644 include/linux/smc911x.h create mode 100644 include/net/netns/hash.h create mode 100644 net/bridge/netfilter/ebt_ip6.c create mode 100644 net/ipv4/netfilter/iptable_security.c create mode 100644 net/ipv6/netfilter/ip6table_security.c $ git am -3 ../patches/0001-wireless-fix-fallout-from-device_create-removal.patch Applying wireless: fix fallout from device_create removal Merging sparc/master $ git merge sparc/master Removed arch/sparc/kernel/sun4setup.c Removed arch/sparc/mm/nosrmmu.c Removed arch/sparc/prom/sun4prom.c Auto-merged drivers/ata/Kconfig Auto-merged drivers/net/sunlance.c Auto-merged include/asm-m68k/sbus.h CONFLICT (content): Merge conflict in include/asm-m68k/sbus.h Removed include/asm-sparc/sun4paddr.h Resolved 'include/asm-m68k/sbus.h' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. arch/sparc/Kconfig | 15 -- arch/sparc/kernel/Makefile | 1 - arch/sparc/kernel/apc.c | 2 +- arch/sparc/kernel/ebus.c | 9 +- arch/sparc/kernel/entry.S | 59 +------- arch/sparc/kernel/etrap.S | 1 - arch/sparc/kernel/head.S | 30 +--- arch/sparc/kernel/idprom.c | 9 +- arch/sparc/kernel/ioport.c | 23 +-- arch/sparc/kernel/irq.c | 2 +- arch/sparc/kernel/process.c | 3 +- arch/sparc/kernel/prom.c | 1 - arch/sparc/kernel/rtrap.S | 2 - arch/sparc/kernel/setup.c | 10 +- arch/sparc/kernel/smp.c | 7 - arch/sparc/kernel/sun4c_irq.c | 61 ++----- arch/sparc/kernel/sun4d_irq.c | 7 +- arch/sparc/kernel/sun4m_irq.c | 7 +- arch/sparc/kernel/sun4m_smp.c | 9 +- arch/sparc/kernel/sun4setup.c | 75 --------- arch/sparc/kernel/time.c | 166 +------------------ arch/sparc/kernel/traps.c | 9 +- arch/sparc/kernel/wof.S | 1 - arch/sparc/kernel/wuf.S | 1 - arch/sparc/mm/Makefile | 9 +- arch/sparc/mm/btfixup.c | 4 - arch/sparc/mm/fault.c | 2 +- arch/sparc/mm/init.c | 8 +- arch/sparc/mm/nosrmmu.c | 59 ------- arch/sparc/mm/srmmu.c | 38 +++-- arch/sparc/mm/sun4c.c | 182 +++++--------------- arch/sparc/mm/tsunami.S | 1 - arch/sparc/prom/Makefile | 2 - arch/sparc/prom/bootstr.c | 1 - arch/sparc/prom/console.c | 2 - arch/sparc/prom/init.c | 10 - arch/sparc/prom/memory.c | 13 -- arch/sparc/prom/sun4prom.c | 161 ------------------ arch/sparc64/kernel/central.c | 14 +- arch/sparc64/kernel/ds.c | 2 +- arch/sparc64/kernel/pci_msi.c | 10 +- arch/sparc64/kernel/pci_sun4v.c | 2 +- arch/sparc64/kernel/sys_sparc.c | 6 +- arch/sparc64/kernel/sys_sparc32.c | 7 +- drivers/ata/Kconfig | 1 - drivers/net/sunlance.c | 42 ----- drivers/sbus/char/uctrl.c | 16 +-- drivers/sbus/char/vfc.h | 4 - drivers/sbus/char/vfc_dev.c | 39 +++-- drivers/sbus/char/vfc_i2c.c | 12 +- drivers/sbus/dvma.c | 35 +---- include/asm-sparc/Kbuild | 8 + include/asm-sparc/asi.h | 153 +++++++++++++++++- include/asm-sparc/asmmacro.h | 5 - include/asm-sparc/display7seg.h | 79 +++++++++ include/asm-sparc/dma.h | 5 +- include/asm-sparc/elf.h | 5 +- include/asm-sparc/envctrl.h | 103 ++++++++++++ include/asm-sparc/fbio.h | 37 ++++- include/asm-sparc/fcntl.h | 4 + include/asm-sparc/ioctls.h | 4 +- include/asm-sparc/machines.h | 2 - include/asm-sparc/mbus.h | 2 - include/asm-sparc/mostek.h | 42 +----- include/asm-sparc/msgbuf.h | 23 ++- include/asm-sparc/openprom.h | 2 - include/asm-sparc/oplib.h | 2 - include/asm-sparc/page.h | 7 +- include/asm-sparc/pgtable.h | 11 +- include/asm-sparc/psrcompat.h | 45 +++++ include/asm-sparc/pstate.h | 91 ++++++++++ include/asm-sparc/resource.h | 6 +- include/asm-sparc/sembuf.h | 12 +- include/asm-sparc/setup.h | 6 +- include/asm-sparc/shmbuf.h | 14 ++- include/asm-sparc/sun4paddr.h | 56 ------- include/asm-sparc/system.h | 6 - include/asm-sparc/termbits.h | 5 + include/asm-sparc/termios.h | 79 +++++----- include/asm-sparc/timer.h | 10 +- include/asm-sparc/types.h | 32 ++++- include/asm-sparc/uctx.h | 71 ++++++++ include/asm-sparc/utrap.h | 51 ++++++ include/asm-sparc/vac-ops.h | 4 - include/asm-sparc/vaddrs.h | 5 - include/asm-sparc/watchdog.h | 31 ++++ include/asm-sparc64/Kbuild | 2 - include/asm-sparc64/asi.h | 161 +------------------ include/asm-sparc64/display7seg.h | 80 +--------- include/asm-sparc64/envctrl.h | 104 +------------ include/asm-sparc64/fbio.h | 331 +------------------------------------ include/asm-sparc64/fcntl.h | 36 +---- include/asm-sparc64/fhc.h | 10 - include/asm-sparc64/ioctl.h | 68 +-------- include/asm-sparc64/ioctls.h | 137 +--------------- include/asm-sparc64/mman.h | 32 +---- include/asm-sparc64/msgbuf.h | 28 +--- include/asm-sparc64/openpromio.h | 70 +-------- include/asm-sparc64/param.h | 24 +--- include/asm-sparc64/perfctr.h | 174 +------------------- include/asm-sparc64/poll.h | 13 +-- include/asm-sparc64/psrcompat.h | 46 +----- include/asm-sparc64/pstate.h | 92 +---------- include/asm-sparc64/resource.h | 20 +-- include/asm-sparc64/sembuf.h | 23 +--- include/asm-sparc64/setup.h | 11 +- include/asm-sparc64/shmbuf.h | 39 +----- include/asm-sparc64/socket.h | 58 +------- include/asm-sparc64/sockios.h | 15 +-- include/asm-sparc64/system.h | 3 +- include/asm-sparc64/termbits.h | 261 +----------------------------- include/asm-sparc64/termios.h | 187 +--------------------- include/asm-sparc64/types.h | 35 +---- include/asm-sparc64/uctx.h | 72 +-------- include/asm-sparc64/utrap.h | 52 +------ include/asm-sparc64/watchdog.h | 32 +---- 116 files changed, 1018 insertions(+), 3408 deletions(-) delete mode 100644 arch/sparc/kernel/sun4setup.c delete mode 100644 arch/sparc/mm/nosrmmu.c delete mode 100644 arch/sparc/prom/sun4prom.c create mode 100644 include/asm-sparc/display7seg.h create mode 100644 include/asm-sparc/envctrl.h create mode 100644 include/asm-sparc/psrcompat.h create mode 100644 include/asm-sparc/pstate.h delete mode 100644 include/asm-sparc/sun4paddr.h create mode 100644 include/asm-sparc/uctx.h create mode 100644 include/asm-sparc/utrap.h create mode 100644 include/asm-sparc/watchdog.h Merging galak/powerpc-next $ git merge galak/powerpc-next Auto-merged Documentation/powerpc/booting-without-of.txt CONFLICT (content): Merge conflict in Documentation/powerpc/booting-without-of.txt Auto-merged arch/powerpc/Kconfig Auto-merged arch/powerpc/boot/Makefile Auto-merged arch/powerpc/kernel/cputable.c Auto-merged arch/powerpc/platforms/85xx/Kconfig Resolved 'Documentation/powerpc/booting-without-of.txt' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. Documentation/powerpc/booting-without-of.txt | 64 ++- arch/powerpc/Kconfig | 6 + arch/powerpc/boot/Makefile | 1 + arch/powerpc/boot/dts/mpc836x_rdk.dts | 397 ++++++++ arch/powerpc/boot/dts/tqm8540.dts | 4 +- arch/powerpc/boot/dts/tqm8541.dts | 4 +- arch/powerpc/boot/dts/tqm8548-bigflash.dts | 365 ++++++++ arch/powerpc/boot/dts/tqm8548.dts | 365 ++++++++ arch/powerpc/boot/dts/tqm8555.dts | 4 +- arch/powerpc/boot/dts/tqm8560.dts | 69 ++- arch/powerpc/boot/wrapper | 2 +- arch/powerpc/configs/83xx/mpc836x_rdk_defconfig | 1128 +++++++++++++++++++++++ arch/powerpc/configs/85xx/tqm8548_defconfig | 1094 ++++++++++++++++++++++ arch/powerpc/kernel/cputable.c | 15 + arch/powerpc/kernel/head_booke.h | 10 +- arch/powerpc/kernel/head_fsl_booke.S | 10 +- arch/powerpc/platforms/83xx/Kconfig | 11 + arch/powerpc/platforms/83xx/Makefile | 1 + arch/powerpc/platforms/83xx/mpc836x_rdk.c | 102 ++ arch/powerpc/platforms/85xx/Kconfig | 8 + arch/powerpc/platforms/85xx/tqm85xx.c | 23 +- arch/powerpc/platforms/Kconfig.cputype | 7 +- arch/powerpc/sysdev/Makefile | 2 + arch/powerpc/sysdev/cpm_common.c | 16 +- arch/powerpc/sysdev/fsl_gtm.c | 434 +++++++++ arch/powerpc/sysdev/qe_lib/Kconfig | 13 + arch/powerpc/sysdev/qe_lib/Makefile | 2 + arch/powerpc/sysdev/qe_lib/gpio.c | 146 +++ arch/powerpc/sysdev/qe_lib/qe.c | 94 +-- arch/powerpc/sysdev/qe_lib/qe_io.c | 94 +- arch/powerpc/sysdev/qe_lib/ucc.c | 7 +- arch/powerpc/sysdev/qe_lib/usb.c | 55 ++ include/asm-powerpc/cache.h | 3 + include/asm-powerpc/cpm.h | 1 + include/asm-powerpc/cputable.h | 6 +- include/asm-powerpc/fsl_gtm.h | 47 + include/asm-powerpc/qe.h | 83 ++- include/asm-powerpc/reg_booke.h | 55 ++ include/asm-powerpc/synch.h | 2 +- 39 files changed, 4546 insertions(+), 204 deletions(-) create mode 100644 arch/powerpc/boot/dts/mpc836x_rdk.dts create mode 100644 arch/powerpc/boot/dts/tqm8548-bigflash.dts create mode 100644 arch/powerpc/boot/dts/tqm8548.dts create mode 100644 arch/powerpc/configs/83xx/mpc836x_rdk_defconfig create mode 100644 arch/powerpc/configs/85xx/tqm8548_defconfig create mode 100644 arch/powerpc/platforms/83xx/mpc836x_rdk.c create mode 100644 arch/powerpc/sysdev/fsl_gtm.c create mode 100644 arch/powerpc/sysdev/qe_lib/gpio.c create mode 100644 arch/powerpc/sysdev/qe_lib/usb.c create mode 100644 include/asm-powerpc/fsl_gtm.h Merging mtd/master $ git merge mtd/master Auto-merged arch/arm/mach-at91/at91sam9261_devices.c Auto-merged arch/arm/mach-at91/at91sam9rl_devices.c Auto-merged arch/avr32/boards/atstk1000/atstk1002.c Auto-merged arch/avr32/mach-at32ap/at32ap700x.c Auto-merged drivers/mtd/maps/Kconfig Auto-merged drivers/mtd/maps/Makefile Auto-merged drivers/mtd/mtdchar.c Auto-merged drivers/mtd/redboot.c Removed include/asm-arm/arch-at91/at91_ecc.h Auto-merged include/asm-avr32/arch-at32ap/board.h Auto-merged include/linux/mtd/nand.h Merge made by recursive. arch/arm/mach-at91/at91cap9_devices.c | 8 +- arch/arm/mach-at91/at91rm9200_devices.c | 8 +- arch/arm/mach-at91/at91sam9260_devices.c | 8 +- arch/arm/mach-at91/at91sam9261_devices.c | 12 +- arch/arm/mach-at91/at91sam9263_devices.c | 8 +- arch/arm/mach-at91/at91sam9rl_devices.c | 12 +- arch/arm/mach-at91/board-cam60.c | 2 +- arch/arm/mach-at91/board-cap9adk.c | 2 +- arch/arm/mach-at91/board-dk.c | 2 +- arch/arm/mach-at91/board-kb9202.c | 2 +- arch/arm/mach-at91/board-sam9-l9260.c | 2 +- arch/arm/mach-at91/board-sam9260ek.c | 2 +- arch/arm/mach-at91/board-sam9261ek.c | 2 +- arch/arm/mach-at91/board-sam9263ek.c | 2 +- arch/arm/mach-at91/board-sam9rlek.c | 2 +- arch/arm/mach-at91/board-yl-9200.c | 2 +- arch/avr32/boards/atstk1000/Kconfig | 4 + arch/avr32/boards/atstk1000/Makefile | 1 + arch/avr32/boards/atstk1000/atstk1002.c | 78 ++++++++- arch/avr32/mach-at32ap/at32ap700x.c | 52 ++++++ arch/avr32/mach-at32ap/hsmc.c | 2 +- drivers/mtd/Kconfig | 2 - drivers/mtd/afs.c | 2 - drivers/mtd/chips/cfi_cmdset_0001.c | 8 +- drivers/mtd/chips/cfi_cmdset_0002.c | 3 - drivers/mtd/chips/cfi_cmdset_0020.c | 2 - drivers/mtd/chips/cfi_probe.c | 1 - drivers/mtd/chips/cfi_util.c | 3 - drivers/mtd/chips/chipreg.c | 2 - drivers/mtd/chips/gen_probe.c | 1 - drivers/mtd/chips/jedec_probe.c | 119 +++++++++++++- drivers/mtd/chips/map_absent.c | 1 - drivers/mtd/chips/map_ram.c | 1 - drivers/mtd/chips/map_rom.c | 1 - drivers/mtd/cmdlinepart.c | 2 - drivers/mtd/devices/Kconfig | 1 - drivers/mtd/devices/Makefile | 1 - drivers/mtd/devices/block2mtd.c | 6 - drivers/mtd/devices/doc2000.c | 2 - drivers/mtd/devices/doc2001.c | 2 - drivers/mtd/devices/doc2001plus.c | 2 - drivers/mtd/devices/docecc.c | 2 - drivers/mtd/devices/docprobe.c | 3 - drivers/mtd/devices/lart.c | 2 - drivers/mtd/devices/ms02-nv.c | 2 - drivers/mtd/devices/ms02-nv.h | 2 - drivers/mtd/devices/mtd_dataflash.c | 135 +++++++++++++-- drivers/mtd/devices/mtdram.c | 1 - drivers/mtd/devices/phram.c | 2 - drivers/mtd/devices/pmc551.c | 2 - drivers/mtd/devices/slram.c | 2 - drivers/mtd/ftl.c | 3 - drivers/mtd/inftlcore.c | 5 - drivers/mtd/inftlmount.c | 4 - drivers/mtd/maps/Kconfig | 12 ++- drivers/mtd/maps/Makefile | 2 +- drivers/mtd/maps/amd76xrom.c | 1 - drivers/mtd/maps/autcpu12-nvram.c | 2 - drivers/mtd/maps/bast-flash.c | 2 - drivers/mtd/maps/bfin-async-flash.c | 219 ++++++++++++++++++++++++ drivers/mtd/maps/cdb89712.c | 1 - drivers/mtd/maps/ceiva.c | 1 - drivers/mtd/maps/cfi_flagadm.c | 2 - drivers/mtd/maps/dbox2-flash.c | 2 - drivers/mtd/maps/dc21285.c | 2 - drivers/mtd/maps/dilnetpc.c | 2 - drivers/mtd/maps/dmv182.c | 2 - drivers/mtd/maps/ebony.c | 2 - drivers/mtd/maps/edb7312.c | 2 - drivers/mtd/maps/fortunet.c | 1 - drivers/mtd/maps/h720x-flash.c | 2 - drivers/mtd/maps/ichxrom.c | 1 - drivers/mtd/maps/impa7.c | 2 - drivers/mtd/maps/integrator-flash.c | 2 - drivers/mtd/maps/ipaq-flash.c | 2 - drivers/mtd/maps/ixp2000.c | 2 - drivers/mtd/maps/ixp4xx.c | 2 - drivers/mtd/maps/l440gx.c | 2 - drivers/mtd/maps/map_funcs.c | 2 - drivers/mtd/maps/mbx860.c | 2 - drivers/mtd/maps/mtx-1_flash.c | 2 - drivers/mtd/maps/netsc520.c | 2 - drivers/mtd/maps/nettel.c | 2 - drivers/mtd/maps/octagon-5066.c | 1 - drivers/mtd/maps/omap-toto-flash.c | 2 - drivers/mtd/maps/pci.c | 2 - drivers/mtd/maps/pcmciamtd.c | 5 +- drivers/mtd/maps/physmap.c | 2 - drivers/mtd/maps/plat-ram.c | 2 - drivers/mtd/maps/redwood.c | 2 - drivers/mtd/maps/rpxlite.c | 2 - drivers/mtd/maps/sa1100-flash.c | 2 - drivers/mtd/maps/sbc8240.c | 3 - drivers/mtd/maps/sbc_gxx.c | 2 - drivers/mtd/maps/sc520cdp.c | 2 - drivers/mtd/maps/scb2_flash.c | 1 - drivers/mtd/maps/scx200_docflash.c | 2 - drivers/mtd/maps/sharpsl-flash.c | 2 - drivers/mtd/maps/solutionengine.c | 2 - drivers/mtd/maps/sun_uflash.c | 2 +- drivers/mtd/maps/tqm8xxl.c | 2 - drivers/mtd/maps/ts5500_flash.c | 2 - drivers/mtd/maps/tsunami_flash.c | 1 - drivers/mtd/maps/uclinux.c | 2 - drivers/mtd/maps/vmax301.c | 1 - drivers/mtd/maps/walnut.c | 2 - drivers/mtd/maps/wr_sbc82xx_flash.c | 2 - drivers/mtd/mtd_blkdevs.c | 34 +--- drivers/mtd/mtdblock.c | 2 - drivers/mtd/mtdblock_ro.c | 2 - drivers/mtd/mtdchar.c | 2 - drivers/mtd/mtdconcat.c | 2 - drivers/mtd/mtdcore.c | 14 +- drivers/mtd/mtdpart.c | 25 +-- drivers/mtd/nand/Kconfig | 28 ++-- drivers/mtd/nand/Makefile | 3 +- drivers/mtd/nand/{at91_nand.c => atmel_nand.c} | 217 ++++++++++++------------ drivers/mtd/nand/atmel_nand_ecc.h | 36 ++++ drivers/mtd/nand/au1550nd.c | 2 - drivers/mtd/nand/autcpu12.c | 2 - drivers/mtd/nand/cafe_nand.c | 6 +- drivers/mtd/nand/diskonchip.c | 2 - drivers/mtd/nand/edb7312.c | 2 - drivers/mtd/nand/excite_nandflash.c | 2 +- drivers/mtd/nand/fsl_elbc_nand.c | 4 +- drivers/mtd/nand/h1910.c | 2 - drivers/mtd/nand/nand_bbt.c | 2 - drivers/mtd/nand/nand_ecc.c | 2 - drivers/mtd/nand/nand_ids.c | 2 - drivers/mtd/nand/nandsim.c | 41 +++-- drivers/mtd/nand/ppchameleonevb.c | 2 - drivers/mtd/nand/rtc_from4.c | 2 - drivers/mtd/nand/s3c2410.c | 25 +--- drivers/mtd/nand/sharpsl.c | 2 - drivers/mtd/nand/spia.c | 2 - drivers/mtd/nand/toto.c | 2 - drivers/mtd/nand/ts7250.c | 2 - drivers/mtd/nftlcore.c | 5 - drivers/mtd/nftlmount.c | 4 - drivers/mtd/onenand/onenand_base.c | 54 +++--- drivers/mtd/redboot.c | 2 - drivers/mtd/rfd_ftl.c | 2 - include/asm-arm/arch-at91/at91_ecc.h | 38 ---- include/asm-arm/arch-at91/board.h | 4 +- include/asm-avr32/arch-at32ap/board.h | 13 ++ include/linux/jffs2.h | 3 - include/linux/mtd/blktrans.h | 2 - include/linux/mtd/cfi.h | 1 - include/linux/mtd/cfi_endian.h | 5 - include/linux/mtd/concat.h | 2 - include/linux/mtd/doc2000.h | 2 - include/linux/mtd/flashchip.h | 3 - include/linux/mtd/ftl.h | 2 - include/linux/mtd/gen_probe.h | 1 - include/linux/mtd/inftl.h | 4 - include/linux/mtd/map.h | 1 - include/linux/mtd/mtd.h | 2 - include/linux/mtd/nand.h | 2 - include/linux/mtd/nand_ecc.h | 2 - include/linux/mtd/nftl.h | 2 - include/linux/mtd/partitions.h | 2 - include/linux/mtd/physmap.h | 2 - include/linux/mtd/plat-ram.h | 2 - include/linux/mtd/pmc551.h | 4 +- include/linux/mtd/xip.h | 2 - include/mtd/inftl-user.h | 2 - include/mtd/jffs2-user.h | 2 - include/mtd/mtd-abi.h | 2 - include/mtd/mtd-user.h | 2 - include/mtd/nftl-user.h | 2 - 170 files changed, 903 insertions(+), 614 deletions(-) create mode 100644 drivers/mtd/maps/bfin-async-flash.c rename drivers/mtd/nand/{at91_nand.c => atmel_nand.c} (69%) create mode 100644 drivers/mtd/nand/atmel_nand_ecc.h delete mode 100644 include/asm-arm/arch-at91/at91_ecc.h Merging wireless/master $ git merge wireless/master Already up-to-date. Merging crypto/master $ git merge crypto/master Merge made by recursive. crypto/Kconfig | 52 ++ crypto/Makefile | 5 + crypto/ahash.c | 106 ++++ crypto/api.c | 8 +- crypto/cryptd.c | 252 ++++++++- crypto/digest.c | 81 +++ crypto/hash.c | 102 +++- crypto/internal.h | 1 + crypto/ripemd.h | 43 ++ crypto/rmd128.c | 325 +++++++++++ crypto/rmd160.c | 369 ++++++++++++ crypto/rmd256.c | 344 +++++++++++ crypto/rmd320.c | 393 +++++++++++++ crypto/tcrypt.c | 172 +++++-- crypto/tcrypt.h | 526 +++++++++++++++++- drivers/crypto/Kconfig | 15 + drivers/crypto/Makefile | 1 + drivers/crypto/hifn_795x.c | 367 ++++++------ drivers/crypto/talitos.c | 1371 ++++++++++++++++++++++++++++++++++++++++++++ drivers/crypto/talitos.h | 191 ++++++ include/crypto/algapi.h | 36 ++ include/linux/crypto.h | 187 ++++++- 22 files changed, 4699 insertions(+), 248 deletions(-) create mode 100644 crypto/ahash.c create mode 100644 crypto/ripemd.h create mode 100644 crypto/rmd128.c create mode 100644 crypto/rmd160.c create mode 100644 crypto/rmd256.c create mode 100644 crypto/rmd320.c create mode 100644 drivers/crypto/talitos.c create mode 100644 drivers/crypto/talitos.h Merging vfs/vfs-2.6.25 $ git merge vfs/vfs-2.6.25 Auto-merged fs/binfmt_elf.c Auto-merged fs/exec.c Auto-merged kernel/fork.c Auto-merged kernel/sysctl.c Merge made by recursive. Merging sound/master $ git merge sound/master Auto-merged sound/core/init.c Auto-merged sound/pci/emu10k1/emu10k1_main.c Auto-merged sound/pci/hda/patch_realtek.c Auto-merged sound/pci/maestro3.c Auto-merged sound/pci/pcxhr/pcxhr_core.c Merge made by recursive. Documentation/sound/alsa/ALSA-Configuration.txt | 17 +- .../sound/alsa/DocBook/writing-an-alsa-driver.tmpl | 4 +- include/sound/control.h | 3 - include/sound/core.h | 8 +- include/sound/cs4231-regs.h | 8 + include/sound/cs4231.h | 3 + include/sound/emu10k1.h | 1 + include/sound/soc-dapm.h | 25 +- include/sound/soc.h | 89 +- include/sound/uda1341.h | 2 - include/sound/version.h | 4 +- sound/Kconfig | 34 +- sound/aoa/Kconfig | 11 +- sound/aoa/codecs/Kconfig | 4 - sound/aoa/fabrics/Kconfig | 1 - sound/aoa/soundbus/Kconfig | 1 - sound/arm/Kconfig | 21 +- sound/arm/sa11xx-uda1341.c | 2 - sound/core/Kconfig | 29 +- sound/core/control.c | 7 +- sound/core/init.c | 67 +- sound/core/memalloc.c | 62 - sound/drivers/Kconfig | 91 +- sound/i2c/cs8427.c | 6 +- sound/i2c/l3/uda1341.c | 2 - sound/isa/Kconfig | 61 +- sound/isa/cs423x/cs4231_lib.c | 118 ++- sound/isa/opti9xx/opti92x-ad1848.c | 1126 +------------- sound/isa/sb/Makefile | 2 - sound/mips/Kconfig | 14 +- sound/oss/Kconfig | 49 +- sound/oss/dmasound/dmasound_core.c | 7 +- sound/oss/dmasound/dmasound_paula.c | 2 +- sound/oss/dmasound/dmasound_q40.c | 2 +- sound/oss/msnd.c | 2 - sound/oss/msnd.h | 2 - sound/oss/msnd_classic.h | 2 - sound/oss/msnd_pinnacle.c | 5 - sound/oss/msnd_pinnacle.h | 2 - sound/parisc/Kconfig | 13 +- sound/pci/Kconfig | 104 +-- sound/pci/Makefile | 2 +- sound/pci/ac97/Makefile | 12 +- sound/pci/ac97/ac97_codec.c | 7 +- sound/pci/ac97/ac97_patch.c | 77 + sound/pci/{ac97 => }/ak4531_codec.c | 34 +- sound/pci/au88x0/au88x0_game.c | 2 - sound/pci/azt3328.c | 1192 ++++++++++----- sound/pci/azt3328.h | 197 ++- sound/pci/ca0106/ca0106_main.c | 5 + sound/pci/emu10k1/emu10k1_main.c | 1 + sound/pci/emu10k1/emumixer.c | 13 +- sound/pci/emu10k1/memory.c | 69 +- sound/pci/hda/hda_codec.c | 2 +- sound/pci/hda/hda_codec.h | 2 +- sound/pci/hda/hda_hwdep.c | 2 +- sound/pci/hda/hda_intel.c | 306 +++- sound/pci/hda/hda_proc.c | 5 +- sound/pci/hda/patch_analog.c | 37 +- sound/pci/hda/patch_conexant.c | 4 - sound/pci/hda/patch_realtek.c | 532 ++++++- sound/pci/hda/patch_sigmatel.c | 67 +- sound/pci/ice1712/envy24ht.h | 10 +- sound/pci/ice1712/ice1712.h | 2 + sound/pci/ice1712/ice1724.c | 213 ++- sound/pci/maestro3.c | 42 +- sound/pci/oxygen/hifier.c | 33 +- sound/pci/oxygen/oxygen.c | 76 +- sound/pci/oxygen/oxygen.h | 14 + sound/pci/oxygen/oxygen_io.c | 22 +- sound/pci/oxygen/oxygen_lib.c | 106 ++- sound/pci/oxygen/oxygen_pcm.c | 53 +- sound/pci/oxygen/virtuoso.c | 252 ++-- sound/pci/pcxhr/pcxhr.c | 4 +- sound/pci/pcxhr/pcxhr_core.c | 18 +- sound/pci/trident/trident_memory.c | 178 --- sound/pcmcia/Kconfig | 15 +- sound/ppc/Kconfig | 26 +- sound/sh/Kconfig | 16 +- sound/soc/Kconfig | 18 +- sound/soc/Makefile | 3 +- sound/soc/at32/Kconfig | 34 + sound/soc/at32/Makefile | 11 + sound/soc/at32/at32-pcm.c | 491 ++++++ sound/soc/at32/at32-pcm.h | 79 + sound/soc/at32/at32-ssc.c | 849 ++++++++++ sound/soc/at32/at32-ssc.h | 59 + sound/soc/at32/playpaq_wm8510.c | 524 +++++++ sound/soc/at91/Kconfig | 2 +- sound/soc/at91/eti_b1_wm8731.c | 17 +- sound/soc/codecs/Kconfig | 19 +- sound/soc/codecs/Makefile | 6 + sound/soc/codecs/ac97.c | 4 +- sound/soc/codecs/tlv320aic3x.c | 321 ++-- sound/soc/codecs/tlv320aic3x.h | 51 + sound/soc/codecs/uda1380.c | 852 ++++++++++ sound/soc/codecs/uda1380.h | 89 ++ sound/soc/codecs/wm8510.c | 836 ++++++++++ sound/soc/codecs/wm8510.h | 103 ++ sound/soc/codecs/wm8731.c | 46 +- sound/soc/codecs/wm8750.c | 54 +- sound/soc/codecs/wm8753.c | 130 +- sound/soc/codecs/wm8990.c | 1645 ++++++++++++++++++++ sound/soc/codecs/wm8990.h | 832 ++++++++++ sound/soc/codecs/wm9712.c | 51 +- sound/soc/codecs/wm9713.c | 50 +- sound/soc/davinci/Kconfig | 2 +- sound/soc/davinci/davinci-evm.c | 14 +- sound/soc/davinci/davinci-i2s.c | 6 +- sound/soc/fsl/Kconfig | 2 +- sound/soc/fsl/mpc8610_hpcd.c | 10 +- sound/soc/omap/n810.c | 37 +- sound/soc/pxa/Kconfig | 11 +- sound/soc/pxa/Makefile | 3 +- sound/soc/pxa/corgi.c | 16 +- sound/soc/pxa/em-x270.c | 102 ++ sound/soc/pxa/poodle.c | 14 +- sound/soc/pxa/pxa2xx-ac97.c | 3 +- sound/soc/pxa/pxa2xx-i2s.c | 3 - sound/soc/pxa/spitz.c | 17 +- sound/soc/pxa/tosa.c | 17 +- sound/soc/s3c24xx/Kconfig | 4 +- sound/soc/s3c24xx/neo1973_wm8753.c | 83 +- sound/soc/s3c24xx/s3c2412-i2s.c | 3 +- sound/soc/s3c24xx/s3c2443-ac97.c | 9 +- sound/soc/s3c24xx/s3c24xx-i2s.c | 13 +- sound/soc/s3c24xx/s3c24xx-pcm.c | 4 - sound/soc/s3c24xx/smdk2443_wm9710.c | 3 - sound/soc/sh/Kconfig | 5 +- sound/soc/soc-core.c | 253 +++- sound/soc/soc-dapm.c | 171 ++- sound/sparc/Kconfig | 17 +- sound/sparc/dbri.c | 2 +- sound/spi/Kconfig | 13 +- sound/usb/Kconfig | 16 +- sound/usb/caiaq/caiaq-audio.c | 1 + sound/usb/caiaq/caiaq-device.c | 12 +- sound/usb/caiaq/caiaq-device.h | 1 + sound/usb/usbaudio.c | 4 - sound/usb/usbquirks.h | 33 + 140 files changed, 10499 insertions(+), 3242 deletions(-) rename sound/pci/{ac97 => }/ak4531_codec.c (96%) create mode 100644 sound/soc/at32/Kconfig create mode 100644 sound/soc/at32/Makefile create mode 100644 sound/soc/at32/at32-pcm.c create mode 100644 sound/soc/at32/at32-pcm.h create mode 100644 sound/soc/at32/at32-ssc.c create mode 100644 sound/soc/at32/at32-ssc.h create mode 100644 sound/soc/at32/playpaq_wm8510.c create mode 100644 sound/soc/codecs/uda1380.c create mode 100644 sound/soc/codecs/uda1380.h create mode 100644 sound/soc/codecs/wm8510.c create mode 100644 sound/soc/codecs/wm8510.h create mode 100644 sound/soc/codecs/wm8990.c create mode 100644 sound/soc/codecs/wm8990.h create mode 100644 sound/soc/pxa/em-x270.c Merging arm/devel $ git merge arm/devel Auto-merged arch/arm/Kconfig Removed arch/arm/common/rtctime.c Auto-merged arch/arm/kernel/ecard.c Auto-merged arch/arm/mach-at91/at91cap9_devices.c Auto-merged arch/arm/mach-at91/at91sam9rl_devices.c Auto-merged arch/arm/mach-at91/board-cap9adk.c Auto-merged arch/arm/mach-at91/board-dk.c Auto-merged arch/arm/mach-at91/board-kb9202.c Auto-merged arch/arm/mach-at91/board-sam9rlek.c Auto-merged arch/arm/mach-at91/board-yl-9200.c CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-yl-9200.c Removed arch/arm/mach-footbridge/co285.c Removed arch/arm/mach-integrator/time.c Auto-merged arch/arm/mach-pxa/cm-x270.c Auto-merged arch/arm/mach-pxa/em-x270.c Auto-merged arch/arm/mach-pxa/tosa.c CONFLICT (content): Merge conflict in arch/arm/mach-pxa/tosa.c Auto-merged drivers/i2c/busses/i2c-pxa.c Auto-merged drivers/net/arm/etherh.c Auto-merged drivers/rtc/Kconfig Auto-merged drivers/rtc/Makefile Auto-merged drivers/usb/gadget/pxa2xx_udc.c Auto-merged include/asm-arm/arch-at91/board.h Auto-merged include/asm-arm/arch-pxa/pxa2xx-gpio.h Removed include/asm-arm/dyntick.h Removed include/asm-arm/rtc.h Auto-merged kernel/hrtimer.c Auto-merged kernel/sysctl.c Auto-merged kernel/timer.c Auto-merged sound/soc/pxa/Kconfig Auto-merged sound/soc/pxa/pxa2xx-i2s.c Auto-merged sound/soc/pxa/tosa.c Resolved 'arch/arm/mach-at91/board-yl-9200.c' using previous resolution. Resolved 'arch/arm/mach-pxa/tosa.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. arch/arm/Kconfig | 33 +- arch/arm/Makefile | 2 - arch/arm/common/Makefile | 1 - arch/arm/common/rtctime.c | 434 ---------- arch/arm/common/sharpsl_pm.c | 3 + arch/arm/configs/at91cap9adk_defconfig | 82 ++- arch/arm/configs/at91rm9200dk_defconfig | 1 - arch/arm/configs/at91rm9200ek_defconfig | 1 - arch/arm/configs/at91sam9260ek_defconfig | 1 - arch/arm/configs/at91sam9261ek_defconfig | 1 - arch/arm/configs/at91sam9263ek_defconfig | 1 - arch/arm/configs/at91sam9rlek_defconfig | 1 - arch/arm/configs/ateb9200_defconfig | 1 - arch/arm/configs/collie_defconfig | 1 - arch/arm/configs/corgi_defconfig | 1 - arch/arm/configs/ecbat91_defconfig | 1 - arch/arm/configs/ep93xx_defconfig | 1 - arch/arm/configs/eseries_pxa_defconfig | 1 - arch/arm/configs/iop13xx_defconfig | 1 - arch/arm/configs/iop32x_defconfig | 1 - arch/arm/configs/iop33x_defconfig | 1 - arch/arm/configs/ixp2000_defconfig | 1 - arch/arm/configs/ixp23xx_defconfig | 1 - arch/arm/configs/ixp4xx_defconfig | 9 +- arch/arm/configs/kafa_defconfig | 1 - arch/arm/configs/kb9202_defconfig | 1 - arch/arm/configs/ks8695_defconfig | 1 - arch/arm/configs/lpd270_defconfig | 1 - arch/arm/configs/lpd7a404_defconfig | 1 - arch/arm/configs/netx_defconfig | 1 - arch/arm/configs/onearm_defconfig | 1 - arch/arm/configs/picotux200_defconfig | 1 - arch/arm/configs/pnx4008_defconfig | 1 - .../{em_x270_defconfig => qil-a9260_defconfig} | 729 ++++++++--------- arch/arm/configs/realview-smp_defconfig | 1 - arch/arm/configs/realview_defconfig | 1 - arch/arm/configs/rpc_defconfig | 1 - arch/arm/configs/s3c2410_defconfig | 1 - arch/arm/configs/sam9_l9260_defconfig | 1 - arch/arm/configs/spitz_defconfig | 1 - arch/arm/configs/tct_hammer_defconfig | 1 - arch/arm/configs/trizeps4_defconfig | 1 - .../{em_x270_defconfig => usb-a9260_defconfig} | 699 +++++++---------- .../{em_x270_defconfig => usb-a9263_defconfig} | 691 +++++++---------- arch/arm/configs/versatile_defconfig | 1 - .../{cm_x270_defconfig => xm_x270_defconfig} | 861 ++++++++++++++------ arch/arm/kernel/atags.c | 83 +- arch/arm/kernel/ecard.c | 13 +- arch/arm/kernel/ecard.h | 13 + arch/arm/kernel/process.c | 4 +- arch/arm/kernel/time.c | 120 --- arch/arm/mach-at91/Kconfig | 27 + arch/arm/mach-at91/Makefile | 4 + arch/arm/mach-at91/at91cap9_devices.c | 99 +++ arch/arm/mach-at91/at91sam9rl_devices.c | 95 +++ arch/arm/mach-at91/board-cap9adk.c | 9 + arch/arm/mach-at91/board-carmeva.c | 23 +- arch/arm/mach-at91/board-csb637.c | 4 +- arch/arm/mach-at91/board-dk.c | 25 +- arch/arm/mach-at91/board-eb9200.c | 26 +- arch/arm/mach-at91/board-ek.c | 25 +- arch/arm/mach-at91/board-kb9202.c | 29 +- arch/arm/mach-at91/board-qil-a9260.c | 255 ++++++ arch/arm/mach-at91/board-sam9rlek.c | 10 + arch/arm/mach-at91/board-usb-a9260.c | 215 +++++ arch/arm/mach-at91/board-usb-a9263.c | 230 ++++++ arch/arm/mach-at91/board-yl-9200.c | 843 +++++++++----------- arch/arm/mach-at91/clock.c | 45 +- arch/arm/mach-footbridge/Makefile | 2 - arch/arm/mach-footbridge/co285.c | 39 - arch/arm/mach-footbridge/common.c | 21 - arch/arm/mach-footbridge/ebsa285-leds.c | 2 +- arch/arm/mach-footbridge/time.c | 3 +- arch/arm/mach-integrator/Makefile | 2 +- arch/arm/mach-integrator/time.c | 223 ----- arch/arm/mach-ixp4xx/Kconfig | 9 + arch/arm/mach-ixp4xx/Makefile | 2 + arch/arm/mach-ixp4xx/fsg-pci.c | 71 ++ arch/arm/mach-ixp4xx/fsg-setup.c | 276 +++++++ arch/arm/mach-omap1/pm.c | 7 - arch/arm/mach-omap2/pm.c | 7 - arch/arm/mach-pxa/Kconfig | 60 +- arch/arm/mach-pxa/Makefile | 3 +- arch/arm/mach-pxa/clock.c | 2 +- arch/arm/mach-pxa/cm-x270-pci.c | 26 +- arch/arm/mach-pxa/cm-x270.c | 9 +- arch/arm/mach-pxa/corgi.c | 1 + arch/arm/mach-pxa/corgi_pm.c | 7 + arch/arm/mach-pxa/devices.c | 119 +++ arch/arm/mach-pxa/devices.h | 6 + arch/arm/mach-pxa/em-x270.c | 10 +- arch/arm/mach-pxa/generic.c | 17 - arch/arm/mach-pxa/lpd270.c | 55 +- arch/arm/mach-pxa/lubbock.c | 18 +- arch/arm/mach-pxa/magician.c | 110 ++- arch/arm/mach-pxa/mainstone.c | 71 +-- arch/arm/mach-pxa/mfp-pxa2xx.c | 1 + arch/arm/mach-pxa/pcm027.c | 31 + arch/arm/mach-pxa/pcm990-baseboard.c | 131 +++- arch/arm/mach-pxa/poodle.c | 1 + arch/arm/mach-pxa/pwm.c | 313 +++++++ arch/arm/mach-pxa/pxa25x.c | 7 +- arch/arm/mach-pxa/pxa27x.c | 10 +- arch/arm/mach-pxa/pxa3xx.c | 6 +- arch/arm/mach-pxa/reset.c | 96 +++ arch/arm/mach-pxa/spitz.c | 7 +- arch/arm/mach-pxa/spitz_pm.c | 7 + arch/arm/mach-pxa/standby.S | 83 +- arch/arm/mach-pxa/tosa.c | 334 +++++++- arch/arm/mach-pxa/trizeps4.c | 12 +- arch/arm/mach-pxa/zylonite.c | 28 +- arch/arm/mach-pxa/zylonite_pxa300.c | 4 +- arch/arm/mach-pxa/zylonite_pxa320.c | 2 +- arch/sh/configs/landisk_defconfig | 1 - arch/sh/configs/lboxre2_defconfig | 1 - arch/sh/configs/se7705_defconfig | 1 - arch/sh/configs/se7712_defconfig | 1 - arch/sh/configs/se7750_defconfig | 1 - drivers/i2c/busses/i2c-pxa.c | 29 - drivers/input/keyboard/tosakbd.c | 2 - drivers/mfd/Kconfig | 5 + drivers/mfd/Makefile | 2 + drivers/mfd/tc6393xb.c | 539 ++++++++++++ drivers/net/arm/etherh.c | 2 +- drivers/pcmcia/pxa2xx_cm_x270.c | 15 +- drivers/pcmcia/pxa2xx_mainstone.c | 13 +- drivers/pcmcia/pxa2xx_sharpsl.c | 12 +- drivers/rtc/Kconfig | 19 +- drivers/rtc/Makefile | 1 + drivers/rtc/rtc-at91rm9200.c | 4 - drivers/rtc/rtc-at91sam9.c | 1 - drivers/rtc/rtc-omap.c | 1 - drivers/rtc/rtc-pl030.c | 217 +++++ drivers/rtc/rtc-pl031.c | 36 +- drivers/rtc/rtc-s3c.c | 4 - drivers/rtc/rtc-sa1100.c | 37 +- drivers/scsi/arm/Kconfig | 2 +- drivers/scsi/arm/acornscsi-io.S | 15 +- drivers/scsi/arm/acornscsi.c | 426 +++++------ drivers/scsi/arm/acornscsi.h | 9 +- drivers/usb/gadget/Kconfig | 4 +- drivers/usb/gadget/pxa27x_udc.c | 5 +- drivers/usb/gadget/pxa27x_udc.h | 8 - drivers/usb/gadget/pxa2xx_udc.c | 10 +- drivers/usb/host/ohci-pxa27x.c | 3 +- drivers/video/backlight/Kconfig | 7 + drivers/video/backlight/Makefile | 1 + drivers/video/backlight/pwm_bl.c | 185 +++++ include/asm-arm/arch-at91/at91_pmc.h | 7 +- include/asm-arm/arch-at91/at91cap9.h | 2 +- include/asm-arm/arch-at91/at91cap9_matrix.h | 5 + include/asm-arm/arch-at91/at91sam9rl.h | 2 +- include/asm-arm/arch-at91/board.h | 4 + include/asm-arm/arch-at91/timex.h | 17 +- include/asm-arm/arch-ebsa285/hardware.h | 26 - include/asm-arm/arch-ebsa285/memory.h | 19 - include/asm-arm/arch-ebsa285/vmalloc.h | 4 - include/asm-arm/arch-ixp4xx/fsg.h | 50 ++ include/asm-arm/arch-ixp4xx/hardware.h | 1 + include/asm-arm/arch-ixp4xx/irqs.h | 7 + include/asm-arm/arch-ns9xxx/hardware.h | 4 +- include/asm-arm/arch-pxa/audio.h | 2 + include/asm-arm/arch-pxa/hardware.h | 12 +- include/asm-arm/arch-pxa/irqs.h | 1 + include/asm-arm/arch-pxa/pxa-regs.h | 570 +------------- include/asm-arm/arch-pxa/pxa25x-udc.h | 163 ++++ include/asm-arm/arch-pxa/pxa27x-udc.h | 257 ++++++ include/asm-arm/arch-pxa/pxa2xx-gpio.h | 2 + include/asm-arm/arch-pxa/pxa2xx-regs.h | 162 ++++ include/asm-arm/arch-pxa/pxa2xx_spi.h | 2 + include/asm-arm/arch-pxa/system.h | 18 +- include/asm-arm/arch-pxa/tosa.h | 45 +- include/asm-arm/arch-pxa/zylonite.h | 1 - include/asm-arm/arch-rpc/io.h | 5 +- include/asm-arm/dyntick.h | 6 - include/asm-arm/ecard.h | 35 - include/asm-arm/hw_irq.h | 11 - include/asm-arm/kexec.h | 2 - include/asm-arm/mach/time.h | 22 - include/asm-arm/rtc.h | 43 - include/linux/mfd/tc6393xb.h | 47 ++ include/linux/pwm.h | 31 + include/linux/pwm_backlight.h | 17 + kernel/hrtimer.c | 2 +- kernel/sysctl.c | 12 - kernel/timer.c | 10 +- sound/soc/pxa/Kconfig | 1 + sound/soc/pxa/pxa2xx-i2s.c | 12 +- sound/soc/pxa/tosa.c | 29 +- 189 files changed, 6832 insertions(+), 4482 deletions(-) delete mode 100644 arch/arm/common/rtctime.c copy arch/arm/configs/{em_x270_defconfig => qil-a9260_defconfig} (66%) copy arch/arm/configs/{em_x270_defconfig => usb-a9260_defconfig} (70%) rename arch/arm/configs/{em_x270_defconfig => usb-a9263_defconfig} (70%) rename arch/arm/configs/{cm_x270_defconfig => xm_x270_defconfig} (65%) create mode 100644 arch/arm/mach-at91/board-qil-a9260.c create mode 100644 arch/arm/mach-at91/board-usb-a9260.c create mode 100644 arch/arm/mach-at91/board-usb-a9263.c delete mode 100644 arch/arm/mach-footbridge/co285.c delete mode 100644 arch/arm/mach-integrator/time.c create mode 100644 arch/arm/mach-ixp4xx/fsg-pci.c create mode 100644 arch/arm/mach-ixp4xx/fsg-setup.c create mode 100644 arch/arm/mach-pxa/pwm.c create mode 100644 arch/arm/mach-pxa/reset.c create mode 100644 drivers/mfd/tc6393xb.c create mode 100644 drivers/rtc/rtc-pl030.c create mode 100644 drivers/video/backlight/pwm_bl.c create mode 100644 include/asm-arm/arch-ixp4xx/fsg.h create mode 100644 include/asm-arm/arch-pxa/pxa25x-udc.h create mode 100644 include/asm-arm/arch-pxa/pxa27x-udc.h delete mode 100644 include/asm-arm/dyntick.h delete mode 100644 include/asm-arm/rtc.h create mode 100644 include/linux/mfd/tc6393xb.h create mode 100644 include/linux/pwm.h create mode 100644 include/linux/pwm_backlight.h $ git am -3 ../patches/Fix_Kconfig_entyr_for_TC6393XB Applying Fix Kconfig entry for TC6393XB Merging cpufreq/next $ git merge cpufreq/next Auto-merged drivers/cpufreq/cpufreq.c CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq.c Auto-merged drivers/cpufreq/freq_table.c Resolved 'drivers/cpufreq/cpufreq.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. arch/x86/kernel/cpu/cpufreq/powernow-k7.h | 1 - drivers/cpufreq/cpufreq.c | 45 +++++++++++++++------------- drivers/cpufreq/cpufreq_stats.c | 24 ++++++++-------- drivers/cpufreq/freq_table.c | 12 ++++---- include/linux/cpufreq.h | 3 -- 5 files changed, 42 insertions(+), 43 deletions(-) Merging v9fs/for-next $ git merge v9fs/for-next Already up-to-date. Merging quilt/rr $ git merge quilt/rr Auto-merged drivers/char/snsc.c Auto-merged drivers/char/viotape.c Auto-merged drivers/infiniband/core/user_mad.c Auto-merged drivers/net/3c527.c Auto-merged drivers/net/wireless/airo.c Auto-merged drivers/usb/core/usb.c Auto-merged drivers/usb/gadget/inode.c Auto-merged drivers/virtio/virtio.c Auto-merged fs/xfs/linux-2.6/xfs_buf.c Auto-merged include/linux/kernel.h Auto-merged include/linux/usb.h Auto-merged kernel/cpu.c Auto-merged kernel/kthread.c Auto-merged kernel/mutex.c Auto-merged kernel/printk.c Auto-merged kernel/semaphore.c Merge made by recursive. Documentation/DocBook/kernel-locking.tmpl | 57 +++---- Documentation/lguest/lguest.c | 236 ++++++++++++++++++++----- arch/ia64/kernel/salinfo.c | 4 +- drivers/block/virtio_blk.c | 10 +- drivers/char/snsc.c | 4 +- drivers/char/viotape.c | 4 +- drivers/infiniband/core/user_mad.c | 2 +- drivers/input/serio/hil_mlc.c | 4 +- drivers/input/serio/hp_sdc_mlc.c | 14 +- drivers/lguest/lguest_device.c | 3 +- drivers/lguest/x86/core.c | 4 +- drivers/md/dm-raid1.c | 2 +- drivers/net/3c527.c | 2 +- drivers/net/irda/sir_dev.c | 2 +- drivers/net/virtio_net.c | 114 ++++++++++-- drivers/net/wireless/airo.c | 12 +- drivers/scsi/aacraid/commsup.c | 2 +- drivers/usb/core/usb.c | 2 +- drivers/usb/gadget/inode.c | 2 +- drivers/virtio/virtio.c | 23 ++- drivers/virtio/virtio_pci.c | 6 +- drivers/virtio/virtio_ring.c | 28 ++- fs/ocfs2/inode.c | 4 - fs/reiserfs/journal.c | 2 +- fs/xfs/linux-2.6/sema.h | 8 +- fs/xfs/linux-2.6/xfs_buf.c | 4 +- include/linux/compiler-gcc.h | 19 ++ include/linux/compiler-intel.h | 2 + include/linux/kernel.h | 35 ++++ include/linux/kthread.h | 29 +++- include/linux/mutex.h | 4 - include/linux/semaphore.h | 8 +- include/linux/stop_machine.h | 27 ++-- include/linux/timer.h | 32 +++- include/linux/usb.h | 2 +- include/linux/virtio_blk.h | 3 + include/linux/virtio_config.h | 7 + include/linux/virtio_ring.h | 15 ++- kernel/cpu.c | 13 +- kernel/kthread.c | 29 +--- kernel/mutex.c | 4 +- kernel/printk.c | 4 +- kernel/semaphore.c | 17 +- kernel/stop_machine.c | 278 +++++++++++++---------------- 44 files changed, 698 insertions(+), 385 deletions(-) Merging cifs/master $ git merge cifs/master Already up-to-date. Merging mmc/next $ git merge mmc/next Auto-merged include/linux/pci_ids.h Merge made by recursive. drivers/mmc/card/mmc_test.c | 10 +- drivers/mmc/core/Kconfig | 12 + drivers/mmc/core/Makefile | 1 + drivers/mmc/core/bus.c | 12 + drivers/mmc/core/core.c | 20 +- drivers/mmc/core/lock.c | 193 ++++++++++++ drivers/mmc/core/lock.h | 41 +++ drivers/mmc/core/mmc.c | 16 +- drivers/mmc/core/mmc_ops.c | 117 +++++++ drivers/mmc/core/mmc_ops.h | 3 + drivers/mmc/core/sd.c | 20 +- drivers/mmc/host/Kconfig | 18 +- drivers/mmc/host/Makefile | 1 + drivers/mmc/host/at91_mci.c | 2 +- drivers/mmc/host/imxmmc.c | 9 +- drivers/mmc/host/mmc_spi.c | 28 ++- drivers/mmc/host/pxamci.c | 9 +- drivers/mmc/host/sdhci-pci.c | 699 ++++++++++++++++++++++++++++++++++++++++++ drivers/mmc/host/sdhci.c | 541 ++++++++------------------------ drivers/mmc/host/sdhci.h | 79 ++++-- include/linux/mmc/card.h | 3 + include/linux/mmc/host.h | 11 + include/linux/mmc/mmc.h | 9 +- include/linux/pci_ids.h | 1 + include/linux/spi/mmc_spi.h | 9 + 25 files changed, 1406 insertions(+), 458 deletions(-) create mode 100644 drivers/mmc/core/lock.c create mode 100644 drivers/mmc/core/lock.h create mode 100644 drivers/mmc/host/sdhci-pci.c Merging gfs2/master $ git merge gfs2/master Removed fs/gfs2/locking/nolock/Makefile Removed fs/gfs2/locking/nolock/main.c Merge made by recursive. fs/gfs2/Kconfig | 18 +- fs/gfs2/Makefile | 1 - fs/gfs2/glock.c | 1624 ++++++++++++++++----------------------- fs/gfs2/glock.h | 9 +- fs/gfs2/glops.c | 70 ++- fs/gfs2/incore.h | 35 +- fs/gfs2/locking.c | 52 ++- fs/gfs2/locking/dlm/lock.c | 356 +++++++-- fs/gfs2/locking/dlm/lock_dlm.h | 12 +- fs/gfs2/locking/dlm/mount.c | 4 - fs/gfs2/locking/dlm/thread.c | 324 +-------- fs/gfs2/locking/nolock/Makefile | 3 - fs/gfs2/locking/nolock/main.c | 238 ------ fs/gfs2/log.c | 2 + fs/gfs2/log.h | 2 + fs/gfs2/main.c | 2 - fs/gfs2/meta_io.c | 14 +- fs/gfs2/meta_io.h | 1 + fs/gfs2/ops_address.c | 40 +- fs/gfs2/ops_file.c | 8 +- fs/gfs2/ops_fstype.c | 5 +- fs/gfs2/ops_super.c | 2 +- fs/gfs2/recovery.c | 5 +- fs/gfs2/super.c | 3 +- 24 files changed, 1124 insertions(+), 1706 deletions(-) delete mode 100644 fs/gfs2/locking/nolock/Makefile delete mode 100644 fs/gfs2/locking/nolock/main.c Merging input/next $ git merge input/next Auto-merged MAINTAINERS Auto-merged drivers/char/keyboard.c Auto-merged drivers/hwmon/hdaps.c Auto-merged drivers/input/serio/q40kbd.c Merge made by recursive. Documentation/input/gameport-programming.txt | 2 - Documentation/input/input.txt | 1 - Documentation/input/joystick-api.txt | 2 - Documentation/input/joystick-parport.txt | 1 - Documentation/input/joystick.txt | 1 - MAINTAINERS | 6 + drivers/char/keyboard.c | 2 + drivers/hwmon/hdaps.c | 2 + drivers/input/evbug.c | 2 - drivers/input/ff-memless.c | 4 +- drivers/input/gameport/emu10k1-gp.c | 2 - drivers/input/gameport/gameport.c | 22 -- drivers/input/gameport/lightning.c | 2 - drivers/input/gameport/ns558.c | 2 - drivers/input/joystick/a3d.c | 2 - drivers/input/joystick/amijoy.c | 2 - drivers/input/joystick/cobra.c | 2 - drivers/input/joystick/db9.c | 2 - drivers/input/joystick/gf2k.c | 2 - drivers/input/joystick/grip.c | 2 - drivers/input/joystick/grip_mp.c | 2 - drivers/input/joystick/guillemot.c | 2 - drivers/input/joystick/iforce/iforce-ff.c | 2 - drivers/input/joystick/iforce/iforce-main.c | 2 - drivers/input/joystick/iforce/iforce-packets.c | 2 - drivers/input/joystick/iforce/iforce-serio.c | 2 - drivers/input/joystick/iforce/iforce-usb.c | 8 +- drivers/input/joystick/iforce/iforce.h | 2 - drivers/input/joystick/interact.c | 2 - drivers/input/joystick/joydump.c | 2 - drivers/input/joystick/magellan.c | 2 - drivers/input/joystick/spaceball.c | 2 - drivers/input/joystick/spaceorb.c | 2 - drivers/input/joystick/stinger.c | 2 - drivers/input/joystick/tmdc.c | 2 - drivers/input/joystick/turbografx.c | 2 - drivers/input/joystick/twidjoy.c | 4 - drivers/input/joystick/warrior.c | 2 - drivers/input/joystick/xpad.c | 12 +- drivers/input/keyboard/amikbd.c | 2 - drivers/input/keyboard/atkbd.c | 20 +- drivers/input/keyboard/gpio_keys.c | 89 ++++++-- drivers/input/keyboard/lkkbd.c | 6 +- drivers/input/keyboard/pxa27x_keypad.c | 15 ++- drivers/input/keyboard/sunkbd.c | 2 - drivers/input/keyboard/xtkbd.c | 2 - drivers/input/misc/ati_remote.c | 18 +- drivers/input/misc/ati_remote2.c | 18 +- drivers/input/misc/keyspan_remote.c | 20 +- drivers/input/misc/powermate.c | 6 +- drivers/input/misc/yealink.c | 12 +- drivers/input/mouse/appletouch.c | 299 +++++++++++------------- drivers/input/mouse/hil_ptr.c | 37 ++- drivers/input/mouse/inport.c | 2 - drivers/input/mouse/logibm.c | 2 - drivers/input/mouse/pc110pad.c | 2 - drivers/input/mouse/sermouse.c | 2 - drivers/input/serio/ct82c710.c | 2 - drivers/input/serio/i8042-x86ia64io.h | 29 ++- drivers/input/serio/libps2.c | 52 ---- drivers/input/serio/q40kbd.c | 2 - drivers/input/serio/rpckbd.c | 2 - drivers/input/serio/serio.c | 9 +- drivers/input/tablet/acecad.c | 4 +- drivers/input/tablet/aiptek.c | 6 +- drivers/input/tablet/kbtab.c | 6 +- drivers/input/tablet/wacom.h | 2 +- drivers/input/tablet/wacom_sys.c | 6 +- drivers/input/tablet/wacom_wac.c | 39 ++-- drivers/input/touchscreen/Kconfig | 23 ++ drivers/input/touchscreen/Makefile | 2 + drivers/input/touchscreen/gunze.c | 2 - drivers/input/touchscreen/h3600_ts_input.c | 2 - drivers/input/touchscreen/htcpen.c | 255 ++++++++++++++++++++ drivers/input/touchscreen/migor_ts.c | 250 ++++++++++++++++++++ drivers/input/touchscreen/usbtouchscreen.c | 22 +- drivers/macintosh/adbhid.c | 61 ++++- include/linux/gameport.h | 1 - include/linux/gpio_keys.h | 1 + include/linux/input.h | 7 +- include/linux/joystick.h | 2 - include/linux/libps2.h | 1 - 82 files changed, 968 insertions(+), 493 deletions(-) create mode 100644 drivers/input/touchscreen/htcpen.c create mode 100644 drivers/input/touchscreen/migor_ts.c Merging semaphore/semaphore $ git merge semaphore/semaphore Auto-merged include/linux/semaphore.h Merge made by recursive. drivers/input/keyboard/hil_kbd.c | 1 + drivers/input/misc/hp_sdc_rtc.c | 1 + drivers/input/serio/hp_sdc.c | 1 + include/asm-alpha/semaphore.h | 1 + include/asm-arm/semaphore.h | 1 + include/asm-avr32/semaphore.h | 1 + include/asm-blackfin/semaphore.h | 1 + include/asm-cris/semaphore.h | 1 + include/asm-frv/semaphore.h | 1 + include/asm-h8300/semaphore.h | 1 + include/asm-ia64/semaphore.h | 1 + include/asm-m32r/semaphore.h | 1 + include/asm-m68k/semaphore.h | 1 + include/asm-m68knommu/semaphore.h | 1 + include/asm-mips/semaphore.h | 1 + include/asm-mn10300/semaphore.h | 1 + include/asm-parisc/semaphore.h | 1 + include/asm-powerpc/semaphore.h | 1 + include/asm-s390/semaphore.h | 1 + include/asm-sh/semaphore.h | 1 + include/asm-sparc/semaphore.h | 1 + include/asm-sparc64/semaphore.h | 1 + include/asm-um/semaphore.h | 1 + include/asm-v850/semaphore.h | 1 + include/asm-x86/semaphore.h | 1 + include/asm-xtensa/semaphore.h | 1 + include/linux/semaphore.h | 6 ++---- 27 files changed, 28 insertions(+), 4 deletions(-) Merging semaphore-removal/semaphore-removal $ git merge semaphore-removal/semaphore-removal Auto-merged drivers/net/bonding/bond_main.c Auto-merged drivers/net/bonding/bond_sysfs.c Auto-merged drivers/net/ps3_gelic_net.c Auto-merged drivers/net/ps3_gelic_wireless.c CONFLICT (content): Merge conflict in drivers/net/ps3_gelic_wireless.c Auto-merged drivers/net/ps3_gelic_wireless.h Auto-merged drivers/scsi/qla2xxx/qla_attr.c CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_attr.c Auto-merged drivers/scsi/qla2xxx/qla_def.h CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_def.h Auto-merged drivers/scsi/qla2xxx/qla_mbx.c CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_mbx.c Auto-merged drivers/scsi/qla2xxx/qla_mid.c CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_mid.c Auto-merged drivers/scsi/qla2xxx/qla_os.c CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_os.c Auto-merged sound/soc/s3c24xx/s3c2443-ac97.c Resolved 'drivers/net/ps3_gelic_wireless.c' using previous resolution. Resolved 'drivers/scsi/qla2xxx/qla_attr.c' using previous resolution. Resolved 'drivers/scsi/qla2xxx/qla_def.h' using previous resolution. Resolved 'drivers/scsi/qla2xxx/qla_mbx.c' using previous resolution. Resolved 'drivers/scsi/qla2xxx/qla_mid.c' using previous resolution. Resolved 'drivers/scsi/qla2xxx/qla_os.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. arch/arm/mach-lh7a40x/clocks.c | 15 ++++++++------- drivers/net/bonding/bond_main.c | 21 +++++++++++---------- drivers/net/bonding/bond_sysfs.c | 15 ++++++++------- drivers/net/ppp_async.c | 8 ++++---- drivers/net/ps3_gelic_net.c | 1 + drivers/net/ps3_gelic_wireless.c | 1 + drivers/pci/hotplug/ibmphp_hpc.c | 30 ++++++++++++++---------------- drivers/scsi/qla2xxx/qla_def.h | 1 - drivers/scsi/qla2xxx/qla_os.c | 4 +++- include/net/bluetooth/hci_core.h | 7 ++++--- net/9p/trans_virtio.c | 21 +++++++++++---------- net/bluetooth/hci_core.c | 2 +- sound/soc/s3c24xx/s3c2443-ac97.c | 11 ++++++----- 13 files changed, 72 insertions(+), 65 deletions(-) Merging bkl-removal/bkl-removal $ git merge bkl-removal/bkl-removal Auto-merged arch/mips/kernel/rtlx.c Auto-merged arch/mips/sibyte/common/sb_tbprof.c Auto-merged arch/sparc/kernel/apc.c Auto-merged arch/x86/kernel/apm_32.c Auto-merged arch/x86/kernel/cpu/mcheck/mce_64.c Auto-merged arch/x86/kernel/cpuid.c Auto-merged arch/x86/kernel/microcode.c Auto-merged arch/x86/kernel/msr.c Auto-merged block/bsg.c Auto-merged drivers/block/aoe/aoechr.c Auto-merged drivers/block/paride/pg.c Auto-merged drivers/block/paride/pt.c Auto-merged drivers/char/agp/frontend.c Auto-merged drivers/char/apm-emulation.c Auto-merged drivers/char/drm/drm_fops.c Auto-merged drivers/char/dsp56k.c Auto-merged drivers/char/hpet.c Auto-merged drivers/char/ip2/ip2main.c Auto-merged drivers/char/ipmi/ipmi_devintf.c Auto-merged drivers/char/lp.c Auto-merged drivers/char/mem.c Auto-merged drivers/char/misc.c Auto-merged drivers/char/nvram.c Auto-merged drivers/char/pcmcia/cm4000_cs.c Auto-merged drivers/char/pcmcia/cm4040_cs.c Auto-merged drivers/char/ppdev.c Auto-merged drivers/char/raw.c Auto-merged drivers/char/snsc.c Auto-merged drivers/char/tty_io.c Auto-merged drivers/char/vc_screen.c Auto-merged drivers/char/viotape.c Auto-merged drivers/char/xilinx_hwicap/xilinx_hwicap.c Auto-merged drivers/firewire/fw-cdev.c Auto-merged drivers/hid/hidraw.c Auto-merged drivers/i2c/i2c-dev.c Auto-merged drivers/ide/ide-tape.c Auto-merged drivers/ieee1394/dv1394.c Auto-merged drivers/ieee1394/raw1394.c Auto-merged drivers/ieee1394/video1394.c Auto-merged drivers/infiniband/core/ucm.c Auto-merged drivers/infiniband/core/user_mad.c Auto-merged drivers/infiniband/core/uverbs_main.c Auto-merged drivers/infiniband/hw/ipath/ipath_file_ops.c Auto-merged drivers/input/misc/hp_sdc_rtc.c Auto-merged drivers/isdn/capi/capi.c Auto-merged drivers/isdn/hardware/eicon/divasmain.c Auto-merged drivers/macintosh/adb.c Auto-merged drivers/macintosh/smu.c Auto-merged drivers/media/dvb/dvb-core/dvbdev.c Auto-merged drivers/media/video/videodev.c Auto-merged drivers/misc/phantom.c Auto-merged drivers/mtd/mtdchar.c Auto-merged drivers/mtd/ubi/cdev.c Auto-merged drivers/net/ppp_generic.c Auto-merged drivers/net/tun.c Auto-merged drivers/net/wan/cosa.c Auto-merged drivers/s390/block/dasd_eer.c Auto-merged drivers/s390/char/fs3270.c Auto-merged drivers/s390/char/vmlogrdr.c Auto-merged drivers/s390/char/vmur.c Auto-merged drivers/sbus/char/bpp.c Auto-merged drivers/sbus/char/uctrl.c Auto-merged drivers/sbus/char/vfc_dev.c Auto-merged drivers/scsi/3w-9xxx.c Auto-merged drivers/scsi/aacraid/linit.c Auto-merged drivers/scsi/ch.c Auto-merged drivers/scsi/dpt_i2o.c Auto-merged drivers/scsi/osst.c Auto-merged drivers/scsi/sg.c Auto-merged drivers/scsi/st.c Auto-merged drivers/spi/spidev.c Auto-merged drivers/uio/uio.c Auto-merged drivers/usb/core/devio.c Auto-merged drivers/usb/core/file.c Auto-merged drivers/usb/gadget/printer.c Auto-merged drivers/usb/mon/mon_bin.c Auto-merged drivers/video/fbmem.c Auto-merged fs/dlm/user.c Auto-merged fs/fat/file.c Auto-merged fs/ocfs2/stack_user.c Auto-merged net/irda/irnet/irnet_ppp.c Auto-merged sound/core/sound.c Auto-merged sound/sound_core.c Merge made by recursive. arch/blackfin/mach-bf561/coreb.c | 4 +++ arch/cris/arch-v10/drivers/eeprom.c | 4 +- arch/cris/arch-v10/drivers/gpio.c | 3 ++ arch/cris/arch-v10/drivers/i2c.c | 2 + arch/cris/arch-v10/drivers/sync_serial.c | 34 ++++++++++++++--------- arch/cris/arch-v32/drivers/cryptocop.c | 3 +- arch/cris/arch-v32/drivers/i2c.c | 2 + arch/cris/arch-v32/drivers/mach-a3/gpio.c | 4 +++ arch/cris/arch-v32/drivers/mach-fs/gpio.c | 5 +++- arch/cris/arch-v32/drivers/sync_serial.c | 33 +++++++++++++--------- arch/m68k/bvme6000/rtc.c | 7 ++++- arch/m68k/mvme16x/rtc.c | 4 +++ arch/mips/basler/excite/excite_iodev.c | 9 +++++- arch/mips/kernel/rtlx.c | 7 ++++- arch/mips/kernel/vpe.c | 12 ++++++-- arch/mips/sibyte/common/sb_tbprof.c | 25 ++++++++++++----- arch/parisc/kernel/perf.c | 4 +++ arch/s390/crypto/prng.c | 2 + arch/sh/boards/landisk/gio.c | 10 +++++-- arch/sparc/kernel/apc.c | 2 + arch/sparc64/kernel/time.c | 7 ++++- arch/um/drivers/harddog_kern.c | 3 ++ arch/um/drivers/mmapper_kern.c | 2 + arch/um/drivers/random.c | 3 ++ arch/x86/kernel/apm_32.c | 4 +++ arch/x86/kernel/cpu/mcheck/mce_64.c | 4 +++ arch/x86/kernel/cpuid.c | 25 +++++++++++----- arch/x86/kernel/microcode.c | 2 + arch/x86/kernel/msr.c | 16 ++++++++--- block/bsg.c | 7 ++++- drivers/block/aoe/aoechr.c | 7 ++++- drivers/block/paride/pg.c | 22 +++++++++++---- drivers/block/paride/pt.c | 8 +++++- drivers/bluetooth/hci_vhci.c | 5 +++ drivers/char/agp/frontend.c | 4 +++ drivers/char/apm-emulation.c | 3 ++ drivers/char/briq_panel.c | 9 +++++- drivers/char/cs5535_gpio.c | 2 + drivers/char/drm/drm_fops.c | 9 +++++- drivers/char/ds1286.c | 4 +++ drivers/char/ds1620.c | 9 +++++- drivers/char/dsp56k.c | 16 +++++++--- drivers/char/dtlk.c | 3 ++ drivers/char/efirtc.c | 2 + drivers/char/genrtc.c | 7 ++++- drivers/char/hpet.c | 4 +++ drivers/char/hw_random/core.c | 2 + drivers/char/ip2/ip2main.c | 34 +--------------------- drivers/char/ip27-rtc.c | 4 +++ drivers/char/ipmi/ipmi_devintf.c | 8 ++++- drivers/char/ipmi/ipmi_watchdog.c | 3 ++ drivers/char/lcd.c | 3 ++ drivers/char/lp.c | 38 +++++++++++++++++-------- drivers/char/mbcs.c | 5 +++ drivers/char/mem.c | 10 +++++- drivers/char/misc.c | 3 ++ drivers/char/mwave/mwavedd.c | 2 + drivers/char/nvram.c | 4 +++ drivers/char/pc8736x_gpio.c | 2 + drivers/char/pcmcia/cm4000_cs.c | 26 +++++++++++++----- drivers/char/pcmcia/cm4040_cs.c | 23 +++++++++++---- drivers/char/ppdev.c | 2 + drivers/char/raw.c | 3 ++ drivers/char/rtc.c | 4 +++ drivers/char/scx200_gpio.c | 2 + drivers/char/snsc.c | 5 +++- drivers/char/sonypi.c | 3 ++ drivers/char/tb0219.c | 2 + drivers/char/tlclk.c | 19 ++++++++----- drivers/char/tpm/tpm.c | 5 +++ drivers/char/tty_io.c | 27 +++++++++++++++++- drivers/char/vc_screen.c | 9 +++++- drivers/char/viotape.c | 3 ++ drivers/char/vr41xx_giu.c | 2 + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 6 +++- drivers/firewire/fw-cdev.c | 16 ++++++++--- drivers/hid/hidraw.c | 2 + drivers/i2c/i2c-dev.c | 22 +++++++++++---- drivers/ide/ide-tape.c | 7 ++++- drivers/ieee1394/dv1394.c | 6 +++- drivers/ieee1394/raw1394.c | 3 ++ drivers/ieee1394/video1394.c | 18 +++++++++--- drivers/infiniband/core/ucm.c | 2 + drivers/infiniband/core/ucma.c | 3 ++ drivers/infiniband/core/user_mad.c | 7 ++++- drivers/infiniband/core/uverbs_main.c | 9 +++++- drivers/infiniband/hw/ipath/ipath_file_ops.c | 2 + drivers/input/input.c | 16 ++++++++--- drivers/input/misc/hp_sdc_rtc.c | 2 + drivers/input/misc/uinput.c | 3 ++ drivers/input/mousedev.c | 12 +++++++- drivers/input/serio/serio_raw.c | 6 +++- drivers/isdn/capi/capi.c | 17 +++++++---- drivers/isdn/hardware/eicon/divamnt.c | 16 +++++++--- drivers/isdn/hardware/eicon/divasi.c | 2 + drivers/isdn/hardware/eicon/divasmain.c | 2 + drivers/isdn/i4l/isdn_common.c | 3 +- drivers/macintosh/adb.c | 18 +++++++++--- drivers/macintosh/ans-lcd.c | 2 + drivers/macintosh/smu.c | 3 ++ drivers/macintosh/via-pmu.c | 3 ++ drivers/media/dvb/dvb-core/dvbdev.c | 4 +++ drivers/media/radio/miropcm20-rds.c | 4 +++ drivers/media/video/videodev.c | 4 +++ drivers/message/i2o/i2o_config.c | 2 + drivers/misc/hdpuftrs/hdpu_cpustate.c | 9 +++++- drivers/misc/phantom.c | 9 +++++- drivers/misc/sony-laptop.c | 3 ++ drivers/mtd/mtdchar.c | 22 +++++++++++---- drivers/mtd/ubi/cdev.c | 7 ++++- drivers/net/ppp_generic.c | 2 + drivers/net/tun.c | 2 + drivers/net/wan/cosa.c | 22 +++++++++++---- drivers/parisc/eisa_eeprom.c | 3 ++ drivers/pcmcia/pcmcia_ioctl.c | 25 ++++++++++++----- drivers/rtc/rtc-dev.c | 12 ++++++-- drivers/rtc/rtc-m41t80.c | 7 ++++- drivers/s390/block/dasd_eer.c | 6 ++++ drivers/s390/char/fs3270.c | 23 +++++++++++----- drivers/s390/char/monreader.c | 4 +++ drivers/s390/char/monwriter.c | 3 ++ drivers/s390/char/tape_char.c | 12 ++++++-- drivers/s390/char/vmcp.c | 4 +++ drivers/s390/char/vmlogrdr.c | 8 +++++- drivers/s390/char/vmur.c | 12 ++++++-- drivers/s390/char/vmwatchdog.c | 7 ++++- drivers/s390/crypto/zcrypt_api.c | 3 ++ drivers/sbus/char/bpp.c | 3 ++ drivers/sbus/char/cpwatchdog.c | 4 +++ drivers/sbus/char/display7seg.c | 1 + drivers/sbus/char/envctrl.c | 2 + drivers/sbus/char/flash.c | 6 +++- drivers/sbus/char/jsflash.c | 13 +++++++-- drivers/sbus/char/openprom.c | 3 ++ drivers/sbus/char/riowatchdog.c | 2 + drivers/sbus/char/rtc.c | 3 ++ drivers/sbus/char/uctrl.c | 3 ++ drivers/sbus/char/vfc_dev.c | 5 +++ drivers/scsi/3w-9xxx.c | 3 ++ drivers/scsi/3w-xxxx.c | 3 ++ drivers/scsi/aacraid/linit.c | 3 ++ drivers/scsi/ch.c | 4 +++ drivers/scsi/dpt_i2o.c | 5 +++ drivers/scsi/gdth.c | 3 ++ drivers/scsi/megaraid.c | 5 ++- drivers/scsi/megaraid/megaraid_mm.c | 2 + drivers/scsi/megaraid/megaraid_sas.c | 2 + drivers/scsi/osst.c | 15 +++++++++- drivers/scsi/scsi_tgt_if.c | 2 + drivers/scsi/sg.c | 16 +++++++++-- drivers/scsi/st.c | 11 ++++++- drivers/spi/spidev.c | 3 ++ drivers/telephony/phonedev.c | 3 ++ drivers/uio/uio.c | 17 ++++++++--- drivers/usb/core/devio.c | 2 + drivers/usb/core/file.c | 3 ++ drivers/usb/gadget/printer.c | 3 +- drivers/usb/mon/mon_bin.c | 6 ++++ drivers/video/fbmem.c | 15 +++++++--- fs/char_dev.c | 7 ++--- fs/dlm/user.c | 9 +++++- fs/fat/cache.c | 2 +- fs/fat/dir.c | 4 +- fs/fat/file.c | 6 ---- fs/fat/inode.c | 26 +++++++++++------- fs/msdos/namei.c | 35 +++++++++++++----------- fs/ocfs2/stack_user.c | 3 ++ fs/vfat/namei.c | 35 +++++++++++++----------- include/linux/smp_lock.h | 13 +++++++++ kernel/pm_qos_params.c | 7 ++++- net/irda/irnet/irnet.h | 1 + net/irda/irnet/irnet_ppp.c | 3 ++ sound/core/sound.c | 15 +++++++++- sound/sound_core.c | 5 +++ 174 files changed, 1066 insertions(+), 319 deletions(-) Merging trivial/next $ git merge trivial/next Auto-merged arch/mips/kernel/vpe.c Auto-merged drivers/base/sys.c Auto-merged drivers/media/dvb/ttpci/av7110.c Auto-merged drivers/net/spider_net.c Auto-merged drivers/usb/serial/ftdi_sio.c Auto-merged mm/slub.c Merge made by recursive. Documentation/edac.txt | 2 +- Documentation/filesystems/hfs.txt | 2 +- Documentation/ja_JP/SubmittingPatches | 4 ++-- Documentation/zh_CN/SubmittingPatches | 4 ++-- arch/mips/kernel/vpe.c | 2 +- arch/sh/lib64/c-checksum.c | 4 ++-- drivers/base/sys.c | 2 +- drivers/char/serial167.c | 2 +- drivers/media/dvb/ttpci/av7110.c | 2 +- drivers/message/i2o/i2o_block.c | 2 +- drivers/misc/ibmasm/event.c | 2 +- drivers/net/spider_net.c | 2 +- drivers/serial/mpc52xx_uart.c | 4 ++-- drivers/usb/serial/ftdi_sio.c | 2 +- fs/jffs2/fs.c | 2 +- fs/ntfs/aops.c | 2 +- fs/proc/nommu.c | 2 +- include/linux/securebits.h | 2 +- mm/migrate.c | 2 +- mm/slub.c | 4 ++-- net/wireless/wext.c | 2 +- 21 files changed, 26 insertions(+), 26 deletions(-) Merging ubifs/for_andrew $ git merge ubifs/for_andrew Auto-merged fs/Kconfig Auto-merged include/linux/fs.h Merge made by recursive. Documentation/filesystems/ubifs.txt | 163 ++ fs/Kconfig | 3 + fs/Makefile | 1 + fs/fs-writeback.c | 22 +- fs/ubifs/Kconfig | 72 + fs/ubifs/Makefile | 9 + fs/ubifs/budget.c | 861 ++++++++++ fs/ubifs/commit.c | 677 ++++++++ fs/ubifs/compress.c | 253 +++ fs/ubifs/debug.c | 2239 ++++++++++++++++++++++++++ fs/ubifs/debug.h | 401 +++++ fs/ubifs/dir.c | 1087 +++++++++++++ fs/ubifs/file.c | 1029 ++++++++++++ fs/ubifs/find.c | 977 ++++++++++++ fs/ubifs/gc.c | 762 +++++++++ fs/ubifs/io.c | 921 +++++++++++ fs/ubifs/ioctl.c | 212 +++ fs/ubifs/journal.c | 1298 +++++++++++++++ fs/ubifs/key.h | 533 +++++++ fs/ubifs/log.c | 799 ++++++++++ fs/ubifs/lprops.c | 1355 ++++++++++++++++ fs/ubifs/lpt.c | 2241 ++++++++++++++++++++++++++ fs/ubifs/lpt_commit.c | 1631 +++++++++++++++++++ fs/ubifs/master.c | 387 +++++ fs/ubifs/misc.h | 311 ++++ fs/ubifs/orphan.c | 958 ++++++++++++ fs/ubifs/recovery.c | 1537 ++++++++++++++++++ fs/ubifs/replay.c | 1075 +++++++++++++ fs/ubifs/sb.c | 615 ++++++++ fs/ubifs/scan.c | 362 +++++ fs/ubifs/shrinker.c | 322 ++++ fs/ubifs/super.c | 1969 +++++++++++++++++++++++ fs/ubifs/tnc.c | 2958 +++++++++++++++++++++++++++++++++++ fs/ubifs/tnc_commit.c | 1105 +++++++++++++ fs/ubifs/tnc_misc.c | 494 ++++++ fs/ubifs/ubifs-media.h | 729 +++++++++ fs/ubifs/ubifs.h | 1611 +++++++++++++++++++ fs/ubifs/xattr.c | 581 +++++++ include/linux/fs.h | 2 + init/do_mounts.c | 3 +- 40 files changed, 32554 insertions(+), 11 deletions(-) create mode 100644 Documentation/filesystems/ubifs.txt create mode 100644 fs/ubifs/Kconfig create mode 100644 fs/ubifs/Makefile create mode 100644 fs/ubifs/budget.c create mode 100644 fs/ubifs/commit.c create mode 100644 fs/ubifs/compress.c create mode 100644 fs/ubifs/debug.c create mode 100644 fs/ubifs/debug.h create mode 100644 fs/ubifs/dir.c create mode 100644 fs/ubifs/file.c create mode 100644 fs/ubifs/find.c create mode 100644 fs/ubifs/gc.c create mode 100644 fs/ubifs/io.c create mode 100644 fs/ubifs/ioctl.c create mode 100644 fs/ubifs/journal.c create mode 100644 fs/ubifs/key.h create mode 100644 fs/ubifs/log.c create mode 100644 fs/ubifs/lprops.c create mode 100644 fs/ubifs/lpt.c create mode 100644 fs/ubifs/lpt_commit.c create mode 100644 fs/ubifs/master.c create mode 100644 fs/ubifs/misc.h create mode 100644 fs/ubifs/orphan.c create mode 100644 fs/ubifs/recovery.c create mode 100644 fs/ubifs/replay.c create mode 100644 fs/ubifs/sb.c create mode 100644 fs/ubifs/scan.c create mode 100644 fs/ubifs/shrinker.c create mode 100644 fs/ubifs/super.c create mode 100644 fs/ubifs/tnc.c create mode 100644 fs/ubifs/tnc_commit.c create mode 100644 fs/ubifs/tnc_misc.c create mode 100644 fs/ubifs/ubifs-media.h create mode 100644 fs/ubifs/ubifs.h create mode 100644 fs/ubifs/xattr.c Merging lsm/for-next $ git merge lsm/for-next Already up-to-date. Merging block/for-next $ git merge block/for-next Auto-merged arch/arm/Kconfig Auto-merged arch/ia64/Kconfig Auto-merged arch/powerpc/Kconfig CONFLICT (content): Merge conflict in arch/powerpc/Kconfig Auto-merged arch/powerpc/kernel/smp.c Auto-merged arch/powerpc/sysdev/mpic.c Auto-merged arch/sh/Kconfig Auto-merged arch/x86/Kconfig Auto-merged arch/x86/kernel/apic_32.c CONFLICT (content): Merge conflict in arch/x86/kernel/apic_32.c Auto-merged arch/x86/kernel/entry_64.S CONFLICT (delete/modify): arch/x86/kernel/i8259_64.c deleted in HEAD and modified in block/for-next. Version block/for-next of arch/x86/kernel/i8259_64.c left in tree. Auto-merged arch/x86/mach-voyager/voyager_smp.c Auto-merged arch/x86/xen/enlighten.c Auto-merged arch/x86/xen/mmu.c Auto-merged arch/x86/xen/smp.c CONFLICT (content): Merge conflict in arch/x86/xen/smp.c Auto-merged arch/x86/xen/xen-ops.h Auto-merged block/genhd.c Auto-merged include/asm-ia64/smp.h Auto-merged include/asm-powerpc/smp.h CONFLICT (delete/modify): include/asm-x86/hw_irq_32.h deleted in HEAD and modified in block/for-next. Version block/for-next of include/asm-x86/hw_irq_32.h left in tree. CONFLICT (delete/modify): include/asm-x86/hw_irq_64.h deleted in HEAD and modified in block/for-next. Version block/for-next of include/asm-x86/hw_irq_64.h left in tree. CONFLICT (delete/modify): include/asm-x86/mach-default/irq_vectors.h deleted in HEAD and modified in block/for-next. Version block/for-next of include/asm-x86/mach-default/irq_vectors.h left in tree. CONFLICT (delete/modify): include/asm-x86/mach-voyager/irq_vectors.h deleted in HEAD and modified in block/for-next. Version block/for-next of include/asm-x86/mach-voyager/irq_vectors.h left in tree. Auto-merged include/asm-x86/smp.h Auto-merged include/linux/blkdev.h Auto-merged init/main.c Auto-merged kernel/Makefile CONFLICT (content): Merge conflict in kernel/Makefile Resolved 'arch/powerpc/Kconfig' using previous resolution. Resolved 'arch/x86/kernel/apic_32.c' using previous resolution. Resolved 'arch/x86/xen/smp.c' using previous resolution. Resolved 'kernel/Makefile' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. arch/Kconfig | 3 + arch/alpha/Kconfig | 1 + arch/alpha/kernel/core_marvel.c | 6 +- arch/alpha/kernel/smp.c | 170 +------------- arch/arm/Kconfig | 1 + arch/arm/kernel/smp.c | 157 ++----------- arch/ia64/Kconfig | 1 + arch/ia64/kernel/smp.c | 242 ++------------------ arch/m32r/Kconfig | 1 + arch/m32r/kernel/m32r_ksyms.c | 3 - arch/m32r/kernel/smp.c | 128 +--------- arch/m32r/kernel/traps.c | 3 +- arch/mips/Kconfig | 1 + arch/mips/kernel/smp.c | 141 +---------- arch/mips/kernel/smtc.c | 1 - arch/parisc/Kconfig | 1 + arch/parisc/kernel/smp.c | 134 ++--------- arch/powerpc/Kconfig | 1 + arch/powerpc/kernel/smp.c | 234 ++----------------- arch/powerpc/platforms/cell/interrupt.c | 1 + arch/powerpc/platforms/ps3/smp.c | 7 +- arch/powerpc/platforms/pseries/xics.c | 6 +- arch/powerpc/sysdev/mpic.c | 2 +- arch/sh/Kconfig | 1 + arch/sh/kernel/smp.c | 48 +---- arch/sparc64/kernel/smp.c | 11 +- arch/x86/Kconfig | 1 + arch/x86/kernel/apic_32.c | 4 + arch/x86/kernel/entry_64.S | 3 + arch/x86/kernel/smp.c | 152 ++---------- arch/x86/kernel/smpcommon.c | 56 ----- arch/x86/mach-voyager/voyager_smp.c | 94 ++------ arch/x86/xen/enlighten.c | 4 +- arch/x86/xen/mmu.c | 2 +- arch/x86/xen/smp.c | 133 ++++------- arch/x86/xen/xen-ops.h | 9 +- block/as-iosched.c | 20 ++- block/blktrace.c | 45 ++++ block/cfq-iosched.c | 83 ++++++- block/genhd.c | 10 + drivers/block/xen-blkfront.c | 48 ++++- drivers/net/xen-netfront.c | 4 +- drivers/xen/xenbus/xenbus_client.c | 2 +- drivers/xen/xenbus/xenbus_xs.c | 10 +- include/asm-alpha/smp.h | 3 +- include/asm-arm/smp.h | 3 + include/asm-ia64/smp.h | 6 +- include/asm-m32r/smp.h | 4 + include/asm-mips/smp.h | 13 +- include/asm-parisc/smp.h | 3 + include/asm-powerpc/smp.h | 8 +- include/asm-sh/smp.h | 14 +- include/asm-x86/mach-default/entry_arch.h | 1 + include/asm-x86/mach-voyager/entry_arch.h | 2 +- include/asm-x86/smp.h | 19 +- include/asm-x86/xen/events.h | 1 + include/linux/blkdev.h | 1 - include/linux/blktrace_api.h | 1 + include/linux/smp.h | 32 +++- init/main.c | 2 + kernel/Makefile | 1 + kernel/smp.c | 363 +++++++++++++++++++++++++++++ 62 files changed, 874 insertions(+), 1588 deletions(-) create mode 100644 kernel/smp.c $ git am -3 ../patches/0001-block-fix-up-rculist-split-fallout.patch Applying block: fix up rculist split fallout Merging embedded/master $ git merge embedded/master Auto-merged drivers/char/Kconfig Auto-merged drivers/char/vt.c Merge made by recursive. drivers/char/Kconfig | 8 ++++++++ drivers/char/Makefile | 4 ++-- drivers/char/vt.c | 2 +- include/linux/consolemap.h | 14 ++++++++++++++ include/linux/vt_kern.h | 19 +++++++++++++++++++ 5 files changed, 44 insertions(+), 3 deletions(-) Merging firmware/master $ git merge firmware/master Auto-merged Makefile Auto-merged arch/x86/kernel/microcode.c Auto-merged drivers/atm/Kconfig Removed drivers/atm/atmsar11.data Removed drivers/atm/atmsar11.regions Removed drivers/atm/atmsar11.start Auto-merged drivers/base/firmware_class.c Auto-merged drivers/char/Kconfig Removed drivers/char/ip2/fip_firm.h Auto-merged drivers/char/ip2/ip2main.c CONFLICT (content): Merge conflict in drivers/char/ip2/ip2main.c Auto-merged drivers/media/common/tuners/tuner-xc2028.c Auto-merged drivers/media/dvb/dvb-usb/gp8psk.c Auto-merged drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c Removed drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h Auto-merged drivers/media/dvb/ttusb-dec/ttusb_dec.c Auto-merged drivers/media/video/bt8xx/bttv-cards.c Auto-merged drivers/net/Kconfig Auto-merged drivers/net/acenic.c Auto-merged drivers/net/acenic.h Removed drivers/net/acenic_firmware.h Auto-merged drivers/net/cxgb3/common.h Auto-merged drivers/net/myri10ge/myri10ge.c Removed drivers/net/tokenring/smctr_firmware.h Auto-merged drivers/net/usb/Kconfig Auto-merged drivers/net/usb/kaweth.c Removed drivers/net/usb/kawethfw.h Auto-merged drivers/net/wireless/atmel.c Auto-merged drivers/net/wireless/libertas/if_cs.c Auto-merged drivers/net/wireless/libertas/if_usb.c Auto-merged drivers/net/wireless/p54/p54usb.c Auto-merged drivers/net/wireless/rt2x00/rt2x00.h Auto-merged drivers/net/wireless/rt2x00/rt2x00pci.h Auto-merged drivers/net/wireless/rt2x00/rt61pci.c Auto-merged drivers/net/wireless/rt2x00/rt73usb.c Auto-merged drivers/usb/atm/cxacru.c Auto-merged drivers/usb/misc/Kconfig Removed drivers/usb/misc/emi26_fw.h Auto-merged drivers/usb/misc/emi62.c Removed drivers/usb/misc/emi62_fw_m.h Removed drivers/usb/misc/emi62_fw_s.h Auto-merged drivers/usb/misc/isight_firmware.c CONFLICT (content): Merge conflict in drivers/usb/misc/isight_firmware.c Auto-merged drivers/usb/serial/Kconfig CONFLICT (content): Merge conflict in drivers/usb/serial/Kconfig Removed drivers/usb/serial/keyspan_mpr_fw.h Removed drivers/usb/serial/keyspan_pda_fw.h Removed drivers/usb/serial/keyspan_usa18x_fw.h Removed drivers/usb/serial/keyspan_usa19_fw.h Removed drivers/usb/serial/keyspan_usa19qi_fw.h Removed drivers/usb/serial/keyspan_usa19qw_fw.h Removed drivers/usb/serial/keyspan_usa19w_fw.h Removed drivers/usb/serial/keyspan_usa28_fw.h Removed drivers/usb/serial/keyspan_usa28x_fw.h Removed drivers/usb/serial/keyspan_usa28xa_fw.h Removed drivers/usb/serial/keyspan_usa28xb_fw.h Removed drivers/usb/serial/keyspan_usa49w_fw.h Removed drivers/usb/serial/keyspan_usa49wlc_fw.h CONFLICT (delete/modify): drivers/usb/serial/ti_fw_3410.h deleted in firmware/master and modified in HEAD. Version HEAD of drivers/usb/serial/ti_fw_3410.h left in tree. CONFLICT (delete/modify): drivers/usb/serial/ti_fw_5052.h deleted in firmware/master and modified in HEAD. Version HEAD of drivers/usb/serial/ti_fw_5052.h left in tree. Auto-merged drivers/usb/serial/ti_usb_3410_5052.c CONFLICT (content): Merge conflict in drivers/usb/serial/ti_usb_3410_5052.c Removed drivers/usb/serial/whiteheat_fw.h Removed drivers/usb/serial/xircom_pgs_fw.h Auto-merged include/asm-generic/vmlinux.lds.h Auto-merged include/linux/firmware.h Auto-merged sound/pci/Kconfig CONFLICT (content): Merge conflict in sound/pci/Kconfig Removed sound/pci/korg1212/korg1212-firmware.h Auto-merged sound/pci/maestro3.c CONFLICT (content): Merge conflict in sound/pci/maestro3.c Auto-merged sound/pci/pcxhr/pcxhr_core.c Removed sound/pci/ymfpci/ymfpci_image.h Auto-merged sound/pci/ymfpci/ymfpci_main.c CONFLICT (content): Merge conflict in sound/pci/ymfpci/ymfpci_main.c Resolved 'drivers/char/ip2/ip2main.c' using previous resolution. Resolved 'drivers/usb/misc/isight_firmware.c' using previous resolution. Resolved 'drivers/usb/serial/Kconfig' using previous resolution. Resolved 'drivers/usb/serial/ti_usb_3410_5052.c' using previous resolution. Resolved 'sound/pci/Kconfig' using previous resolution. Resolved 'sound/pci/maestro3.c' using previous resolution. Resolved 'sound/pci/ymfpci/ymfpci_main.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. Makefile | 11 +- drivers/atm/Kconfig | 8 + drivers/atm/ambassador.c | 140 +- drivers/atm/ambassador.h | 11 - drivers/atm/atmsar11.data | 2063 ----- drivers/atm/atmsar11.regions | 6 - drivers/atm/atmsar11.start | 4 - drivers/base/Kconfig | 33 + drivers/base/firmware_class.c | 33 +- drivers/char/Kconfig | 7 + drivers/char/ip2/fip_firm.h | 2149 ----- drivers/char/ip2/ip2base.c | 5 +- drivers/char/ip2/ip2main.c | 45 +- drivers/media/dvb/ttusb-budget/Kconfig | 9 + drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 16 +- .../media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h | 1644 ---- drivers/net/Kconfig | 26 + drivers/net/acenic.c | 117 +- drivers/net/acenic.h | 4 + drivers/net/acenic_firmware.h | 9456 -------------------- drivers/net/e100.c | 283 +- drivers/net/tokenring/Kconfig | 9 + drivers/net/tokenring/smctr.c | 56 +- drivers/net/tokenring/smctr.h | 2 - drivers/net/tokenring/smctr_firmware.h | 978 -- drivers/net/usb/Kconfig | 9 + drivers/net/usb/kaweth.c | 43 +- drivers/net/usb/kawethfw.h | 557 -- drivers/usb/misc/Kconfig | 16 + drivers/usb/misc/emi26.c | 96 +- drivers/usb/misc/emi26_fw.h | 5779 ------------ drivers/usb/misc/emi62.c | 130 +- drivers/usb/misc/emi62_fw_m.h | 8853 ------------------ drivers/usb/misc/emi62_fw_s.h | 8837 ------------------ drivers/usb/serial/Kconfig | 45 +- drivers/usb/serial/keyspan.c | 78 +- drivers/usb/serial/keyspan.h | 84 - drivers/usb/serial/keyspan_mpr_fw.h | 286 - drivers/usb/serial/keyspan_pda.c | 51 +- drivers/usb/serial/keyspan_pda_fw.h | 99 - drivers/usb/serial/keyspan_usa18x_fw.h | 447 - drivers/usb/serial/keyspan_usa19_fw.h | 285 - drivers/usb/serial/keyspan_usa19qi_fw.h | 284 - drivers/usb/serial/keyspan_usa19qw_fw.h | 448 - drivers/usb/serial/keyspan_usa19w_fw.h | 446 - drivers/usb/serial/keyspan_usa28_fw.h | 466 - drivers/usb/serial/keyspan_usa28x_fw.h | 447 - drivers/usb/serial/keyspan_usa28xa_fw.h | 449 - drivers/usb/serial/keyspan_usa28xb_fw.h | 448 - drivers/usb/serial/keyspan_usa49w_fw.h | 464 - drivers/usb/serial/keyspan_usa49wlc_fw.h | 476 - drivers/usb/serial/ti_fw_3410.h | 889 -- drivers/usb/serial/ti_fw_5052.h | 890 -- drivers/usb/serial/ti_usb_3410_5052.c | 124 +- drivers/usb/serial/whiteheat.c | 77 +- drivers/usb/serial/whiteheat_fw.h | 1669 ---- drivers/usb/serial/xircom_pgs_fw.h | 103 - firmware/Makefile | 140 + firmware/WHENCE | 262 + firmware/acenic/tg1.bin.ihex | 4573 ++++++++++ firmware/acenic/tg2.bin.ihex | 4844 ++++++++++ firmware/atmsar11.HEX | 204 + firmware/e100/d101m_ucode.bin.ihex | 38 + firmware/e100/d101s_ucode.bin.ihex | 38 + firmware/e100/d102e_ucode.bin.ihex | 38 + firmware/emi26/bitstream.HEX | 4391 +++++++++ firmware/emi26/firmware.HEX | 1261 +++ firmware/emi26/loader.HEX | 116 + firmware/emi62/bitstream.HEX | 4372 +++++++++ firmware/emi62/loader.HEX | 107 + firmware/emi62/midi.HEX | 1266 +++ firmware/emi62/spdif.HEX | 1257 +++ firmware/ess/maestro3_assp_kernel.fw.ihex | 120 + firmware/ess/maestro3_assp_minisrc.fw.ihex | 51 + firmware/ihex2fw.c | 243 + firmware/intelliport2.bin.ihex | 2147 +++++ firmware/kaweth/new_code.bin.ihex | 206 + firmware/kaweth/new_code_fix.bin.ihex | 40 + firmware/kaweth/trigger_code.bin.ihex | 13 + firmware/kaweth/trigger_code_fix.bin.ihex | 3 + firmware/keyspan/mpr.HEX | 104 + firmware/keyspan/usa18x.HEX | 141 + firmware/keyspan/usa19.HEX | 101 + firmware/keyspan/usa19qi.HEX | 101 + firmware/keyspan/usa19qw.HEX | 142 + firmware/keyspan/usa19w.HEX | 141 + firmware/keyspan/usa28.HEX | 148 + firmware/keyspan/usa28x.HEX | 141 + firmware/keyspan/usa28xa.HEX | 141 + firmware/keyspan/usa28xb.HEX | 142 + firmware/keyspan/usa49w.HEX | 145 + firmware/keyspan/usa49wlc.HEX | 153 + firmware/keyspan_pda/keyspan_pda.HEX | 83 + .../serial => firmware/keyspan_pda}/keyspan_pda.S | 0 firmware/keyspan_pda/xircom_pgs.HEX | 87 + .../serial => firmware/keyspan_pda}/xircom_pgs.S | 0 firmware/korg/k1212.dsp.ihex | 987 ++ firmware/ti_3410.fw.ihex | 862 ++ firmware/ti_5052.fw.ihex | 862 ++ firmware/tr_smctr.bin.ihex | 477 + firmware/ttusb-budget/dspbootcode.bin.ihex | 820 ++ firmware/whiteheat.HEX | 1097 +++ firmware/whiteheat_loader.HEX | 314 + firmware/whiteheat_loader_debug.HEX | 403 + firmware/yamaha/ds1_ctrl.fw.ihex | 769 ++ firmware/yamaha/ds1_dsp.fw.ihex | 9 + firmware/yamaha/ds1e_ctrl.fw.ihex | 769 ++ include/asm-generic/vmlinux.lds.h | 7 + include/linux/firmware.h | 21 + include/linux/ihex.h | 68 + scripts/Makefile.fwinst | 31 + sound/pci/Kconfig | 12 +- sound/pci/korg1212/korg1212-firmware.h | 987 -- sound/pci/korg1212/korg1212.c | 18 - sound/pci/maestro3.c | 171 - sound/pci/ymfpci/ymfpci_image.h | 1565 ---- sound/pci/ymfpci/ymfpci_main.c | 63 - 117 files changed, 35834 insertions(+), 52468 deletions(-) delete mode 100644 drivers/atm/atmsar11.data delete mode 100644 drivers/atm/atmsar11.regions delete mode 100644 drivers/atm/atmsar11.start delete mode 100644 drivers/char/ip2/fip_firm.h delete mode 100644 drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h delete mode 100644 drivers/net/acenic_firmware.h delete mode 100644 drivers/net/tokenring/smctr_firmware.h delete mode 100644 drivers/net/usb/kawethfw.h delete mode 100644 drivers/usb/misc/emi26_fw.h delete mode 100644 drivers/usb/misc/emi62_fw_m.h delete mode 100644 drivers/usb/misc/emi62_fw_s.h delete mode 100644 drivers/usb/serial/keyspan_mpr_fw.h delete mode 100644 drivers/usb/serial/keyspan_pda_fw.h delete mode 100644 drivers/usb/serial/keyspan_usa18x_fw.h delete mode 100644 drivers/usb/serial/keyspan_usa19_fw.h delete mode 100644 drivers/usb/serial/keyspan_usa19qi_fw.h delete mode 100644 drivers/usb/serial/keyspan_usa19qw_fw.h delete mode 100644 drivers/usb/serial/keyspan_usa19w_fw.h delete mode 100644 drivers/usb/serial/keyspan_usa28_fw.h delete mode 100644 drivers/usb/serial/keyspan_usa28x_fw.h delete mode 100644 drivers/usb/serial/keyspan_usa28xa_fw.h delete mode 100644 drivers/usb/serial/keyspan_usa28xb_fw.h delete mode 100644 drivers/usb/serial/keyspan_usa49w_fw.h delete mode 100644 drivers/usb/serial/keyspan_usa49wlc_fw.h delete mode 100644 drivers/usb/serial/ti_fw_3410.h delete mode 100644 drivers/usb/serial/ti_fw_5052.h delete mode 100644 drivers/usb/serial/whiteheat_fw.h delete mode 100644 drivers/usb/serial/xircom_pgs_fw.h create mode 100644 firmware/Makefile create mode 100644 firmware/WHENCE create mode 100644 firmware/acenic/tg1.bin.ihex create mode 100644 firmware/acenic/tg2.bin.ihex create mode 100644 firmware/atmsar11.HEX create mode 100644 firmware/e100/d101m_ucode.bin.ihex create mode 100644 firmware/e100/d101s_ucode.bin.ihex create mode 100644 firmware/e100/d102e_ucode.bin.ihex create mode 100644 firmware/emi26/bitstream.HEX create mode 100644 firmware/emi26/firmware.HEX create mode 100644 firmware/emi26/loader.HEX create mode 100644 firmware/emi62/bitstream.HEX create mode 100644 firmware/emi62/loader.HEX create mode 100644 firmware/emi62/midi.HEX create mode 100644 firmware/emi62/spdif.HEX create mode 100644 firmware/ess/maestro3_assp_kernel.fw.ihex create mode 100644 firmware/ess/maestro3_assp_minisrc.fw.ihex create mode 100644 firmware/ihex2fw.c create mode 100644 firmware/intelliport2.bin.ihex create mode 100644 firmware/kaweth/new_code.bin.ihex create mode 100644 firmware/kaweth/new_code_fix.bin.ihex create mode 100644 firmware/kaweth/trigger_code.bin.ihex create mode 100644 firmware/kaweth/trigger_code_fix.bin.ihex create mode 100644 firmware/keyspan/mpr.HEX create mode 100644 firmware/keyspan/usa18x.HEX create mode 100644 firmware/keyspan/usa19.HEX create mode 100644 firmware/keyspan/usa19qi.HEX create mode 100644 firmware/keyspan/usa19qw.HEX create mode 100644 firmware/keyspan/usa19w.HEX create mode 100644 firmware/keyspan/usa28.HEX create mode 100644 firmware/keyspan/usa28x.HEX create mode 100644 firmware/keyspan/usa28xa.HEX create mode 100644 firmware/keyspan/usa28xb.HEX create mode 100644 firmware/keyspan/usa49w.HEX create mode 100644 firmware/keyspan/usa49wlc.HEX create mode 100644 firmware/keyspan_pda/keyspan_pda.HEX rename {drivers/usb/serial => firmware/keyspan_pda}/keyspan_pda.S (100%) create mode 100644 firmware/keyspan_pda/xircom_pgs.HEX rename {drivers/usb/serial => firmware/keyspan_pda}/xircom_pgs.S (100%) create mode 100644 firmware/korg/k1212.dsp.ihex create mode 100644 firmware/ti_3410.fw.ihex create mode 100644 firmware/ti_5052.fw.ihex create mode 100644 firmware/tr_smctr.bin.ihex create mode 100644 firmware/ttusb-budget/dspbootcode.bin.ihex create mode 100644 firmware/whiteheat.HEX create mode 100644 firmware/whiteheat_loader.HEX create mode 100644 firmware/whiteheat_loader_debug.HEX create mode 100644 firmware/yamaha/ds1_ctrl.fw.ihex create mode 100644 firmware/yamaha/ds1_dsp.fw.ihex create mode 100644 firmware/yamaha/ds1e_ctrl.fw.ihex create mode 100644 include/linux/ihex.h create mode 100644 scripts/Makefile.fwinst delete mode 100644 sound/pci/korg1212/korg1212-firmware.h delete mode 100644 sound/pci/ymfpci/ymfpci_image.h Merging pcmcia/master $ git merge pcmcia/master Auto-merged drivers/char/pcmcia/cm4000_cs.c CONFLICT (content): Merge conflict in drivers/char/pcmcia/cm4000_cs.c Auto-merged drivers/ide/legacy/ide-cs.c Auto-merged drivers/mtd/ftl.c Auto-merged drivers/mtd/maps/pcmciamtd.c Auto-merged drivers/pcmcia/pcmcia_ioctl.c Removed include/pcmcia/bulkmem.h Removed include/pcmcia/version.h Resolved 'drivers/char/pcmcia/cm4000_cs.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. drivers/ata/pata_pcmcia.c | 2 + drivers/char/pcmcia/cm4000_cs.c | 92 ++++++---- drivers/char/pcmcia/ipwireless/main.c | 1 - drivers/ide/legacy/ide-cs.c | 2 + drivers/mtd/ftl.c | 4 - drivers/mtd/maps/pcmciamtd.c | 5 +- drivers/pcmcia/Kconfig | 7 + drivers/pcmcia/Makefile | 1 + drivers/pcmcia/au1000_generic.h | 27 ++-- drivers/pcmcia/au1000_pb1x00.c | 1 - drivers/pcmcia/au1000_xxs1500.c | 1 - drivers/pcmcia/bfin_cf_pcmcia.c | 339 +++++++++++++++++++++++++++++++++ drivers/pcmcia/cardbus.c | 2 - drivers/pcmcia/cistpl.c | 16 +- drivers/pcmcia/cs.c | 14 +- drivers/pcmcia/cs_internal.h | 12 -- drivers/pcmcia/ds.c | 8 +- drivers/pcmcia/hd64465_ss.c | 3 - drivers/pcmcia/i82092.c | 2 - drivers/pcmcia/i82092aa.h | 2 - drivers/pcmcia/i82365.c | 39 +++-- drivers/pcmcia/m8xx_pcmcia.c | 3 +- drivers/pcmcia/pcmcia_ioctl.c | 93 +++++++++- drivers/pcmcia/pcmcia_resource.c | 13 +- drivers/pcmcia/pxa2xx_base.c | 1 - drivers/pcmcia/rsrc_mgr.c | 86 +-------- drivers/pcmcia/rsrc_nonstatic.c | 57 ++---- drivers/pcmcia/soc_common.h | 1 - drivers/pcmcia/socket_sysfs.c | 8 +- drivers/pcmcia/ti113x.h | 4 +- include/pcmcia/bulkmem.h | 41 ---- include/pcmcia/cistpl.h | 2 +- include/pcmcia/cs.h | 2 - include/pcmcia/cs_types.h | 6 +- include/pcmcia/ds.h | 19 ++- include/pcmcia/ss.h | 12 +- include/pcmcia/version.h | 3 - 37 files changed, 621 insertions(+), 310 deletions(-) create mode 100644 drivers/pcmcia/bfin_cf_pcmcia.c delete mode 100644 include/pcmcia/bulkmem.h delete mode 100644 include/pcmcia/version.h Merging battery/master $ git merge battery/master Auto-merged drivers/power/power_supply_sysfs.c Merge made by recursive. Documentation/power/power_supply_class.txt | 4 + drivers/power/olpc_battery.c | 273 ++++++++++++++++++++-------- drivers/power/power_supply_sysfs.c | 1 + include/linux/power_supply.h | 1 + 4 files changed, 203 insertions(+), 76 deletions(-) Merging leds/for-mm $ git merge leds/for-mm Merge made by recursive. arch/arm/mach-iop32x/n2100.c | 52 +++++++ drivers/leds/Kconfig | 8 + drivers/leds/Makefile | 1 + drivers/leds/leds-atmel-pwm.c | 2 +- drivers/leds/leds-h1940.c | 9 +- drivers/leds/leds-pca9532.c | 337 +++++++++++++++++++++++++++++++++++++++++ include/linux/leds-pca9532.h | 45 ++++++ include/linux/leds.h | 2 +- 8 files changed, 451 insertions(+), 5 deletions(-) create mode 100644 drivers/leds/leds-pca9532.c create mode 100644 include/linux/leds-pca9532.h Merging backlight/for-mm $ git merge backlight/for-mm Auto-merged drivers/video/backlight/Kconfig CONFLICT (content): Merge conflict in drivers/video/backlight/Kconfig Auto-merged drivers/video/backlight/Makefile CONFLICT (content): Merge conflict in drivers/video/backlight/Makefile Resolved 'drivers/video/backlight/Kconfig' using previous resolution. Resolved 'drivers/video/backlight/Makefile' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a $ git diff -M --stat --summary HEAD^.. drivers/video/backlight/Kconfig | 8 ++ drivers/video/backlight/Makefile | 1 + drivers/video/backlight/mbp_nvidia_bl.c | 116 +++++++++++++++++++++++++++++++ 3 files changed, 125 insertions(+), 0 deletions(-) create mode 100644 drivers/video/backlight/mbp_nvidia_bl.c Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Auto-merged arch/arm/Kconfig Auto-merged arch/arm/kernel/Makefile Auto-merged kernel/softlockup.c Merge made by recursive. arch/arm/Kconfig | 1 + arch/arm/kernel/Makefile | 1 + arch/arm/kernel/kgdb.c | 201 +++++++++++++++++++++++++++++++ arch/arm/kernel/setup.c | 2 + arch/arm/kernel/traps.c | 5 + drivers/serial/cpm_uart/cpm_uart_core.c | 95 ++++++++++++++- drivers/serial/mpsc.c | 139 +++++++++++++++++++++- include/asm-arm/kgdb.h | 104 ++++++++++++++++ include/asm-arm/traps.h | 2 + 9 files changed, 548 insertions(+), 2 deletions(-) create mode 100644 arch/arm/kernel/kgdb.c create mode 100644 include/asm-arm/kgdb.h