diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 1919 |
1 files changed, 1919 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..3110084d34f7 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,1919 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at 17aa7e0 dev_name introduction fall out fix +Merging origin/master +$ git merge origin/master +Updating 17aa7e0..c0a1811 +Fast forward + Documentation/filesystems/Locking | 2 - + Documentation/filesystems/vfs.txt | 4 - + Documentation/scheduler/sched-design.txt | 165 ------- + arch/powerpc/lib/Makefile | 1 + + arch/powerpc/lib/devres.c | 42 ++ + arch/powerpc/platforms/pseries/scanlog.c | 19 +- + arch/um/Makefile | 5 +- + arch/x86/Kconfig | 1 + + arch/x86/mm/pgtable_32.c | 7 - + drivers/ata/Kconfig | 13 +- + drivers/ata/Makefile | 1 + + drivers/ata/ahci.c | 4 +- + drivers/ata/ata_generic.c | 6 + + drivers/ata/ata_piix.c | 25 + + drivers/ata/libata-core.c | 1 + + drivers/ata/libata-eh.c | 2 +- + drivers/ata/libata-sff.c | 6 +- + drivers/ata/pata_acpi.c | 6 + + drivers/ata/pata_sch.c | 206 +++++++++ + drivers/ata/sata_inic162x.c | 646 +++++++++++++++++--------- + drivers/ata/sata_mv.c | 688 +++++++++++++++++++++------- + drivers/base/sys.c | 3 +- + drivers/infiniband/hw/cxgb3/cxio_hal.c | 13 +- + drivers/infiniband/hw/cxgb3/cxio_hal.h | 4 +- + drivers/infiniband/hw/cxgb3/iwch_cm.c | 6 +- + drivers/infiniband/hw/cxgb3/iwch_qp.c | 13 +- + drivers/infiniband/hw/ehca/ehca_hca.c | 7 +- + drivers/infiniband/hw/mlx4/cq.c | 4 +- + drivers/infiniband/ulp/ipoib/ipoib.h | 2 + + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 47 ++- + drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 3 +- + drivers/macintosh/adb.c | 30 +- + drivers/macintosh/therm_pm72.c | 31 +- + drivers/macintosh/windfarm_smu_sat.c | 10 +- + drivers/net/irda/nsc-ircc.c | 6 + + drivers/net/irda/smsc-ircc2.c | 5 +- + drivers/net/mlx4/mr.c | 2 +- + drivers/net/niu.c | 11 +- + drivers/net/wan/lapbether.c | 1 + + drivers/net/wireless/iwlwifi/Kconfig | 3 +- + fs/affs/affs.h | 4 +- + fs/affs/file.c | 25 +- + fs/affs/inode.c | 34 +- + fs/affs/namei.c | 6 +- + fs/affs/super.c | 18 +- + fs/inode.c | 5 - + fs/locks.c | 17 +- + include/asm-powerpc/io.h | 8 +- + include/asm-x86/pgtable_32.h | 9 +- + include/asm-x86/pgtable_64.h | 6 +- + include/linux/fs.h | 5 - + include/linux/io.h | 1 + + include/linux/libata.h | 16 + + include/linux/sched.h | 38 ++- + include/net/ip.h | 2 +- + include/net/xfrm.h | 48 ++- + init/Kconfig | 11 +- + init/main.c | 1 + + kernel/Makefile | 2 +- + kernel/sched.c | 323 ++++++-------- + kernel/sched_clock.c | 236 ++++++++++ + kernel/sched_debug.c | 7 - + kernel/sched_fair.c | 39 +-- + kernel/sched_idletask.c | 2 +- + kernel/sched_rt.c | 9 +- + lib/devres.c | 2 +- + mm/memory.c | 5 +- + net/atm/br2684.c | 4 +- + net/bridge/br_if.c | 12 +- + net/core/skbuff.c | 4 +- + net/dccp/feat.c | 2 +- + net/decnet/dn_route.c | 12 +- + net/ipv4/route.c | 18 +- + net/ipv4/tcp_input.c | 15 +- + net/ipv6/route.c | 6 +- + net/mac80211/main.c | 7 +- + net/sched/act_simple.c | 45 +- + net/sched/sch_htb.c | 8 +- + 78 files changed, 2012 insertions(+), 1051 deletions(-) + delete mode 100644 Documentation/scheduler/sched-design.txt + create mode 100644 arch/powerpc/lib/devres.c + create mode 100644 drivers/ata/pata_sch.c + create mode 100644 kernel/sched_clock.c +Applying v4l build fix +Merging x86-fixes/for-linus +$ git merge x86-fixes/for-linus +Already up-to-date. +Merging sched-fixes/for-linus +$ git merge sched-fixes/for-linus +Merge made by recursive. + kernel/time/tick-sched.c | 11 +++++++++-- + 1 files changed, 9 insertions(+), 2 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 +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Merge made by recursive. + arch/sparc64/kernel/smp.c | 27 +++++---------------------- + arch/sparc64/kernel/sys_sparc32.c | 31 ------------------------------- + arch/sparc64/kernel/systbls.S | 2 +- + arch/sparc64/mm/init.c | 16 +++------------- + drivers/sbus/char/bpp.c | 2 +- + drivers/usb/host/Kconfig | 2 +- + drivers/video/bw2.c | 2 +- + drivers/video/cg3.c | 2 +- + drivers/video/cg6.c | 2 +- + drivers/video/ffb.c | 2 +- + drivers/video/leo.c | 2 +- + drivers/video/p9100.c | 2 +- + drivers/video/tcx.c | 20 +++++++------------- + 13 files changed, 24 insertions(+), 88 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 +Merge made by recursive. + arch/arm/mach-ep93xx/core.c | 2 +- + arch/arm/mach-pxa/pm.c | 7 ++++--- + arch/arm/mach-pxa/pxa25x.c | 8 +++----- + arch/arm/mach-pxa/pxa27x.c | 8 +++----- + arch/arm/mach-pxa/pxa3xx.c | 7 +++---- + arch/arm/mach-sa1100/pm.c | 8 +++----- + drivers/mmc/host/mmci.c | 14 +++++++++++++- + include/asm-arm/arch-pxa/pm.h | 2 +- + 8 files changed, 31 insertions(+), 25 deletions(-) +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merged drivers/edac/edac_core.h +CONFLICT (content): Merge conflict in drivers/edac/edac_core.h +Auto-merged drivers/edac/edac_device.c +CONFLICT (content): Merge conflict in drivers/edac/edac_device.c +Auto-merged drivers/edac/edac_mc.c +CONFLICT (content): Merge conflict in drivers/edac/edac_mc.c +Auto-merged drivers/edac/edac_pci.c +CONFLICT (content): Merge conflict in drivers/edac/edac_pci.c +Auto-merged drivers/pci/probe.c +Auto-merged include/linux/pci.h +Auto-merged include/linux/sysfs.h +Auto-merged init/main.c +Recorded preimage for 'drivers/edac/edac_core.h' +Recorded preimage for 'drivers/edac/edac_device.c' +Recorded preimage for 'drivers/edac/edac_mc.c' +Recorded preimage for 'drivers/edac/edac_pci.c' +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/filesystems/sysfs.txt | 6 + + arch/arm/common/dmabounce.c | 22 +- + arch/arm/common/sa1111.c | 3 +- + arch/arm/common/scoop.c | 2 +- + arch/arm/kernel/ecard.c | 5 +- + arch/arm/mach-integrator/impd1.c | 3 +- + arch/arm/plat-omap/mailbox.c | 2 +- + arch/avr32/mach-at32ap/clock.c | 4 +- + arch/powerpc/platforms/chrp/pci.c | 2 +- + arch/powerpc/platforms/pasemi/misc.c | 2 +- + arch/ppc/platforms/cpci690.c | 4 +- + arch/ppc/platforms/ev64260.c | 4 +- + arch/ppc/platforms/ev64360.c | 4 +- + arch/ppc/platforms/hdpu.c | 4 +- + arch/ppc/platforms/katana.c | 4 +- + arch/ppc/platforms/radstone_ppc7d.c | 4 +- + arch/ppc/syslib/ppc_sys.c | 12 +- + arch/sparc64/kernel/vio.c | 2 +- + arch/x86/kernel/apm_32.c | 8 +- + 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 | 6 +- + block/genhd.c | 7 +- + drivers/acpi/ac.c | 2 +- + drivers/acpi/battery.c | 2 +- + drivers/acpi/fan.c | 10 +- + drivers/acpi/glue.c | 14 +- + drivers/acpi/processor_core.c | 11 +- + drivers/acpi/scan.c | 4 +- + drivers/acpi/sleep/proc.c | 2 +- + drivers/acpi/thermal.c | 12 +- + drivers/acpi/video.c | 7 +- + drivers/acpi/wmi.c | 2 +- + drivers/amba/bus.c | 4 +- + drivers/ata/libata-scsi.c | 2 +- + drivers/base/attribute_container.c | 2 +- + drivers/base/bus.c | 12 +- + drivers/base/class.c | 4 + + drivers/base/core.c | 195 +++++- + drivers/base/dd.c | 12 +- + drivers/base/firmware_class.c | 2 +- + drivers/base/platform.c | 305 +++++++++- + drivers/base/power/main.c | 677 +++++++++++++++----- + drivers/base/power/power.h | 2 +- + drivers/base/power/trace.c | 10 +- + drivers/edac/cell_edac.c | 2 +- + drivers/edac/edac_device.c | 2 +- + drivers/edac/edac_pci.c | 2 +- + drivers/edac/edac_pci_sysfs.c | 6 +- + drivers/edac/mpc85xx_edac.c | 2 +- + drivers/edac/mv64x60_edac.c | 8 +- + drivers/eisa/Makefile | 2 +- + drivers/eisa/eisa-bus.c | 6 +- + drivers/firewire/fw-device.c | 8 +- + drivers/firewire/fw-ohci.c | 2 +- + drivers/firewire/fw-sbp2.c | 2 +- + drivers/hwmon/hwmon.c | 2 +- + drivers/i2c/busses/i2c-pxa.c | 4 +- + drivers/i2c/busses/i2c-s3c2410.c | 2 +- + drivers/i2c/busses/i2c-sh_mobile.c | 2 +- + drivers/i2c/i2c-core.c | 2 +- + drivers/ide/ide-acpi.c | 2 +- + drivers/ieee1394/nodemgr.c | 6 +- + drivers/input/gameport/ns558.c | 2 +- + drivers/input/serio/gscps2.c | 2 +- + drivers/input/touchscreen/ads7846.c | 4 +- + drivers/lguest/lguest_device.c | 2 +- + drivers/macintosh/macio_asic.c | 8 +- + drivers/mca/mca-bus.c | 2 +- + drivers/media/video/bt8xx/bttv-gpio.c | 4 +- + drivers/media/video/bt8xx/bttv.h | 2 +- + drivers/media/video/et61x251/et61x251_core.c | 2 +- + drivers/media/video/ir-kbd-i2c.c | 6 +- + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 2 +- + drivers/media/video/usbvision/usbvision-video.c | 2 +- + drivers/media/video/zc0301/zc0301_core.c | 2 +- + drivers/memstick/core/memstick.c | 2 +- + drivers/memstick/core/mspro_block.c | 14 +- + drivers/memstick/host/jmb38x_ms.c | 4 +- + drivers/memstick/host/tifm_ms.c | 6 +- + drivers/message/fusion/mptbase.h | 2 +- + drivers/message/fusion/mptfc.c | 4 +- + drivers/message/i2o/device.c | 4 +- + drivers/message/i2o/i2o_proc.c | 2 +- + drivers/misc/thinkpad_acpi.c | 8 +- + drivers/misc/tifm_7xx1.c | 2 +- + drivers/mmc/core/host.c | 2 +- + drivers/mmc/host/mmc_spi.c | 2 +- + drivers/mmc/host/tifm_sd.c | 18 +- + drivers/mtd/devices/m25p80.c | 14 +- + drivers/mtd/devices/mtd_dataflash.c | 28 +- + drivers/mtd/maps/bast-flash.c | 2 +- + drivers/mtd/maps/integrator-flash.c | 2 +- + drivers/mtd/maps/ixp2000.c | 4 +- + drivers/mtd/maps/ixp4xx.c | 2 +- + drivers/mtd/maps/omap_nor.c | 2 +- + drivers/mtd/maps/physmap.c | 6 +- + drivers/mtd/maps/physmap_of.c | 4 +- + drivers/mtd/onenand/generic.c | 2 +- + drivers/net/3c59x.c | 6 +- + drivers/net/arm/at91_ether.c | 2 +- + drivers/net/arm/ep93xx_eth.c | 2 +- + drivers/net/arm/etherh.c | 6 +- + drivers/net/au1000_eth.c | 4 +- + drivers/net/bfin_mac.c | 8 +- + drivers/net/bmac.c | 2 +- + drivers/net/declance.c | 6 +- + drivers/net/defxx.c | 2 +- + drivers/net/depca.c | 4 +- + drivers/net/enc28j60.c | 2 +- + drivers/net/jazzsonic.c | 6 +- + drivers/net/macb.c | 8 +- + drivers/net/macsonic.c | 15 +- + drivers/net/pasemi_mac.h | 2 +- + drivers/net/phy/phy.c | 2 +- + drivers/net/phy/phy_device.c | 8 +- + drivers/net/sb1250-mac.c | 10 +- + drivers/net/smc911x.c | 2 +- + drivers/net/smc91x.c | 2 +- + drivers/net/tc35815.c | 4 +- + drivers/net/tulip/de4x5.c | 4 +- + drivers/net/wireless/libertas/defs.h | 2 +- + drivers/net/wireless/orinoco.c | 2 +- + drivers/net/wireless/orinoco_cs.c | 2 +- + drivers/net/wireless/spectrum_cs.c | 2 +- + drivers/parisc/dino.c | 11 +- + drivers/pci/hotplug/acpiphp.h | 4 +- + drivers/pci/hotplug/acpiphp_ibm.c | 2 +- + drivers/pci/hotplug/cpqphp_sysfs.c | 2 +- + drivers/pci/hotplug/fakephp.c | 9 +- + drivers/pci/pci-acpi.c | 2 +- + drivers/pci/pcie/aer/aerdrv.c | 6 +- + drivers/pci/pcie/aer/aerdrv_acpi.c | 2 +- + drivers/pci/pcie/aer/aerdrv_core.c | 8 +- + drivers/pci/pcie/portdrv_core.c | 13 +- + drivers/pci/probe.c | 8 +- + drivers/pcmcia/cs_internal.h | 4 +- + drivers/pcmcia/ds.c | 40 +- + drivers/pcmcia/rsrc_mgr.c | 2 +- + drivers/pcmcia/rsrc_nonstatic.c | 8 +- + drivers/pnp/system.c | 2 +- + drivers/power/ds2760_battery.c | 4 +- + drivers/rtc/class.c | 14 +- + drivers/rtc/interface.c | 2 +- + drivers/rtc/rtc-at91sam9.c | 4 +- + drivers/rtc/rtc-cmos.c | 10 +- + drivers/rtc/rtc-omap.c | 4 +- + 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 | 5 +- + drivers/s390/char/raw3270.c | 4 +- + drivers/s390/char/tape_3590.c | 129 ++-- + drivers/s390/char/tape_block.c | 2 +- + drivers/s390/char/tape_core.c | 22 +- + drivers/s390/char/tape_proc.c | 2 +- + drivers/s390/char/tape_std.c | 12 +- + drivers/s390/char/vmlogrdr.c | 2 +- + drivers/s390/char/vmur.c | 6 +- + drivers/s390/cio/ccwgroup.c | 2 +- + drivers/s390/cio/cio.c | 18 +- + drivers/s390/cio/device.c | 4 +- + drivers/s390/cio/device_fsm.c | 4 +- + drivers/s390/cio/device_ops.c | 2 +- + drivers/s390/cio/qdio.c | 24 +- + drivers/s390/net/claw.c | 30 +- + drivers/s390/net/claw.h | 2 +- + drivers/s390/net/ctcm_main.c | 16 +- + drivers/s390/net/ctcm_main.h | 2 +- + drivers/s390/net/lcs.c | 30 +- + drivers/s390/net/netiucv.c | 2 +- + drivers/s390/net/qeth_core.h | 10 +- + drivers/s390/net/qeth_core_main.c | 10 +- + drivers/s390/scsi/zfcp_def.h | 2 +- + drivers/scsi/NCR_D700.c | 2 +- + drivers/scsi/advansys.c | 2 +- + drivers/scsi/aic94xx/aic94xx_tmf.c | 2 +- + drivers/scsi/hosts.c | 4 +- + drivers/scsi/ipr.c | 2 +- + drivers/scsi/ipr.h | 2 +- + drivers/scsi/lasi700.c | 2 +- + drivers/scsi/libsas/sas_discover.c | 2 +- + drivers/scsi/libsas/sas_dump.c | 2 +- + drivers/scsi/libsas/sas_port.c | 2 +- + drivers/scsi/scsi_ioctl.c | 2 +- + drivers/scsi/scsi_scan.c | 4 +- + drivers/scsi/scsi_transport_fc.c | 19 +- + drivers/scsi/scsi_transport_iscsi.c | 4 +- + drivers/scsi/scsi_transport_sas.c | 18 +- + drivers/scsi/sd.c | 2 +- + drivers/scsi/ses.c | 2 +- + drivers/scsi/sim710.c | 5 +- + drivers/scsi/sni_53c710.c | 2 +- + drivers/scsi/zalon.c | 2 +- + drivers/serial/serial_core.c | 4 +- + drivers/serial/sunzilog.c | 4 +- + drivers/spi/atmel_spi.c | 8 +- + drivers/spi/mpc52xx_psc_spi.c | 2 +- + drivers/spi/omap2_mcspi.c | 2 +- + drivers/spi/omap_uwire.c | 12 +- + drivers/spi/pxa2xx_spi.c | 4 +- + drivers/spi/spi.c | 2 +- + drivers/spi/spi_bfin5xx.c | 2 +- + drivers/spi/spi_bitbang.c | 2 +- + drivers/spi/spi_butterfly.c | 2 +- + drivers/spi/spi_imx.c | 4 +- + drivers/spi/spi_lm70llp.c | 2 +- + drivers/spi/spi_mpc83xx.c | 2 +- + drivers/spi/spi_txx9.c | 2 +- + drivers/ssb/pcihost_wrapper.c | 2 +- + drivers/thermal/thermal_sys.c | 2 +- + drivers/usb/core/devio.c | 5 + + drivers/usb/core/driver.c | 6 +- + drivers/usb/core/endpoint.c | 4 +- + drivers/usb/core/file.c | 10 +- + drivers/usb/core/hcd.c | 6 +- + drivers/usb/core/hcd.h | 2 +- + drivers/usb/core/message.c | 8 +- + drivers/usb/core/usb.c | 7 +- + drivers/usb/gadget/amd5536udc.c | 2 +- + drivers/usb/gadget/at91_udc.c | 2 +- + drivers/usb/gadget/atmel_usba_udc.c | 2 +- + drivers/usb/gadget/dummy_hcd.c | 4 +- + drivers/usb/gadget/ether.c | 2 +- + drivers/usb/gadget/file_storage.c | 4 +- + drivers/usb/gadget/fsl_usb2_udc.c | 2 +- + drivers/usb/gadget/goku_udc.c | 2 +- + drivers/usb/gadget/lh7a40x_udc.c | 4 +- + drivers/usb/gadget/m66592-udc.c | 2 +- + drivers/usb/gadget/net2280.c | 2 +- + drivers/usb/gadget/omap_udc.c | 2 +- + drivers/usb/gadget/pxa2xx_udc.c | 4 +- + drivers/usb/gadget/s3c2410_udc.c | 2 +- + drivers/usb/host/ehci-dbg.c | 4 +- + drivers/usb/host/ehci-fsl.c | 12 +- + drivers/usb/host/ehci-ixp4xx.c | 8 +- + drivers/usb/host/ehci-orion.c | 8 +- + drivers/usb/host/ehci-ps3.c | 2 +- + drivers/usb/host/isp116x-hcd.c | 2 +- + drivers/usb/host/ohci-dbg.c | 2 +- + drivers/usb/host/ohci-omap.c | 2 +- + drivers/usb/host/ohci-pnx4008.c | 2 +- + drivers/usb/host/ohci-ps3.c | 2 +- + drivers/usb/host/ohci-sm501.c | 2 +- + drivers/usb/host/ohci-ssb.c | 2 +- + drivers/usb/host/sl811-hcd.c | 2 +- + drivers/usb/host/u132-hcd.c | 2 +- + drivers/usb/serial/usb-serial.c | 6 +- + drivers/video/aty/aty128fb.c | 2 +- + drivers/video/aty/radeonfb.h | 2 +- + drivers/video/pmag-ba-fb.c | 16 +- + drivers/video/pmagb-b-fb.c | 16 +- + drivers/video/ps3fb.c | 2 +- + drivers/virtio/virtio_pci.c | 2 +- + drivers/w1/w1.c | 12 +- + drivers/xen/xenbus/xenbus_probe.c | 10 +- + drivers/xen/xenbus/xenbus_probe.h | 2 +- + fs/partitions/check.c | 10 +- + fs/sysfs/file.c | 13 + + fs/sysfs/mount.c | 2 +- + fs/sysfs/sysfs.h | 1 + + include/asm-parisc/parisc-device.h | 4 +- + include/linux/device.h | 34 +- + include/linux/eisa.h | 2 +- + include/linux/i2c.h | 4 +- + include/linux/init.h | 1 + + include/linux/kobject.h | 1 - + include/linux/mmc/card.h | 2 +- + include/linux/mmc/host.h | 2 +- + include/linux/mmc/sdio_func.h | 2 +- + include/linux/mtd/map.h | 2 +- + include/linux/mtd/mtd.h | 2 +- + include/linux/pci.h | 4 +- + include/linux/phy.h | 2 +- + include/linux/platform_device.h | 1 + + include/linux/pm.h | 314 +++++++++- + include/linux/rio_drv.h | 2 +- + include/linux/spi/spi.h | 2 +- + include/linux/sysfs.h | 5 + + include/linux/usb.h | 2 +- + include/net/wireless.h | 4 +- + include/scsi/scsi_host.h | 2 +- + include/scsi/scsi_transport_fc.h | 4 +- + include/scsi/scsi_transport_iscsi.h | 2 +- + init/main.c | 9 + + kernel/power/disk.c | 22 +- + kernel/power/main.c | 6 +- + lib/kobject.c | 52 ++ + lib/swiotlb.c | 2 +- + net/bluetooth/hci_sysfs.c | 2 +- + net/rfkill/rfkill.c | 2 +- + net/wireless/nl80211.c | 2 +- + .../firmware_sample_firmware_class.c | 2 +- + sound/drivers/ml403-ac97cr.c | 4 +- + sound/isa/ad1848/ad1848.c | 6 +- + sound/isa/adlib.c | 12 +- + sound/isa/cs423x/cs4231.c | 9 +- + sound/isa/cs423x/cs4236.c | 8 +- + sound/isa/es1688/es1688.c | 6 +- + sound/isa/gus/gusclassic.c | 8 +- + sound/isa/gus/gusextreme.c | 14 +- + sound/isa/sb/sb8.c | 4 +- + 310 files changed, 2250 insertions(+), 1065 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-dev +$ git reset --hard HEAD^ +HEAD is now at 864fb38 Merge commit 'arm-current/master' +Merging quilt/usb +$ git merge quilt/usb +Auto-merged drivers/edac/edac_core.h +CONFLICT (content): Merge conflict in drivers/edac/edac_core.h +Auto-merged drivers/edac/edac_device.c +CONFLICT (content): Merge conflict in drivers/edac/edac_device.c +Auto-merged drivers/edac/edac_mc.c +CONFLICT (content): Merge conflict in drivers/edac/edac_mc.c +Auto-merged drivers/edac/edac_pci.c +CONFLICT (content): Merge conflict in drivers/edac/edac_pci.c +Auto-merged drivers/pci/probe.c +Auto-merged drivers/usb/host/Kconfig +Auto-merged include/linux/pci.h +Auto-merged include/linux/sysfs.h +Auto-merged init/main.c +Resolved 'drivers/edac/edac_core.h' using previous resolution. +Resolved 'drivers/edac/edac_device.c' using previous resolution. +Resolved 'drivers/edac/edac_mc.c' using previous resolution. +Resolved 'drivers/edac/edac_pci.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git reset --hard +HEAD is now at 864fb38 Merge commit 'arm-current/master' +Merging x86/for-akpm +$ git merge x86/for-akpm +Already up-to-date. +Merging sched/for-akpm +$ git merge sched/for-akpm +Merge made by recursive. + Documentation/tracers/mmiotrace.txt | 164 ++ + Makefile | 4 + + arch/x86/Kconfig | 1 + + arch/x86/Kconfig.debug | 28 + + arch/x86/kernel/Makefile | 1 + + 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 | 159 ++ + 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/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 | 508 ++++++ + 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-x86/alternative.h | 2 + + include/asm-x86/irqflags.h | 24 +- + include/asm-x86/vsyscall.h | 3 +- + include/linux/ftrace.h | 123 ++ + include/linux/irqflags.h | 13 +- + include/linux/linkage.h | 2 + + include/linux/mmiotrace.h | 85 + + include/linux/preempt.h | 34 +- + include/linux/sched.h | 48 + + kernel/Makefile | 11 + + kernel/fork.c | 2 +- + kernel/lockdep.c | 33 +- + kernel/printk.c | 2 + + kernel/sched.c | 70 +- + kernel/sched_cpupri.c | 174 ++ + kernel/sched_cpupri.h | 36 + + kernel/sched_rt.c | 197 ++- + kernel/spinlock.c | 2 +- + kernel/sysctl.c | 11 + + kernel/trace/Kconfig | 131 ++ + kernel/trace/Makefile | 24 + + kernel/trace/ftrace.c | 1401 +++++++++++++++ + kernel/trace/trace.c | 3038 +++++++++++++++++++++++++++++++++ + kernel/trace/trace.h | 351 ++++ + kernel/trace/trace_functions.c | 78 + + kernel/trace/trace_irqsoff.c | 502 ++++++ + kernel/trace/trace_mmiotrace.c | 295 ++++ + kernel/trace/trace_sched_switch.c | 186 ++ + kernel/trace/trace_sched_wakeup.c | 288 ++++ + kernel/trace/trace_selftest.c | 555 ++++++ + kernel/trace/trace_selftest_dynamic.c | 7 + + kernel/trace/trace_sysprof.c | 355 ++++ + lib/Kconfig.debug | 2 + + lib/Makefile | 9 + + lib/smp_processor_id.c | 6 +- + 65 files changed, 10261 insertions(+), 156 deletions(-) + create mode 100644 Documentation/tracers/mmiotrace.txt + 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/linux/ftrace.h + create mode 100644 include/linux/mmiotrace.h + create mode 100644 kernel/sched_cpupri.c + create mode 100644 kernel/sched_cpupri.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 pci/linux-next +$ git merge pci/linux-next +Auto-merged include/linux/pci.h +Merge made by recursive. + drivers/pci/hotplug/pciehp_core.c | 2 +- + drivers/pci/hotplug/shpchp_core.c | 2 +- + include/linux/pci.h | 5 ++++- + 3 files changed, 6 insertions(+), 3 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Already up-to-date. +Merging hid/mm +$ git merge hid/mm +Merge made by recursive. + drivers/hid/hid-input.c | 5 +++-- + drivers/hid/usbhid/hid-quirks.c | 38 +++++++++++++++++++------------------- + include/linux/hid.h | 1 + + 3 files changed, 23 insertions(+), 21 deletions(-) +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + MAINTAINERS | 2 + + drivers/i2c/busses/i2c-ali1535.c | 6 +++ + drivers/i2c/busses/i2c-ali1563.c | 5 ++ + drivers/i2c/busses/i2c-ali15x3.c | 5 ++ + drivers/i2c/busses/i2c-amd756.c | 6 +++ + drivers/i2c/busses/i2c-amd8111.c | 5 ++ + drivers/i2c/busses/i2c-davinci.c | 89 ++++++++++++++++++++++++++++--------- + drivers/i2c/busses/i2c-i801.c | 5 ++ + drivers/i2c/busses/i2c-mpc.c | 16 +++---- + drivers/i2c/busses/i2c-nforce2.c | 6 +++ + drivers/i2c/busses/i2c-piix4.c | 36 ++++++++++++++- + drivers/i2c/busses/i2c-sis5595.c | 6 +++ + drivers/i2c/busses/i2c-sis630.c | 6 +++ + drivers/i2c/busses/i2c-sis96x.c | 5 ++ + drivers/i2c/busses/i2c-viapro.c | 5 ++ + drivers/i2c/i2c-core.c | 14 +++--- + drivers/rtc/rtc-s35390a.c | 2 +- + include/linux/i2c.h | 2 +- + 18 files changed, 180 insertions(+), 41 deletions(-) +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 +- + Documentation/kbuild/00-INDEX | 2 + + Documentation/kbuild/make-configs.txt | 188 ++++++++++++++++++++++++ + README | 32 +++-- + 6 files changed, 221 insertions(+), 17 deletions(-) + create mode 100644 Documentation/early-userspace/00-INDEX + rename Documentation/{ => early-userspace}/initrd.txt (99%) + create mode 100644 Documentation/kbuild/make-configs.txt +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Merge made by recursive. + arch/avr32/kernel/avr32_ksyms.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) +Merging v4l-dvb/stable +$ git merge v4l-dvb/stable +Merge made by recursive. + Documentation/video4linux/CARDLIST.cx23885 | 2 +- + Documentation/video4linux/CARDLIST.em28xx | 2 +- + drivers/media/common/tuners/Kconfig | 25 +- + drivers/media/common/tuners/tda18271-common.c | 24 +- + drivers/media/common/tuners/tda18271-fe.c | 168 ++- + drivers/media/common/tuners/tda18271-priv.h | 9 + + drivers/media/common/tuners/tea5767.c | 6 +- + drivers/media/dvb/bt8xx/Kconfig | 1 + + drivers/media/dvb/cinergyT2/Kconfig | 2 +- + drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 28 +- + drivers/media/dvb/dvb-usb/Kconfig | 1 + + drivers/media/dvb/frontends/Kconfig | 30 +- + drivers/media/dvb/frontends/Makefile | 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/ttpci/Kconfig | 2 + + drivers/media/dvb/ttusb-dec/Kconfig | 1 + + drivers/media/video/Kconfig | 10 +- + drivers/media/video/Makefile | 2 +- + drivers/media/video/au0828/Kconfig | 3 +- + drivers/media/video/bt8xx/Kconfig | 3 +- + drivers/media/video/cx18/Kconfig | 4 +- + drivers/media/video/cx18/cx18-driver.c | 8 +- + drivers/media/video/cx18/cx18-queue.c | 6 +- + drivers/media/video/cx18/cx18-streams.c | 13 +- + drivers/media/video/cx18/cx18-streams.h | 2 +- + drivers/media/video/cx23885/Kconfig | 6 +- + drivers/media/video/cx23885/cx23885-cards.c | 36 +- + drivers/media/video/cx23885/cx23885-dvb.c | 1 - + drivers/media/video/cx25840/Kconfig | 1 + + drivers/media/video/cx88/Kconfig | 6 +- + drivers/media/video/cx88/cx88-dvb.c | 251 +++-- + drivers/media/video/em28xx/Kconfig | 3 +- + drivers/media/video/em28xx/em28xx-cards.c | 8 +- + drivers/media/video/em28xx/em28xx-dvb.c | 1 - + drivers/media/video/ivtv/Kconfig | 4 +- + drivers/media/video/ivtv/ivtv-controls.c | 4 +- + drivers/media/video/ivtv/ivtv-driver.c | 8 +- + drivers/media/video/ivtv/ivtv-ioctl.c | 16 +- + drivers/media/video/ivtv/ivtv-ioctl.h | 6 +- + drivers/media/video/ivtv/ivtv-queue.c | 12 +- + drivers/media/video/ivtv/ivtv-streams.c | 13 +- + drivers/media/video/ivtv/ivtv-streams.h | 2 +- + drivers/media/video/ivtv/ivtv-vbi.c | 3 +- + drivers/media/video/ivtv/ivtv-yuv.c | 2 +- + drivers/media/video/ivtv/ivtvfb.c | 6 +- + drivers/media/video/pvrusb2/Kconfig | 3 +- + drivers/media/video/saa7134/Kconfig | 3 +- + drivers/media/video/saa7134/saa7134-dvb.c | 140 ++- + drivers/media/video/stk-webcam.c | 7 + + drivers/media/video/tuner-core.c | 34 +- + drivers/media/video/usbvision/Kconfig | 2 +- + 53 files changed, 2256 insertions(+), 349 deletions(-) + 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 +Already up-to-date. +Merging sh/master +$ git merge sh/master +Removed arch/sh/boards/mpc1211/Makefile +Removed arch/sh/boards/mpc1211/pci.c +Removed arch/sh/boards/mpc1211/rtc.c +Removed arch/sh/boards/mpc1211/setup.c +Auto-merged arch/sh/boards/renesas/migor/setup.c +Auto-merged arch/sh/boards/renesas/r7780rp/setup.c +Auto-merged drivers/mtd/maps/Kconfig +Removed drivers/mtd/maps/mpc1211.c +Auto-merged drivers/rtc/rtc-sh.c +Auto-merged drivers/serial/sh-sci.c +Removed include/asm-sh/keyboard.h +Removed include/asm-sh/mpc1211/dma.h +Removed include/asm-sh/mpc1211/io.h +Removed include/asm-sh/mpc1211/keyboard.h +Removed include/asm-sh/mpc1211/m1543c.h +Removed include/asm-sh/mpc1211/mc146818rtc.h +Removed include/asm-sh/mpc1211/mpc1211.h +Removed include/asm-sh/mpc1211/pci.h +Merge made by recursive. + arch/sh/Kconfig | 17 +- + arch/sh/Kconfig.debug | 1 + + arch/sh/Makefile | 1 - + arch/sh/boards/mpc1211/Makefile | 8 - + arch/sh/boards/mpc1211/pci.c | 295 ---------------------- + arch/sh/boards/mpc1211/rtc.c | 136 ---------- + arch/sh/boards/mpc1211/setup.c | 347 -------------------------- + arch/sh/boards/renesas/migor/setup.c | 11 +- + arch/sh/boards/renesas/r7780rp/irq-r7780mp.c | 2 +- + arch/sh/boards/renesas/r7780rp/irq-r7780rp.c | 2 +- + arch/sh/boards/renesas/r7780rp/irq-r7785rp.c | 2 +- + arch/sh/boards/renesas/r7780rp/setup.c | 24 +-- + arch/sh/boards/renesas/rts7751r2d/setup.c | 7 +- + arch/sh/boards/se/7722/setup.c | 6 + + arch/sh/boot/compressed/Makefile_32 | 1 - + arch/sh/boot/compressed/Makefile_64 | 1 - + arch/sh/kernel/cpu/irq/intc-sh5.c | 73 +++--- + arch/sh/kernel/cpu/irq/intc.c | 93 +++++++- + arch/sh/kernel/cpu/sh3/Makefile | 2 +- + arch/sh/kernel/cpu/sh3/setup-sh3.c | 71 ++++++ + arch/sh/kernel/cpu/sh3/setup-sh7705.c | 22 +-- + arch/sh/kernel/cpu/sh3/setup-sh770x.c | 32 +-- + arch/sh/kernel/cpu/sh3/setup-sh7710.c | 25 +-- + arch/sh/kernel/cpu/sh3/setup-sh7720.c | 35 +--- + arch/sh/kernel/cpu/sh5/entry.S | 28 ++ + arch/sh/kernel/cpu/sh5/probe.c | 4 + + arch/sh/kernel/early_printk.c | 30 ++- + arch/sh/kernel/setup.c | 46 ++++- + arch/sh/kernel/sh_ksyms_32.c | 2 - + arch/sh/kernel/sh_ksyms_64.c | 26 ++ + arch/sh/kernel/time_64.c | 5 +- + arch/sh/lib64/dbg.c | 2 +- + arch/sh/mm/Makefile_64 | 7 +- + arch/sh/mm/cache-sh5.c | 2 + + arch/sh/mm/ioremap_64.c | 2 + + arch/sh/mm/numa.c | 2 +- + arch/sh/tools/mach-types | 1 - + drivers/input/serio/i8042-io.h | 2 +- + drivers/mtd/maps/Kconfig | 9 +- + drivers/mtd/maps/Makefile | 1 - + drivers/mtd/maps/mpc1211.c | 80 ------ + drivers/rtc/rtc-sh.c | 14 +- + drivers/serial/sh-sci.c | 32 +-- + drivers/serial/sh-sci.h | 27 ++- + include/asm-sh/hw_irq.h | 19 ++ + include/asm-sh/io.h | 12 +- + include/asm-sh/keyboard.h | 13 - + include/asm-sh/mmu_context.h | 4 +- + include/asm-sh/mmzone.h | 2 + + include/asm-sh/mpc1211/dma.h | 303 ---------------------- + include/asm-sh/mpc1211/io.h | 22 -- + include/asm-sh/mpc1211/keyboard.h | 60 ----- + include/asm-sh/mpc1211/m1543c.h | 200 --------------- + include/asm-sh/mpc1211/mc146818rtc.h | 6 - + include/asm-sh/mpc1211/mpc1211.h | 18 -- + include/asm-sh/mpc1211/pci.h | 38 --- + include/asm-sh/r7780rp.h | 4 +- + include/asm-sh/tlb_64.h | 10 +- + include/asm-sh/uaccess_64.h | 2 + + 59 files changed, 466 insertions(+), 1783 deletions(-) + delete mode 100644 arch/sh/boards/mpc1211/Makefile + delete mode 100644 arch/sh/boards/mpc1211/pci.c + delete mode 100644 arch/sh/boards/mpc1211/rtc.c + delete mode 100644 arch/sh/boards/mpc1211/setup.c + create mode 100644 arch/sh/kernel/cpu/sh3/setup-sh3.c + delete mode 100644 drivers/mtd/maps/mpc1211.c + delete mode 100644 include/asm-sh/keyboard.h + delete mode 100644 include/asm-sh/mpc1211/dma.h + delete mode 100644 include/asm-sh/mpc1211/io.h + delete mode 100644 include/asm-sh/mpc1211/keyboard.h + delete mode 100644 include/asm-sh/mpc1211/m1543c.h + delete mode 100644 include/asm-sh/mpc1211/mc146818rtc.h + delete mode 100644 include/asm-sh/mpc1211/mpc1211.h + delete mode 100644 include/asm-sh/mpc1211/pci.h +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging quilt/ide +$ git merge quilt/ide +Auto-merged Documentation/kernel-parameters.txt +Merge made by recursive. + Documentation/kernel-parameters.txt | 3 - + block/blk-core.c | 12 +- + block/blk-exec.c | 3 +- + drivers/block/paride/pd.c | 20 +- + drivers/ide/ide-acpi.c | 6 +- + drivers/ide/ide-cd.c | 111 ++++++------ + drivers/ide/ide-cd.h | 4 +- + drivers/ide/ide-cd_ioctl.c | 113 ++++++------ + drivers/ide/ide-disk.c | 10 +- + drivers/ide/ide-dma.c | 2 +- + drivers/ide/ide-floppy.c | 17 +- + drivers/ide/ide-io.c | 83 +------- + drivers/ide/ide-iops.c | 2 +- + drivers/ide/ide-tape.c | 49 +++-- + drivers/ide/ide-taskfile.c | 34 ++-- + drivers/ide/ide-timing.h | 1 - + drivers/ide/ide.c | 359 +++-------------------------------- + drivers/ide/legacy/ali14xx.c | 2 +- + drivers/ide/legacy/gayle.c | 3 +- + drivers/ide/legacy/ht6560b.c | 2 +- + drivers/ide/legacy/qd65xx.c | 4 +- + drivers/ide/mips/swarm.c | 16 +- + drivers/ide/pci/aec62xx.c | 2 +- + drivers/ide/pci/alim15x3.c | 2 +- + drivers/ide/pci/amd74xx.c | 16 +- + drivers/ide/pci/cmd640.c | 8 +- + drivers/ide/pci/cmd64x.c | 4 +- + drivers/ide/pci/cy82c693.c | 2 +- + drivers/ide/pci/opti621.c | 2 +- + drivers/ide/pci/via82cxxx.c | 16 +- + drivers/scsi/ide-scsi.c | 5 +- + include/linux/blkdev.h | 1 - + include/linux/ide.h | 9 - + 33 files changed, 278 insertions(+), 645 deletions(-) +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Auto-merged fs/xfs/linux-2.6/xfs_super.c +Auto-merged fs/xfs/xfs_mount.c +Auto-merged fs/xfs/xfs_mount.h +Auto-merged fs/xfs/xfs_vfsops.c +Merge made by recursive. + fs/xfs/linux-2.6/xfs_super.c | 1 + + fs/xfs/xfs_clnt.h | 1 + + fs/xfs/xfs_dir2_node.c | 358 ++++++++++++++++++++++++------------------ + fs/xfs/xfs_mount.c | 12 ++- + fs/xfs/xfs_mount.h | 1 + + fs/xfs/xfs_sb.h | 7 + + fs/xfs/xfs_vfsops.c | 9 +- + 7 files changed, 231 insertions(+), 158 deletions(-) +Merging infiniband/for-next +$ git merge infiniband/for-next +Already up-to-date. +Merging acpi/test +$ git merge acpi/test +Merge made by recursive. + drivers/acpi/dispatcher/dsmethod.c | 2 +- + drivers/acpi/executer/exmutex.c | 4 +- + drivers/acpi/processor_core.c | 14 ++++++-- + drivers/acpi/scan.c | 56 ++++++++++++++++++++--------------- + kernel/cpu.c | 1 + + 5 files changed, 46 insertions(+), 31 deletions(-) +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Merge made by recursive. + fs/nfsd/nfs4state.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Already up-to-date. +Merging hwmon/testing +$ git merge hwmon/testing +Already up-to-date. +Merging ubi/master +$ git merge ubi/master +Merge made by recursive. +Merging kvm/master +$ git merge kvm/master +Merge made by recursive. + arch/x86/kvm/i8254.c | 7 ++-- + arch/x86/kvm/lapic.c | 4 ++ + arch/x86/kvm/lapic.h | 1 + + arch/x86/kvm/mmu.c | 4 +- + arch/x86/kvm/svm.c | 60 +++++++++++++++++++++++++++++++----- + arch/x86/kvm/vmx.c | 4 +-- + arch/x86/kvm/x86.c | 29 +++++++++++++---- + arch/x86/kvm/x86_emulate.c | 7 +++- + drivers/s390/kvm/kvm_virtio.c | 40 ++++++++++++++---------- + include/asm-x86/kvm.h | 1 + + include/asm-x86/kvm_x86_emulate.h | 1 + + virt/kvm/kvm_main.c | 52 +++++++++++++++++++++++-------- + 12 files changed, 153 insertions(+), 57 deletions(-) +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +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/scsi/Kconfig +Merge made by recursive. + 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/scsi/Kconfig | 2 + + drivers/scsi/Makefile | 1 + + 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/scsi_error.c | 11 + + drivers/scsi/scsi_lib.c | 8 + + drivers/scsi/scsi_sysfs.c | 1 + + include/scsi/scsi.h | 1 + + include/scsi/scsi_device.h | 22 + + include/scsi/scsi_dh.h | 59 +++ + 23 files changed, 1788 insertions(+), 1666 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 +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +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 | 72 +-------------------- + 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(+), 83 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 +Already up-to-date. +Merging selinux/for-akpm +$ git merge selinux/for-akpm +Already up-to-date. +Merging quilt/m68k +$ git merge quilt/m68k +Merge made by recursive. + arch/m68k/Kconfig | 9 +- + arch/m68k/configs/amiga_defconfig | 130 ++-- + arch/m68k/configs/apollo_defconfig | 112 ++-- + arch/m68k/configs/atari_defconfig | 115 ++-- + arch/m68k/configs/bvme6000_defconfig | 112 ++-- + arch/m68k/configs/hp300_defconfig | 114 ++-- + arch/m68k/configs/mac_defconfig | 115 ++-- + arch/m68k/configs/multi_defconfig | 1255 ++++++++++++++++++++++++++++++++++ + arch/m68k/configs/mvme147_defconfig | 112 ++-- + arch/m68k/configs/mvme16x_defconfig | 112 ++-- + arch/m68k/configs/q40_defconfig | 131 ++-- + arch/m68k/configs/sun3_defconfig | 112 ++-- + arch/m68k/configs/sun3x_defconfig | 112 ++-- + arch/m68k/kernel/head.S | 2 +- + arch/m68k/kernel/setup.c | 3 +- + drivers/block/amiflop.c | 6 +- + drivers/block/z2ram.c | 2 +- + drivers/char/vme_scc.c | 4 +- + drivers/ide/legacy/macide.c | 3 + + drivers/input/misc/hp_sdc_rtc.c | 5 + + drivers/input/serio/hp_sdc_mlc.c | 5 + + drivers/input/serio/q40kbd.c | 2 +- + drivers/net/82596.c | 7 + + drivers/net/apne.c | 3 + + drivers/net/mac89x0.c | 3 + + drivers/net/macmace.c | 3 + + drivers/net/sun3lance.c | 3 + + drivers/video/Kconfig | 4 +- + drivers/video/amifb.c | 4 +- + drivers/video/dnfb.c | 3 + + drivers/video/hpfb.c | 2 +- + include/asm-m68k/bug.h | 4 +- + include/asm-m68k/setup.h | 2 +- + include/asm-m68k/uaccess.h | 6 +- + 34 files changed, 2087 insertions(+), 530 deletions(-) + create mode 100644 arch/m68k/configs/multi_defconfig +Merging powerpc/powerpc-next +$ git merge powerpc/powerpc-next +Already up-to-date. +Merging hrt/mm +$ git merge hrt/mm +Already up-to-date. +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging ext4/next +$ git merge ext4/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Merge made by recursive. + arch/powerpc/boot/dts/sequoia.dts | 9 ++- + arch/powerpc/kernel/head_44x.S | 9 ++- + arch/powerpc/sysdev/ppc4xx_pci.c | 180 +++++++++++++++++++++++++---------- + include/asm-powerpc/pgtable-ppc32.h | 7 ++ + 4 files changed, 153 insertions(+), 52 deletions(-) +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Auto-merged fs/udf/namei.c +Auto-merged fs/udf/super.c +Merge made by recursive. + fs/udf/namei.c | 145 ++++++++++++++++++++++++++++++++++++++++++++- + fs/udf/partition.c | 4 +- + fs/udf/super.c | 1 + + fs/udf/udfdecl.h | 1 + + include/linux/exportfs.h | 21 +++++++ + 5 files changed, 166 insertions(+), 6 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging net/master +$ git merge net/master +Merge made by recursive. + net/tipc/config.c | 2 +- + net/tipc/core.c | 6 +- + net/tipc/core.h | 124 ++++++++++++++++----------- + net/tipc/dbg.c | 231 +++++++++++++++++++++++------------------------- + net/tipc/dbg.h | 12 ++-- + net/tipc/link.c | 20 ++++- + net/tipc/msg.c | 10 ++- + net/tipc/name_distr.c | 3 - + 8 files changed, 218 insertions(+), 190 deletions(-) +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging galak/powerpc-next +$ git merge galak/powerpc-next +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Already up-to-date. +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Already up-to-date. +Merging vfs/vfs-2.6.25 +$ git merge vfs/vfs-2.6.25 +Auto-merged fs/inode.c +Merge made by recursive. +Merging sound/master +$ git merge sound/master +Merge made by recursive. + include/sound/soc-dapm.h | 2 + + sound/soc/codecs/tlv320aic3x.c | 278 +++++++++++++++++++----------------- + sound/soc/codecs/tlv320aic3x.h | 51 +++++++ + sound/soc/s3c24xx/neo1973_wm8753.c | 46 ++++++ + sound/soc/soc-dapm.c | 23 +++ + 5 files changed, 266 insertions(+), 134 deletions(-) +Merging arm/devel +$ git merge arm/devel +Removed arch/arm/common/rtctime.c +Removed arch/arm/mach-integrator/time.c +Auto-merged arch/arm/mach-pxa/pxa25x.c +Auto-merged arch/arm/mach-pxa/pxa27x.c +Auto-merged arch/arm/mach-pxa/pxa3xx.c +Auto-merged drivers/pcmcia/pxa2xx_mainstone.c +Removed include/asm-arm/dyntick.h +Removed include/asm-arm/rtc.h +Auto-merged kernel/hrtimer.c +Auto-merged kernel/sysctl.c +Merge made by recursive. + arch/arm/Kconfig | 24 +-- + arch/arm/common/Makefile | 1 - + arch/arm/common/rtctime.c | 434 ------------------------------ + arch/arm/common/sharpsl_pm.c | 2 + + arch/arm/configs/at91cap9adk_defconfig | 1 - + 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/cm_x270_defconfig | 1 - + arch/arm/configs/collie_defconfig | 1 - + arch/arm/configs/corgi_defconfig | 1 - + arch/arm/configs/ecbat91_defconfig | 1 - + arch/arm/configs/em_x270_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/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 - + 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 - + arch/arm/configs/versatile_defconfig | 1 - + 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-integrator/Makefile | 2 +- + arch/arm/mach-integrator/time.c | 223 --------------- + arch/arm/mach-omap1/pm.c | 7 - + arch/arm/mach-omap2/pm.c | 7 - + arch/arm/mach-pxa/Kconfig | 13 +- + arch/arm/mach-pxa/Makefile | 1 + + arch/arm/mach-pxa/corgi_pm.c | 2 + + arch/arm/mach-pxa/devices.c | 60 ++++ + arch/arm/mach-pxa/devices.h | 5 + + arch/arm/mach-pxa/em-x270.c | 1 + + arch/arm/mach-pxa/lpd270.c | 9 +- + arch/arm/mach-pxa/mainstone.c | 63 ++---- + arch/arm/mach-pxa/pwm.c | 299 ++++++++++++++++++++ + arch/arm/mach-pxa/pxa25x.c | 6 +- + arch/arm/mach-pxa/pxa27x.c | 7 +- + arch/arm/mach-pxa/pxa3xx.c | 6 +- + arch/arm/mach-pxa/spitz_pm.c | 2 + + arch/arm/mach-pxa/zylonite.c | 26 ++- + 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/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 | 10 + + 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/pxa2xx_udc.c | 10 +- + drivers/video/backlight/Kconfig | 7 + + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/pwm_bl.c | 143 ++++++++++ + include/asm-arm/arch-pxa/pxa-regs.h | 412 ---------------------------- + include/asm-arm/arch-pxa/pxa25x-udc.h | 163 +++++++++++ + include/asm-arm/arch-pxa/pxa27x-udc.h | 256 ++++++++++++++++++ + 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/mach/time.h | 22 -- + include/asm-arm/rtc.h | 43 --- + include/linux/pwm.h | 31 +++ + include/linux/pwm_backlight.h | 14 + + kernel/hrtimer.c | 2 +- + kernel/sysctl.c | 12 - + kernel/timer.c | 10 +- + 107 files changed, 1595 insertions(+), 1793 deletions(-) + delete mode 100644 arch/arm/common/rtctime.c + delete mode 100644 arch/arm/mach-integrator/time.c + create mode 100644 arch/arm/mach-pxa/pwm.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-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/pwm.h + create mode 100644 include/linux/pwm_backlight.h +Merging cpufreq/master +$ git merge cpufreq/master +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Auto-merged drivers/input/serio/hp_sdc_mlc.c +Auto-merged drivers/s390/kvm/kvm_virtio.c +CONFLICT (content): Merge conflict in drivers/s390/kvm/kvm_virtio.c +Auto-merged kernel/printk.c +Auto-merged kernel/sysctl.c +Recorded preimage for 'drivers/s390/kvm/kvm_virtio.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/kernel-locking.tmpl | 57 +++++++--------- + Documentation/lguest/lguest.c | 23 ++++--- + arch/ia64/kernel/salinfo.c | 4 +- + 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/md/dm-raid1.c | 2 +- + drivers/net/3c527.c | 2 +- + drivers/net/irda/sir_dev.c | 2 +- + drivers/net/virtio_net.c | 58 +++++++++++++++- + drivers/net/wireless/airo.c | 12 ++-- + drivers/s390/kvm/kvm_virtio.c | 2 + + drivers/scsi/aacraid/commsup.c | 2 +- + drivers/usb/core/usb.c | 2 +- + drivers/usb/gadget/inode.c | 2 +- + drivers/virtio/virtio.c | 5 ++ + drivers/virtio/virtio_pci.c | 6 ++- + drivers/virtio/virtio_ring.c | 28 ++++++-- + drivers/watchdog/ar7_wdt.c | 2 +- + drivers/watchdog/it8712f_wdt.c | 2 +- + drivers/watchdog/s3c2410_wdt.c | 2 +- + drivers/watchdog/sc1200wdt.c | 2 +- + drivers/watchdog/scx200_wdt.c | 2 +- + drivers/watchdog/wdt_pci.c | 2 +- + 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 | 7 ++- + include/linux/stop_machine.h | 19 ++++-- + include/linux/timer.h | 32 ++++++--- + include/linux/usb.h | 2 +- + include/linux/virtio_config.h | 7 ++ + include/linux/virtio_ring.h | 15 ++++- + kernel/kthread.c | 29 ++------- + kernel/mutex.c | 4 +- + kernel/printk.c | 4 +- + kernel/semaphore.c | 17 ++--- + kernel/stop_machine.c | 105 +++++++++++++++++++++++------ + kernel/sysctl.c | 12 +++ + 48 files changed, 427 insertions(+), 183 deletions(-) +Merging semaphore/semaphore +$ git merge semaphore/semaphore +Auto-merged drivers/input/misc/hp_sdc_rtc.c +Auto-merged drivers/input/serio/hp_sdc.c +Auto-merged include/linux/semaphore.h +Merge made by recursive. + drivers/input/keyboard/hil_kbd.c | 2 +- + 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(+), 5 deletions(-) +Merging semaphore-removal/semaphore-removal +$ git merge semaphore-removal/semaphore-removal +Auto-merged drivers/atm/ambassador.c +CONFLICT (content): Merge conflict in drivers/atm/ambassador.c +Auto-merged drivers/net/bonding/bond_main.c +Auto-merged drivers/net/ppp_async.c +Auto-merged drivers/scsi/qla2xxx/qla_attr.c +Auto-merged drivers/scsi/qla2xxx/qla_mbx.c +Auto-merged drivers/scsi/qla2xxx/qla_os.c +Auto-merged sound/soc/s3c24xx/s3c2443-ac97.c +Resolved 'drivers/atm/ambassador.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/atm/ambassador.c | 1 + + drivers/net/bonding/bond_main.c | 21 +++++++++-------- + drivers/net/bonding/bond_sysfs.c | 17 +++++++------- + drivers/net/ppp_async.c | 8 +++--- + drivers/net/ps3_gelic_net.c | 11 +++++---- + drivers/net/ps3_gelic_net.h | 2 +- + drivers/net/ps3_gelic_wireless.c | 41 ++++++++++++++++++----------------- + drivers/net/ps3_gelic_wireless.h | 4 +- + drivers/pci/hotplug/ibmphp_hpc.c | 30 ++++++++++++------------- + drivers/scsi/qla2xxx/qla_attr.c | 4 +- + drivers/scsi/qla2xxx/qla_def.h | 3 +- + drivers/scsi/qla2xxx/qla_mbx.c | 4 +- + drivers/scsi/qla2xxx/qla_mid.c | 18 +++++++------- + drivers/scsi/qla2xxx/qla_os.c | 14 +++++++----- + include/net/bluetooth/hci_core.h | 7 +++-- + net/9p/trans_virtio.c | 44 +++++++++++++++++++------------------ + net/bluetooth/hci_core.c | 2 +- + sound/soc/s3c24xx/s3c2443-ac97.c | 11 +++++---- + 19 files changed, 133 insertions(+), 124 deletions(-) +Applying idr.h needs spinlock.h +Merging x86-latest/latest +$ git merge x86-latest/latest +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/kernel/entry_32.S +Auto-merged arch/x86/kernel/entry_64.S +Auto-merged arch/x86/kernel/process_32.c +Auto-merged arch/x86/kernel/process_64.c +Auto-merged arch/x86/mm/fault.c +Auto-merged arch/x86/mm/init_32.c +Auto-merged arch/x86/mm/init_64.c +Auto-merged arch/x86/mm/ioremap.c +Removed include/asm-x86/hw_irq_32.h +Removed include/asm-x86/hw_irq_64.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/pgtable_32.h +Auto-merged include/asm-x86/pgtable_64.h +Removed include/asm-x86/thread_info_32.h +Removed include/asm-x86/thread_info_64.h +Auto-merged include/linux/ide.h +Auto-merged include/linux/kernel.h +Auto-merged include/linux/pci.h +Auto-merged include/linux/sched.h +Auto-merged kernel/fork.c +Auto-merged kernel/printk.c +Auto-merged kernel/sched.c +Auto-merged kernel/sysctl.c +Auto-merged lib/Kconfig.debug +Auto-merged net/core/skbuff.c +Merge made by recursive. + Documentation/filesystems/sysfs-pci.txt | 1 + + Documentation/kernel-parameters.txt | 23 + + Documentation/kmemcheck.txt | 101 ++ + Documentation/x86_64/mm.txt | 5 +- + MAINTAINERS | 8 + + 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/um/Kconfig | 50 +- + arch/um/Kconfig.char | 6 +- + arch/um/Kconfig.i386 | 9 +- + arch/x86/Kconfig | 96 +- + arch/x86/Kconfig.cpu | 24 +- + arch/x86/Kconfig.debug | 65 + + arch/x86/Makefile | 6 +- + arch/x86/Makefile_32.cpu | 3 +- + arch/x86/boot/printf.c | 2 +- + arch/x86/configs/i386_defconfig | 1711 +++++++++++++++------ + arch/x86/configs/x86_64_defconfig | 1735 +++++++++++++++------ + arch/x86/kernel/Makefile | 3 + + arch/x86/kernel/acpi/boot.c | 4 - + arch/x86/kernel/aperture_64.c | 283 +++-- + arch/x86/kernel/apic_32.c | 18 +- + arch/x86/kernel/apic_64.c | 8 +- + arch/x86/kernel/cpu/common.c | 9 +- + arch/x86/kernel/cpu/intel.c | 3 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 1 + + arch/x86/kernel/cpu/mtrr/generic.c | 38 +- + arch/x86/kernel/cpu/mtrr/main.c | 884 ++++++++++- + arch/x86/kernel/cpu/mtrr/mtrr.h | 3 + + arch/x86/kernel/ds.c | 953 ++++++++---- + arch/x86/kernel/e820_32.c | 70 +- + arch/x86/kernel/e820_64.c | 46 +- + arch/x86/kernel/early_printk.c | 2 +- + arch/x86/kernel/entry_32.S | 10 +- + arch/x86/kernel/entry_64.S | 8 +- + arch/x86/kernel/head_32.S | 2 +- + arch/x86/kernel/hpet.c | 43 +- + arch/x86/kernel/i8259_64.c | 46 +- + arch/x86/kernel/io_apic_32.c | 4 +- + arch/x86/kernel/io_apic_64.c | 8 +- + arch/x86/kernel/irq_32.c | 38 + + arch/x86/kernel/irq_64.c | 28 + + arch/x86/kernel/kmemcheck.c | 918 +++++++++++ + arch/x86/kernel/ldt.c | 6 +- + arch/x86/kernel/mmconf-fam10h_64.c | 1 + + arch/x86/kernel/mpparse.c | 17 +- + arch/x86/kernel/nmi_32.c | 29 +- + arch/x86/kernel/nmi_64.c | 4 +- + arch/x86/kernel/pci-dma.c | 13 +- + arch/x86/kernel/pci-gart_64.c | 23 +- + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/process_32.c | 54 +- + arch/x86/kernel/process_64.c | 50 +- + arch/x86/kernel/ptrace.c | 444 ++++--- + arch/x86/kernel/reboot.c | 18 +- + arch/x86/kernel/reboot_fixups_32.c | 4 +- + arch/x86/kernel/setup.c | 2 +- + arch/x86/kernel/setup_32.c | 57 +- + arch/x86/kernel/setup_64.c | 22 +- + arch/x86/kernel/smpboot.c | 5 +- + arch/x86/kernel/traps_32.c | 18 +- + arch/x86/kernel/traps_64.c | 40 +- + arch/x86/kernel/tsc_64.c | 2 +- + arch/x86/kernel/vm86_32.c | 7 +- + arch/x86/kernel/vmiclock_32.c | 3 +- + arch/x86/kernel/vmlinux_32.lds.S | 16 +- + arch/x86/kernel/vmlinux_64.lds.S | 17 +- + arch/x86/kernel/vsmp_64.c | 3 + + arch/x86/mach-visws/visws_apic.c | 3 +- + arch/x86/mach-voyager/voyager_smp.c | 2 +- + arch/x86/mm/dump_pagetables.c | 2 +- + arch/x86/mm/fault.c | 37 +- + arch/x86/mm/init_32.c | 15 +- + arch/x86/mm/init_64.c | 6 +- + arch/x86/mm/ioremap.c | 10 +- + arch/x86/mm/k8topology_64.c | 13 +- + arch/x86/mm/numa_64.c | 38 +- + arch/x86/mm/pat.c | 27 +- + arch/x86/mm/srat_64.c | 3 +- + arch/x86/pci/acpi.c | 18 +- + arch/x86/pci/k8-bus_64.c | 8 - + arch/x86/pci/mmconfig-shared.c | 2 +- + arch/x86/vdso/vma.c | 2 +- + drivers/base/power/trace.c | 2 +- + drivers/char/agp/amd64-agp.c | 77 +- + drivers/input/misc/pcspkr.c | 16 +- + drivers/pci/pci-sysfs.c | 84 +- + fs/proc/proc_misc.c | 9 + + include/asm-generic/vmlinux.lds.h | 21 + + include/asm-x86/bitops.h | 37 +- + include/asm-x86/desc.h | 22 + + include/asm-x86/ds.h | 258 +++- + include/asm-x86/e820_32.h | 6 +- + include/asm-x86/e820_64.h | 2 +- + include/asm-x86/fixmap_32.h | 8 +- + include/asm-x86/gart.h | 38 + + include/asm-x86/genapic_64.h | 2 + + include/asm-x86/hardirq.h | 6 + + 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/i387.h | 14 +- + include/asm-x86/i8253.h | 31 +- + 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 | 166 ++ + include/asm-x86/kdebug.h | 3 +- + include/asm-x86/kmemcheck.h | 30 + + include/asm-x86/mach-default/irq_vectors.h | 96 -- + include/asm-x86/mach-default/irq_vectors_limits.h | 16 - + 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/page.h | 10 +- + include/asm-x86/page_32.h | 8 + + include/asm-x86/pci.h | 2 + + include/asm-x86/pda.h | 2 - + include/asm-x86/pgalloc.h | 32 +- + include/asm-x86/pgtable.h | 33 +- + include/asm-x86/pgtable_32.h | 6 + + include/asm-x86/pgtable_64.h | 6 + + include/asm-x86/processor.h | 12 +- + include/asm-x86/ptrace-abi.h | 14 +- + include/asm-x86/ptrace.h | 38 +- + include/asm-x86/reboot.h | 2 +- + include/asm-x86/required-features.h | 6 +- + include/asm-x86/resume-trace.h | 2 +- + include/asm-x86/stackprotector.h | 38 + + include/asm-x86/string_32.h | 313 +++-- + include/asm-x86/string_64.h | 1 + + include/asm-x86/system.h | 115 +- + 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 | 18 +- + include/asm-x86/vm86.h | 13 +- + include/linux/gfp.h | 3 +- + include/linux/ide.h | 3 +- + include/linux/kernel.h | 2 +- + include/linux/kernel_stat.h | 2 +- + include/linux/kmemcheck.h | 29 + + include/linux/magic.h | 1 + + include/linux/mm_types.h | 4 + + include/linux/pci.h | 1 + + include/linux/pci_ids.h | 2 + + include/linux/percpu.h | 7 + + include/linux/resume-trace.h | 2 +- + include/linux/sched.h | 16 +- + include/linux/slab.h | 7 + + include/linux/slub_kmemcheck.h | 32 + + include/linux/stackprotector.h | 16 + + init/main.c | 9 + + kernel/exit.c | 5 +- + kernel/fork.c | 21 +- + kernel/panic.c | 77 +- + kernel/printk.c | 2 +- + kernel/sched.c | 7 +- + kernel/sysctl.c | 12 + + lib/Kconfig.debug | 1 - + localversion-x86-latest.git | 1 + + mm/Makefile | 3 + + mm/slub.c | 19 +- + mm/slub_kmemcheck.c | 107 ++ + net/core/skbuff.c | 2 +- + 169 files changed, 8191 insertions(+), 3441 deletions(-) + create mode 100644 Documentation/kmemcheck.txt + create mode 100644 arch/x86/kernel/kmemcheck.c + 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 + create mode 100644 include/asm-x86/kmemcheck.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 + create mode 100644 include/asm-x86/stackprotector.h + delete mode 100644 include/asm-x86/thread_info_32.h + delete mode 100644 include/asm-x86/thread_info_64.h + create mode 100644 include/linux/kmemcheck.h + create mode 100644 include/linux/slub_kmemcheck.h + create mode 100644 include/linux/stackprotector.h + create mode 100644 localversion-x86-latest.git + create mode 100644 mm/slub_kmemcheck.c +Merging sched-latest/latest +$ git merge sched-latest/latest +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/kvm/x86.c +Auto-merged include/linux/kernel.h +Auto-merged include/linux/stop_machine.h +CONFLICT (content): Merge conflict in include/linux/stop_machine.h +Auto-merged kernel/Makefile +Auto-merged kernel/cpu.c +Auto-merged kernel/kthread.c +Auto-merged kernel/printk.c +Auto-merged kernel/stop_machine.c +CONFLICT (content): Merge conflict in kernel/stop_machine.c +Auto-merged kernel/sysctl.c +Auto-merged kernel/timer.c +Auto-merged lib/Kconfig.debug +Auto-merged mm/memory.c +Recorded preimage for 'kernel/stop_machine.c' +Resolved 'include/linux/stop_machine.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/RCU/NMI-RCU.txt | 3 + + Documentation/RCU/RTFP.txt | 108 ++++ + Documentation/RCU/checklist.txt | 89 ++- + Documentation/RCU/whatisRCU.txt | 58 ++- + Documentation/immediate.txt | 221 +++++++ + Documentation/kernel-parameters.txt | 3 + + Documentation/markers.txt | 17 +- + arch/alpha/kernel/irq.c | 2 +- + arch/ia64/kernel/kprobes.c | 2 - + arch/ia64/sn/kernel/irq.c | 1 + + arch/powerpc/Kconfig | 1 + + arch/powerpc/kernel/Makefile | 1 + + arch/powerpc/kernel/immediate.c | 70 +++ + arch/powerpc/kernel/kprobes.c | 2 - + arch/s390/kernel/kprobes.c | 2 - + arch/x86/Kconfig | 40 +- + arch/x86/Kconfig.debug | 8 +- + arch/x86/kernel/Makefile | 9 + + arch/x86/kernel/apic_32.c | 9 +- + arch/x86/kernel/apic_64.c | 11 +- + arch/x86/kernel/asm-offsets_32.c | 1 + + arch/x86/kernel/asm-offsets_64.c | 1 + + 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/entry_32.S | 30 + + arch/x86/kernel/entry_64.S | 34 +- + arch/x86/kernel/head64.c | 22 +- + arch/x86/kernel/immediate.c | 545 +++++++++++++++++ + arch/x86/kernel/io_apic_64.c | 8 +- + arch/x86/kernel/kprobes.c | 2 - + arch/x86/kernel/nmi_64.c | 4 +- + arch/x86/kernel/paravirt.c | 3 + + arch/x86/kernel/paravirt_patch_32.c | 6 +- + arch/x86/kernel/paravirt_patch_64.c | 6 +- + arch/x86/kernel/setup.c | 296 +++++++++- + arch/x86/kernel/setup64.c | 8 +- + arch/x86/kernel/setup_32.c | 24 - + arch/x86/kernel/setup_64.c | 9 - + arch/x86/kernel/smpboot.c | 87 ++-- + arch/x86/kernel/traps_32.c | 11 +- + arch/x86/kernel/traps_64.c | 4 + + arch/x86/kernel/vmi_32.c | 2 + + arch/x86/kernel/vmlinux_32.lds.S | 1 + + arch/x86/kernel/vmlinux_64.lds.S | 1 + + arch/x86/kvm/x86.c | 2 +- + arch/x86/lguest/boot.c | 1 + + arch/x86/mm/fault.c | 4 +- + arch/x86/mm/kmmio.c | 14 +- + arch/x86/mm/mmio-mod.c | 2 +- + arch/x86/mm/numa_64.c | 49 +-- + arch/x86/mm/srat_64.c | 2 +- + arch/x86/xen/enlighten.c | 1 + + arch/x86/xen/smp.c | 4 +- + crypto/async_tx/async_tx.c | 1 + + drivers/acpi/processor_throttling.c | 6 +- + drivers/base/cpu.c | 6 +- + drivers/base/topology.c | 25 +- + 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 +- + drivers/infiniband/hw/ipath/ipath_verbs.c | 1 + + drivers/infiniband/hw/ipath/ipath_verbs_mcast.c | 3 +- + drivers/net/macvlan.c | 2 +- + drivers/pci/pci-driver.c | 2 +- + fs/buffer.c | 3 + + fs/compat.c | 2 + + fs/exec.c | 2 + + fs/ioctl.c | 3 + + fs/open.c | 3 + + fs/read_write.c | 23 +- + fs/select.c | 5 + + include/asm-alpha/thread_info.h | 2 +- + include/asm-avr32/thread_info.h | 2 +- + include/asm-generic/vmlinux.lds.h | 9 +- + include/asm-powerpc/cacheflush.h | 4 +- + include/asm-powerpc/immediate.h | 76 +++ + include/asm-x86/immediate.h | 169 ++++++ + include/asm-x86/ipi.h | 2 +- + include/asm-x86/irqflags.h | 56 ++ + include/asm-x86/kdebug.h | 12 + + include/asm-x86/kprobes.h | 9 - + include/asm-x86/numa_64.h | 19 +- + include/asm-x86/paravirt.h | 7 +- + include/asm-x86/pda.h | 5 +- + include/asm-x86/percpu.h | 46 ++ + include/asm-x86/smp.h | 15 +- + include/asm-x86/topology.h | 152 +++-- + include/linux/cpumask.h | 97 ++- + include/linux/cpuset.h | 2 + + include/linux/dcache.h | 1 + + include/linux/hardirq.h | 27 +- + include/linux/immediate.h | 97 +++ + include/linux/irq.h | 7 - + include/linux/kernel.h | 6 - + include/linux/kprobes.h | 2 - + include/linux/list.h | 367 ----------- + include/linux/marker.h | 57 ++- + include/linux/memory.h | 7 + + include/linux/mm.h | 1 + + include/linux/module.h | 25 + + include/linux/profile.h | 5 +- + include/linux/rcuclassic.h | 3 + + include/linux/rculist.h | 373 ++++++++++++ + include/linux/rcupdate.h | 26 +- + include/linux/rcupreempt.h | 42 ++- + include/linux/sched.h | 67 +-- + include/linux/stringify.h | 5 + + include/linux/swapops.h | 8 + + include/linux/writeback.h | 2 + + init/Kconfig | 18 + + init/main.c | 10 + + ipc/msg.c | 6 +- + ipc/sem.c | 6 +- + ipc/shm.c | 6 +- + kernel/Makefile | 3 +- + kernel/cpu.c | 2 +- + kernel/cpuset.c | 115 ++++- + kernel/exit.c | 8 + + kernel/fork.c | 5 + + kernel/immediate.c | 147 +++++ + kernel/irq/handle.c | 7 + + kernel/irq/manage.c | 65 ++ + kernel/itimer.c | 13 + + kernel/kprobes.c | 46 ++- + kernel/kthread.c | 55 ++- + kernel/lockdep.c | 20 + + kernel/marker.c | 38 +- + kernel/module.c | 83 +++- + kernel/pid.c | 1 + + kernel/printk.c | 130 +++-- + kernel/profile.c | 22 +- + kernel/rcuclassic.c | 32 +- + kernel/rcupdate.c | 71 ++- + kernel/rcupreempt.c | 428 ++++++++++++-- + kernel/sched.c | 176 +++--- + kernel/sched_clock.c | 8 + + kernel/sched_debug.c | 95 ++- + kernel/sched_fair.c | 700 ++++++++++++++++------ + kernel/sched_features.h | 7 +- + kernel/sched_rt.c | 6 +- + kernel/sched_trace.h | 41 ++ + kernel/signal.c | 3 + + kernel/softirq.c | 23 + + kernel/softlockup.c | 39 +- + kernel/stacktrace.c | 3 + + kernel/sysctl.c | 20 +- + kernel/taskstats.c | 4 +- + kernel/time/clocksource.c | 4 +- + kernel/time/tick-broadcast.c | 3 +- + kernel/timer.c | 13 +- + kernel/trace/trace.c | 46 ++- + kernel/trace/trace.h | 20 +- + kernel/trace/trace_sched_switch.c | 171 +++++- + kernel/trace/trace_sched_wakeup.c | 106 +++- + kernel/workqueue.c | 6 +- + lib/Kconfig.debug | 26 +- + lib/cpumask.c | 9 + + lib/textsearch.c | 1 + + localversion-sched-devel.git | 1 + + mm/allocpercpu.c | 4 +- + mm/filemap.c | 7 + + mm/hugetlb.c | 3 + + mm/memory.c | 75 ++- + mm/page-writeback.c | 10 +- + mm/page_alloc.c | 9 + + mm/page_io.c | 6 + + mm/swapfile.c | 23 + + mm/vmstat.c | 2 +- + net/802/psnap.c | 1 + + net/8021q/vlan.c | 1 + + net/bridge/br_fdb.c | 1 + + net/bridge/br_stp.c | 1 + + net/core/dev.c | 10 +- + net/ipv4/devinet.c | 6 + + net/iucv/iucv.c | 2 +- + net/netlabel/netlabel_domainhash.c | 3 +- + net/socket.c | 19 + + net/sunrpc/svc.c | 2 +- + tests/rcutorture.c | 34 +- + 185 files changed, 5421 insertions(+), 1470 deletions(-) + create mode 100644 Documentation/immediate.txt + create mode 100644 arch/powerpc/kernel/immediate.c + create mode 100644 arch/x86/kernel/immediate.c + create mode 100644 include/asm-powerpc/immediate.h + create mode 100644 include/asm-x86/immediate.h + create mode 100644 include/linux/immediate.h + create mode 100644 include/linux/rculist.h + create mode 100644 kernel/immediate.c + create mode 100644 kernel/sched_trace.h + create mode 100644 localversion-sched-devel.git +Merging quilt/ldp +$ git merge quilt/ldp +Auto-merged arch/arm/kernel/ecard.c +Auto-merged arch/x86/kernel/pci-dma.c +Auto-merged arch/x86/kernel/pci-gart_64.c +Auto-merged arch/x86/kernel/traps_32.c +Auto-merged arch/x86/kernel/traps_64.c +Auto-merged drivers/acpi/processor_core.c +Auto-merged drivers/acpi/scan.c +Auto-merged drivers/base/power/trace.c +Auto-merged drivers/edac/edac_core.h +CONFLICT (content): Merge conflict in drivers/edac/edac_core.h +Auto-merged drivers/edac/edac_device.c +CONFLICT (content): Merge conflict in drivers/edac/edac_device.c +Auto-merged drivers/edac/edac_mc.c +CONFLICT (content): Merge conflict in drivers/edac/edac_mc.c +Auto-merged drivers/edac/edac_pci.c +CONFLICT (content): Merge conflict in drivers/edac/edac_pci.c +Auto-merged drivers/hid/usbhid/hid-quirks.c +Auto-merged drivers/i2c/i2c-core.c +Auto-merged drivers/ide/ide-acpi.c +Auto-merged drivers/lguest/lguest_device.c +Auto-merged drivers/media/video/Kconfig +Auto-merged drivers/media/video/Makefile +Auto-merged drivers/misc/Makefile +Auto-merged drivers/net/arm/etherh.c +Auto-merged drivers/pci/probe.c +Auto-merged drivers/rtc/rtc-at91sam9.c +Auto-merged drivers/rtc/rtc-omap.c +Auto-merged drivers/usb/core/usb.c +Auto-merged drivers/usb/gadget/pxa2xx_udc.c +Auto-merged drivers/usb/host/Kconfig +Auto-merged drivers/video/Kconfig +Auto-merged drivers/virtio/virtio_pci.c +Auto-merged include/linux/i2c.h +Auto-merged include/linux/pci.h +Auto-merged include/linux/sysfs.h +Auto-merged include/linux/usb.h +Auto-merged init/main.c +Resolved 'drivers/edac/edac_core.h' using previous resolution. +Resolved 'drivers/edac/edac_device.c' using previous resolution. +Resolved 'drivers/edac/edac_mc.c' using previous resolution. +Resolved 'drivers/edac/edac_pci.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git reset --hard +HEAD is now at bcb1b8c Merge commit 'sched-latest/latest' +$ git rm localversion-sched-devel.git localversion-x86-latest.git |