$ git checkout master Already on "master" $ git reset --hard stable HEAD is now at 5393f78 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc Merging origin/master $ git merge origin/master Updating 5393f78..f3b8436 Fast forward CREDITS | 11 +- Documentation/DMA-API.txt | 9 +- Documentation/accounting/getdelays.c | 4 + Documentation/cgroups/cgroups.txt | 5 +- Documentation/{controllers => cgroups}/cpuacct.txt | 0 Documentation/{ => cgroups}/cpusets.txt | 0 Documentation/{controllers => cgroups}/devices.txt | 0 .../{controllers => cgroups}/memcg_test.txt | 2 +- Documentation/{controllers => cgroups}/memory.txt | 0 .../{controllers => cgroups}/resource_counter.txt | 0 Documentation/filesystems/proc.txt | 288 +----- Documentation/hwmon/adt7475 | 87 ++ Documentation/hwmon/lis3lv02d | 30 +- Documentation/laptops/thinkpad-acpi.txt | 25 +- Documentation/scheduler/sched-design-CFS.txt | 2 +- Documentation/sound/alsa/HD-Audio-Models.txt | 12 +- Documentation/sysctl/vm.txt | 619 +++++++--- Documentation/sysrq.txt | 19 +- MAINTAINERS | 15 + Makefile | 2 +- arch/alpha/include/asm/machvec.h | 4 + arch/alpha/include/asm/pgalloc.h | 7 +- arch/alpha/include/asm/rtc.h | 12 +- arch/alpha/kernel/.gitignore | 1 + arch/alpha/kernel/core_marvel.c | 10 +- arch/alpha/kernel/irq_srm.c | 2 + arch/alpha/kernel/machvec_impl.h | 5 +- arch/alpha/kernel/proto.h | 2 + arch/alpha/kernel/sys_jensen.c | 2 + arch/alpha/kernel/sys_marvel.c | 56 +- arch/alpha/kernel/sys_nautilus.c | 4 + arch/alpha/kernel/time.c | 10 + arch/alpha/mm/init.c | 7 - arch/ia64/Kconfig | 1 + arch/ia64/configs/generic_defconfig | 2 +- arch/ia64/include/asm/dma-mapping.h | 2 + arch/ia64/include/asm/machvec.h | 7 + arch/ia64/include/asm/machvec_init.h | 1 + arch/ia64/include/asm/machvec_sn2.h | 2 + arch/ia64/kernel/kprobes.c | 2 +- arch/ia64/kernel/unaligned.c | 6 +- arch/ia64/pci/pci.c | 27 + arch/ia64/sn/pci/pci_dma.c | 6 + arch/ia64/xen/time.c | 4 +- arch/powerpc/include/asm/ps3.h | 8 +- arch/powerpc/kernel/prom.c | 5 + arch/powerpc/mm/slice.c | 11 +- arch/powerpc/platforms/ps3/device-init.c | 26 +- arch/powerpc/platforms/ps3/htab.c | 2 +- arch/powerpc/platforms/ps3/interrupt.c | 28 +- arch/powerpc/platforms/ps3/mm.c | 97 +- arch/powerpc/platforms/ps3/os-area.c | 2 +- arch/powerpc/platforms/ps3/repository.c | 22 +- arch/powerpc/platforms/ps3/setup.c | 2 +- arch/powerpc/platforms/ps3/spu.c | 12 +- arch/powerpc/platforms/ps3/system-bus.c | 14 +- arch/sparc/kernel/sparc_ksyms_64.c | 11 - arch/x86/kernel/kprobes.c | 2 +- arch/x86/mm/pageattr.c | 10 +- arch/x86/mm/pat.c | 45 +- drivers/acpi/Makefile | 2 +- drivers/acpi/ec.c | 73 +- drivers/acpi/{main.c => sleep.c} | 0 drivers/acpi/thermal.c | 16 +- drivers/ata/Kconfig | 9 + drivers/ata/Makefile | 1 + drivers/ata/libata-core.c | 73 +- drivers/ata/libata-scsi.c | 17 +- drivers/ata/pata_ali.c | 28 +- drivers/ata/pata_atiixp.c | 32 +- drivers/ata/pata_octeon_cf.c | 965 ++++++++++++++++ drivers/ata/sata_fsl.c | 2 +- drivers/ata/sata_via.c | 2 + drivers/block/nbd.c | 4 + drivers/block/ps3disk.c | 18 +- drivers/char/hvc_console.c | 2 - drivers/char/ps3flash.c | 18 +- drivers/char/synclink_gt.c | 16 +- drivers/char/sysrq.c | 6 + drivers/char/tty_ioctl.c | 2 +- drivers/firmware/dell_rbu.c | 4 +- drivers/gpio/max7301.c | 6 +- drivers/gpio/max732x.c | 6 +- drivers/gpio/mcp23s08.c | 6 +- drivers/gpio/pca953x.c | 6 +- drivers/gpio/pcf857x.c | 12 +- drivers/gpu/drm/drm_crtc_helper.c | 175 ++- drivers/gpu/drm/drm_irq.c | 18 +- drivers/gpu/drm/i915/i915_dma.c | 10 + drivers/gpu/drm/i915/i915_drv.h | 23 + drivers/gpu/drm/i915/i915_gem.c | 189 +++- drivers/gpu/drm/i915/i915_irq.c | 6 + drivers/gpu/drm/i915/intel_display.c | 43 +- drivers/gpu/drm/i915/intel_lvds.c | 7 + drivers/hwmon/Kconfig | 24 +- drivers/hwmon/Makefile | 2 + drivers/hwmon/abituguru3.c | 24 +- drivers/hwmon/adt7475.c | 1221 ++++++++++++++++++++ drivers/hwmon/applesmc.c | 5 + drivers/hwmon/hp_accel.c | 75 ++- drivers/hwmon/k8temp.c | 55 +- drivers/infiniband/hw/ehca/ehca_cq.c | 16 +- drivers/infiniband/hw/ehca/ehca_hca.c | 2 +- drivers/infiniband/hw/ehca/ehca_irq.c | 18 +- drivers/infiniband/hw/ehca/ehca_main.c | 6 +- drivers/infiniband/hw/ehca/ehca_mcast.c | 4 +- drivers/infiniband/hw/ehca/ehca_mrmw.c | 144 ++-- drivers/infiniband/hw/ehca/ehca_qp.c | 32 +- drivers/infiniband/hw/ehca/ehca_reqs.c | 2 +- drivers/infiniband/hw/ehca/ehca_sqp.c | 2 +- drivers/infiniband/hw/ehca/ehca_tools.h | 2 +- drivers/infiniband/hw/ehca/ehca_uverbs.c | 2 +- drivers/infiniband/hw/ehca/hcp_if.c | 56 +- drivers/infiniband/hw/mlx4/qp.c | 28 +- drivers/infiniband/ulp/ipoib/ipoib_main.c | 27 +- drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 2 +- drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 11 +- drivers/isdn/i4l/isdn_net.c | 9 +- drivers/leds/Kconfig | 7 - drivers/leds/Makefile | 1 - drivers/leds/leds-hp-disk.c | 137 --- drivers/message/fusion/lsi/mpi.h | 7 +- drivers/message/fusion/lsi/mpi_cnfg.h | 47 +- drivers/message/fusion/lsi/mpi_fc.h | 2 +- drivers/message/fusion/lsi/mpi_history.txt | 86 +- drivers/message/fusion/lsi/mpi_init.h | 2 +- drivers/message/fusion/lsi/mpi_ioc.h | 22 +- drivers/message/fusion/lsi/mpi_lan.h | 2 +- drivers/message/fusion/lsi/mpi_log_fc.h | 2 +- drivers/message/fusion/lsi/mpi_log_sas.h | 37 +- drivers/message/fusion/lsi/mpi_raid.h | 11 +- drivers/message/fusion/lsi/mpi_sas.h | 18 +- drivers/message/fusion/lsi/mpi_targ.h | 2 +- drivers/message/fusion/lsi/mpi_tool.h | 2 +- drivers/message/fusion/lsi/mpi_type.h | 4 +- drivers/message/fusion/mptbase.c | 87 ++- drivers/message/fusion/mptbase.h | 3 + drivers/message/fusion/mptscsih.c | 3 + drivers/misc/Makefile | 1 - drivers/misc/sgi-xp/xpc_sn2.c | 2 +- drivers/net/arm/etherh.c | 2 +- drivers/net/ax88796.c | 27 +- drivers/net/b44.c | 4 +- drivers/net/b44.h | 2 +- drivers/net/bnx2x.h | 19 +- drivers/net/bnx2x_main.c | 178 ++- drivers/net/fs_enet/fs_enet-main.c | 1 + drivers/net/gianfar.c | 8 + drivers/net/ibm_newemac/mal.c | 4 +- drivers/net/ibm_newemac/mal.h | 2 + drivers/net/irda/irda-usb.c | 2 +- drivers/net/korina.c | 158 ++-- drivers/net/mlx4/profile.c | 6 +- drivers/net/netxen/netxen_nic.h | 146 +-- drivers/net/netxen/netxen_nic_ctx.c | 50 +- drivers/net/netxen/netxen_nic_ethtool.c | 31 +- drivers/net/netxen/netxen_nic_hw.c | 97 +- drivers/net/netxen/netxen_nic_init.c | 105 +- drivers/net/netxen/netxen_nic_main.c | 210 ++-- drivers/net/phy/phy_device.c | 9 - drivers/net/ppp_generic.c | 43 +- drivers/net/sis900.c | 8 +- drivers/net/usb/hso.c | 12 +- drivers/net/wan/ixp4xx_hss.c | 6 +- drivers/net/wireless/Kconfig | 2 +- drivers/net/wireless/ath5k/base.c | 8 +- drivers/net/wireless/ath5k/pcu.c | 4 +- drivers/net/wireless/ath5k/reg.h | 2 +- drivers/net/wireless/ath9k/Kconfig | 1 + drivers/net/wireless/ath9k/main.c | 4 +- drivers/net/wireless/ath9k/xmit.c | 48 +- drivers/net/wireless/b43/main.c | 2 +- drivers/net/wireless/b43legacy/main.c | 2 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 2 +- drivers/net/wireless/iwlwifi/iwl-commands.h | 2 +- drivers/net/wireless/iwlwifi/iwl-hcmd.c | 1 + drivers/net/wireless/libertas_tf/main.c | 2 +- drivers/net/wireless/orinoco/orinoco.c | 28 +- drivers/net/wireless/orinoco/orinoco_cs.c | 1 + drivers/net/wireless/p54/p54common.c | 34 +- drivers/net/wireless/p54/p54usb.c | 2 + drivers/net/wireless/rt2x00/rt2500usb.c | 23 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 8 +- drivers/net/wireless/rt2x00/rt2x00leds.c | 2 +- drivers/net/wireless/rt2x00/rt2x00lib.h | 11 - drivers/net/wireless/rt2x00/rt2x00queue.c | 2 +- drivers/net/wireless/rt2x00/rt2x00usb.c | 6 +- drivers/net/wireless/rt2x00/rt73usb.c | 1 + drivers/net/wireless/rtl818x/rtl8180_dev.c | 1 + drivers/net/wireless/rtl818x/rtl8187_dev.c | 5 +- drivers/pci/hotplug/acpiphp_glue.c | 2 + drivers/pci/pci.c | 8 +- drivers/platform/x86/Kconfig | 23 + drivers/platform/x86/Makefile | 1 + drivers/{misc => platform/x86}/dell-laptop.c | 2 +- drivers/platform/x86/eeepc-laptop.c | 4 +- drivers/platform/x86/thinkpad_acpi.c | 910 ++++++++++++--- drivers/ps3/ps3-lpm.c | 16 +- drivers/ps3/ps3-vuart.c | 32 +- drivers/ps3/ps3stor_lib.c | 14 +- drivers/regulator/wm8400-regulator.c | 2 +- drivers/rtc/rtc-pxa.c | 2 + drivers/rtc/rtc-twl4030.c | 49 +- drivers/scsi/ibmvscsi/ibmvfc.c | 14 +- drivers/scsi/ibmvscsi/ibmvfc.h | 6 +- drivers/scsi/ipr.c | 2 +- drivers/scsi/libiscsi_tcp.c | 3 +- drivers/scsi/libsas/sas_scsi_host.c | 2 +- drivers/scsi/ps3rom.c | 6 +- drivers/scsi/qla2xxx/qla_init.c | 58 +- drivers/scsi/qla2xxx/qla_mid.c | 1 + drivers/scsi/qla2xxx/qla_os.c | 7 +- drivers/scsi/scsi.c | 5 +- drivers/scsi/scsi_devinfo.c | 1 + drivers/serial/8250_pci.c | 8 + drivers/serial/8250_pnp.c | 2 + drivers/serial/atmel_serial.c | 2 +- drivers/serial/of_serial.c | 1 + drivers/serial/pnx8xxx_uart.c | 23 +- drivers/spi/atmel_spi.c | 3 +- drivers/usb/core/hub.c | 2 +- drivers/usb/serial/ftdi_sio.c | 2 +- drivers/video/bf54x-lq043fb.c | 15 +- drivers/video/bfin-t350mcqb-fb.c | 15 +- drivers/video/ps3fb.c | 4 +- fs/btrfs/ioctl.h | 14 +- fs/btrfs/super.c | 5 +- fs/btrfs/volumes.c | 1 + fs/ext2/dir.c | 7 +- fs/squashfs/squashfs_fs.h | 1 - fs/squashfs/super.c | 1 + include/acpi/actbl.h | 2 +- include/asm-generic/rtc.h | 14 +- include/drm/drm_crtc.h | 2 +- include/drm/drm_crtc_helper.h | 2 +- include/linux/agpgart.h | 1 - include/linux/atm_idt77105.h | 2 +- include/linux/capi.h | 2 +- include/linux/connector.h | 2 +- include/linux/cyclades.h | 2 - include/linux/fb.h | 2 +- include/linux/if_pppol2tp.h | 2 +- include/linux/if_pppox.h | 2 +- include/linux/input.h | 2 +- include/linux/ioport.h | 3 +- include/linux/jbd.h | 2 + include/linux/joystick.h | 2 +- include/linux/kvm.h | 2 +- include/linux/libata.h | 11 +- include/linux/loop.h | 2 +- include/linux/magic.h | 2 + include/linux/matroxfb.h | 2 +- include/linux/netdevice.h | 5 +- include/linux/netfilter/x_tables.h | 2 +- include/linux/phantom.h | 2 +- include/linux/radeonfb.h | 2 +- include/linux/res_counter.h | 2 +- include/scsi/libiscsi_tcp.h | 1 + init/Kconfig | 65 +- kernel/cpuset.c | 2 +- kernel/kprobes.c | 2 +- kernel/power/Makefile | 3 +- kernel/resource.c | 1 + kernel/sched.c | 13 +- kernel/sched_fair.c | 37 +- kernel/sysctl.c | 9 + lib/idr.c | 14 +- mm/memcontrol.c | 130 ++- mm/vmalloc.c | 20 +- net/9p/Kconfig | 2 +- net/bridge/br_netfilter.c | 18 +- net/bridge/netfilter/ebtables.c | 2 +- net/can/bcm.c | 57 +- net/core/dev.c | 48 +- net/core/skbuff.c | 6 + net/ipv4/netfilter/iptable_filter.c | 7 +- net/ipv4/netfilter/iptable_mangle.c | 6 +- net/ipv4/netfilter/iptable_raw.c | 6 +- net/ipv4/netfilter/iptable_security.c | 6 +- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 5 +- net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 2 +- net/ipv4/tcp.c | 24 +- net/ipv6/ip6_fib.c | 15 +- net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 2 +- net/mac80211/ht.c | 2 +- net/mac80211/iface.c | 3 +- net/mac80211/mesh_plink.c | 1 + net/mac80211/rc80211_minstrel.c | 10 +- net/netfilter/nf_conntrack_core.c | 4 +- net/netfilter/nf_conntrack_netlink.c | 2 +- net/netfilter/x_tables.c | 8 + net/netfilter/xt_time.c | 11 + net/sched/sch_htb.c | 15 +- net/xfrm/xfrm_user.c | 11 +- scripts/checkpatch.pl | 28 +- security/keys/keyctl.c | 1 + sound/pci/hda/hda_codec.c | 63 +- sound/pci/hda/hda_local.h | 3 + sound/pci/hda/patch_nvhdmi.c | 2 + sound/pci/hda/patch_realtek.c | 1 + sound/pci/hda/patch_sigmatel.c | 159 ++- sound/pci/oxygen/virtuoso.c | 17 +- sound/ppc/snd_ps3.c | 4 +- sound/soc/soc-dapm.c | 3 +- sound/usb/usbquirks.h | 8 + 305 files changed, 6730 insertions(+), 2475 deletions(-) rename Documentation/{controllers => cgroups}/cpuacct.txt (100%) rename Documentation/{ => cgroups}/cpusets.txt (100%) rename Documentation/{controllers => cgroups}/devices.txt (100%) rename Documentation/{controllers => cgroups}/memcg_test.txt (99%) rename Documentation/{controllers => cgroups}/memory.txt (100%) rename Documentation/{controllers => cgroups}/resource_counter.txt (100%) create mode 100644 Documentation/hwmon/adt7475 create mode 100644 arch/alpha/kernel/.gitignore rename drivers/acpi/{main.c => sleep.c} (100%) create mode 100644 drivers/ata/pata_octeon_cf.c create mode 100644 drivers/hwmon/adt7475.c delete mode 100644 drivers/leds/leds-hp-disk.c rename drivers/{misc => platform/x86}/dell-laptop.c (99%) Merging mfd/for-next $ git merge mfd/for-next Merge made by recursive. drivers/mfd/pcf50633-core.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) Merging arm-current/master $ git merge arm-current/master Removed arch/arm/plat-omap/include/mach/aic23.h Merge made by recursive. arch/arm/mach-omap1/board-h2.c | 45 +----------- arch/arm/mach-omap1/board-h3.c | 50 ------------ arch/arm/mach-omap1/board-innovator.c | 39 --------- arch/arm/mach-omap1/board-nokia770.c | 8 ++- arch/arm/mach-omap1/board-osk.c | 43 +---------- arch/arm/mach-omap1/board-palmte.c | 29 ------- arch/arm/mach-omap1/board-palmtt.c | 41 ---------- arch/arm/mach-omap1/board-palmz71.c | 37 --------- arch/arm/mach-omap1/board-sx1.c | 39 +-------- arch/arm/mach-omap1/board-voiceblue.c | 1 - arch/arm/mach-omap1/mcbsp.c | 1 + arch/arm/mach-omap2/board-apollon.c | 64 ++-------------- arch/arm/mach-omap2/board-ldp.c | 2 +- arch/arm/mach-omap2/board-omap3beagle.c | 9 +- arch/arm/mach-omap2/mcbsp.c | 1 + arch/arm/mm/copypage-v4mc.c | 2 +- arch/arm/plat-omap/dma.c | 13 +-- arch/arm/plat-omap/gpio.c | 3 + arch/arm/plat-omap/include/mach/aic23.h | 116 ---------------------------- arch/arm/plat-omap/include/mach/board-h3.h | 4 +- arch/arm/plat-omap/include/mach/gpio.h | 10 --- arch/arm/plat-omap/include/mach/mcbsp.h | 11 +++ arch/arm/plat-omap/mcbsp.c | 4 + drivers/char/hw_random/omap-rng.c | 2 +- drivers/i2c/busses/i2c-omap.c | 2 +- drivers/mtd/onenand/omap2.c | 6 +- drivers/video/omap/lcdc.c | 4 +- 27 files changed, 63 insertions(+), 523 deletions(-) delete mode 100644 arch/arm/plat-omap/include/mach/aic23.h Merging m68k-current/for-linus $ git merge m68k-current/for-linus Already up-to-date. Merging powerpc-merge/merge $ git merge powerpc-merge/merge Already up-to-date. Merging sparc-current/master $ git merge sparc-current/master 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. drivers/net/wireless/ath9k/rc.c | 2 +- drivers/net/wireless/ath9k/regd_common.h | 2 +- drivers/net/wireless/iwlwifi/iwl-hcmd.c | 2 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +- drivers/net/wireless/libertas/hostcmd.h | 91 ++++++++++---------- drivers/net/wireless/p54/p54common.c | 6 +- drivers/net/wireless/rt2x00/rt2x00rfkill.c | 2 +- include/net/mac80211.h | 1 - net/mac80211/sta_info.h | 1 - net/wireless/reg.c | 128 ++++++++++++++++++++++++--- 10 files changed, 170 insertions(+), 67 deletions(-) Merging sound-current/for-linus $ git merge sound-current/for-linus Merge made by recursive. Documentation/kernel-parameters.txt | 7 ------- sound/pci/hda/patch_realtek.c | 2 ++ sound/pci/hda/patch_sigmatel.c | 17 +++++++++-------- sound/soc/atmel/atmel-pcm.c | 2 -- 4 files changed, 11 insertions(+), 17 deletions(-) Merging pci-current/for-linus $ git merge pci-current/for-linus Merge made by recursive. drivers/pci/msi.c | 16 ++++----- drivers/pci/pci-driver.c | 91 ++++++++++++++-------------------------------- drivers/pci/pci.c | 63 +++++++++++++++++++++++++++++--- drivers/pci/pci.h | 6 +++ include/linux/pci.h | 5 +++ 5 files changed, 102 insertions(+), 79 deletions(-) Merging wireless-current/master $ git merge wireless-current/master Already up-to-date. Merging kbuild-current/master $ git merge kbuild-current/master Auto-merged Makefile Removed arch/x86/scripts/strip-symbols Auto-merged init/Kconfig Removed scripts/strip-symbols Merge made by recursive. Documentation/kbuild/kbuild.txt | 29 +++--- Makefile | 59 ++++-------- arch/x86/scripts/strip-symbols | 1 - init/Kconfig | 7 -- kernel/kallsyms.c | 16 ++- scripts/Makefile.build | 55 ++++------- scripts/Makefile.modinst | 3 +- scripts/config | 4 + scripts/genksyms/genksyms.c | 21 +--- scripts/genksyms/keywords.c_shipped | 189 +++++++++++++++++------------------ scripts/genksyms/keywords.gperf | 2 - scripts/kallsyms.c | 21 +++-- scripts/mksysmap | 7 +- scripts/strip-symbols | 22 ---- 14 files changed, 185 insertions(+), 251 deletions(-) delete mode 100644 arch/x86/scripts/strip-symbols delete mode 100644 scripts/strip-symbols Merging quilt/driver-core.current $ git merge quilt/driver-core.current Merge made by recursive. drivers/base/core.c | 6 ++++++ scripts/mod/file2alias.c | 17 +++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) Merging quilt/usb.current $ git merge quilt/usb.current Merge made by recursive. drivers/usb/serial/cp2101.c | 1 + 1 files changed, 1 insertions(+), 0 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 Auto-merged drivers/input/keyboard/atkbd.c Auto-merged drivers/input/keyboard/omap-keypad.c Merge made by recursive. drivers/input/keyboard/atkbd.c | 4 ++-- drivers/input/keyboard/corgikbd.c | 8 ++++---- drivers/input/keyboard/omap-keypad.c | 8 ++++---- drivers/input/keyboard/spitzkbd.c | 8 ++++---- drivers/input/mouse/Kconfig | 2 +- drivers/input/touchscreen/corgi_ts.c | 9 +++++---- drivers/input/touchscreen/usbtouchscreen.c | 19 +++++++++++++++++-- drivers/media/video/uvc/uvc_status.c | 10 ++++++---- 8 files changed, 43 insertions(+), 25 deletions(-) Merging md-current/for-linus $ git merge md-current/for-linus Already up-to-date. Merging dwmw2/master $ git merge dwmw2/master Already up-to-date. Merging arm/devel $ git merge arm/devel Already up-to-date. Merging avr32/avr32-arch $ git merge avr32/avr32-arch Merge made by recursive. arch/avr32/include/asm/uaccess.h | 8 ++-- arch/avr32/kernel/entry-avr32b.S | 60 ++++++++++++++++++------------------ arch/avr32/kernel/syscall-stubs.S | 14 ++++---- arch/avr32/lib/strnlen_user.S | 2 +- 4 files changed, 42 insertions(+), 42 deletions(-) Merging blackfin/for-linus $ git merge blackfin/for-linus Already up-to-date. Merging cris/for-next $ git merge cris/for-next Already up-to-date. Merging ia64/test $ git merge ia64/test Already up-to-date. Merging m68k/for-next $ git merge m68k/for-next Already up-to-date. Merging m68knommu/for-next $ git merge m68knommu/for-next Already up-to-date. Merging mips/mips-for-linux-next $ git merge mips/mips-for-linux-next Already up-to-date. Merging parisc/master $ git merge parisc/master Already up-to-date. Merging powerpc/next $ git merge powerpc/next Already up-to-date. Merging 4xx/next $ git merge 4xx/next Already up-to-date. Merging galak/next $ git merge galak/next Already up-to-date. Merging pxa/for-next $ git merge pxa/for-next Merge made by recursive. Merging s390/features $ git merge s390/features Already up-to-date. Merging sh/master $ git merge sh/master Merge made by recursive. arch/sh/Kconfig | 63 +----- arch/sh/boards/Kconfig | 6 +- arch/sh/boards/board-ap325rxa.c | 53 ++++- arch/sh/boards/board-magicpanelr2.c | 23 ++- arch/sh/boards/board-sh7785lcr.c | 1 + arch/sh/boards/mach-highlander/Kconfig | 2 +- arch/sh/boards/mach-highlander/setup.c | 1 + arch/sh/boards/mach-hp6xx/setup.c | 2 +- arch/sh/boards/mach-migor/setup.c | 171 ++++++-------- arch/sh/boards/mach-rsk/Kconfig | 2 +- arch/sh/boards/mach-rsk/devices-rsk7203.c | 24 +- arch/sh/boards/mach-x3proto/setup.c | 1 + arch/sh/configs/ap325rxa_defconfig | 355 ++++++++++++++++++++++++++--- arch/sh/configs/dreamcast_defconfig | 60 ++++-- arch/sh/configs/edosk7705_defconfig | 18 +- arch/sh/configs/edosk7760_defconfig | 83 +++++-- arch/sh/configs/hp6xx_defconfig | 88 ++++---- arch/sh/configs/landisk_defconfig | 76 +++++-- arch/sh/configs/lboxre2_defconfig | 63 ++++-- arch/sh/configs/magicpanelr2_defconfig | 119 +++++++--- arch/sh/configs/microdev_defconfig | 63 ++++-- arch/sh/configs/migor_defconfig | 95 ++++++-- arch/sh/configs/r7780mp_defconfig | 85 ++++++-- arch/sh/configs/r7785rp_defconfig | 130 ++++++++--- arch/sh/configs/rsk7201_defconfig | 26 ++- arch/sh/configs/rsk7203_defconfig | 88 ++++++-- arch/sh/configs/rts7751r2d1_defconfig | 87 +++++-- arch/sh/configs/rts7751r2dplus_defconfig | 87 +++++-- arch/sh/configs/sdk7780_defconfig | 101 ++++++--- arch/sh/configs/se7206_defconfig | 75 +++++-- arch/sh/configs/se7343_defconfig | 61 +++-- arch/sh/configs/se7619_defconfig | 47 +++-- arch/sh/configs/se7705_defconfig | 60 +++-- arch/sh/configs/se7712_defconfig | 79 +++++-- arch/sh/configs/se7721_defconfig | 85 +++++--- arch/sh/configs/se7722_defconfig | 61 +++-- arch/sh/configs/se7750_defconfig | 61 +++-- arch/sh/configs/se7751_defconfig | 56 +++-- arch/sh/configs/se7780_defconfig | 87 +++++--- arch/sh/configs/sh03_defconfig | 82 +++++-- arch/sh/configs/sh7710voipgw_defconfig | 55 +++-- arch/sh/configs/sh7763rdp_defconfig | 71 ++++-- arch/sh/configs/sh7785lcr_defconfig | 92 +++++--- arch/sh/configs/shmin_defconfig | 54 +++-- arch/sh/configs/shx3_defconfig | 77 +++++-- arch/sh/configs/snapgear_defconfig | 53 +++-- arch/sh/configs/systemh_defconfig | 50 +++-- arch/sh/configs/titan_defconfig | 90 +++++-- arch/sh/configs/ul2_defconfig | 69 ++++-- arch/sh/include/asm/gpio.h | 70 ++++--- arch/sh/include/asm/posix_types_32.h | 8 +- arch/sh/include/asm/posix_types_64.h | 8 +- arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 31 +++ arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 2 +- arch/sh/kernel/gpio.c | 338 +++++++++++++++++----------- arch/sh/kernel/process_64.c | 2 - arch/sh/mm/ioremap_64.c | 2 +- drivers/serial/sh-sci.h | 6 +- 58 files changed, 2578 insertions(+), 1227 deletions(-) Merging sparc/master $ git merge sparc/master Already up-to-date. Merging x86/auto-x86-next $ git merge x86/auto-x86-next Merge made by recursive. Documentation/x86/boot.txt | 13 ++- arch/x86/Kconfig.cpu | 4 +- arch/x86/include/asm/bitops.h | 14 ++- arch/x86/include/asm/cpu.h | 21 ++++ arch/x86/include/asm/cpumask.h | 28 ++++++ arch/x86/include/asm/hardirq_32.h | 3 + arch/x86/include/asm/io.h | 1 - arch/x86/include/asm/io_apic.h | 26 +----- arch/x86/include/asm/mpspec_def.h | 23 +++-- arch/x86/include/asm/smp.h | 41 +-------- arch/x86/include/asm/system.h | 6 +- arch/x86/include/asm/tlbflush.h | 2 + arch/x86/kernel/acpi/boot.c | 96 +++++++++---------- arch/x86/kernel/apic.c | 4 + arch/x86/kernel/cpu/common.c | 2 + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 2 - arch/x86/kernel/crash.c | 2 +- arch/x86/kernel/entry_64.S | 2 + arch/x86/kernel/io_apic.c | 119 ++++++++++++------------ arch/x86/kernel/microcode_intel.c | 10 +- arch/x86/kernel/module_32.c | 6 +- arch/x86/kernel/module_64.c | 32 +++--- arch/x86/kernel/mpparse.c | 142 ++++++++++++++-------------- arch/x86/kernel/msr.c | 2 +- arch/x86/kernel/reboot.c | 1 + arch/x86/kernel/setup.c | 2 +- arch/x86/kernel/setup_percpu.c | 1 + arch/x86/kernel/smpboot.c | 1 - arch/x86/kernel/tlb_64.c | 16 ++-- arch/x86/kernel/tlb_uv.c | 1 + arch/x86/mach-voyager/setup.c | 1 + arch/x86/mm/init_32.c | 49 +++++++++- arch/x86/mm/ioremap.c | 25 ----- arch/x86/mm/pat.c | 37 +++++-- drivers/pci/intr_remapping.c | 1 + include/asm-generic/bitops/__ffs.h | 2 +- include/asm-generic/bitops/__fls.h | 2 +- include/asm-generic/bitops/fls.h | 2 +- include/asm-generic/bitops/fls64.h | 4 +- 39 files changed, 393 insertions(+), 353 deletions(-) create mode 100644 arch/x86/include/asm/cpumask.h Merging xtensa/master $ git merge xtensa/master Already up-to-date. Merging quilt/driver-core $ git merge quilt/driver-core Merge made by recursive. include/linux/init.h | 1 + init/main.c | 9 +++++++++ lib/kobject.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 0 deletions(-) Merging quilt/usb $ git merge quilt/usb Already up-to-date. Merging tip-core/auto-core-next $ git merge tip-core/auto-core-next Auto-merged arch/x86/include/asm/system.h Auto-merged arch/x86/kernel/apic.c Auto-merged arch/x86/kernel/entry_64.S Auto-merged arch/x86/kernel/tlb_64.c Auto-merged arch/x86/kernel/tlb_uv.c Auto-merged init/Kconfig Merge made by recursive. Documentation/cputopology.txt | 6 +- arch/alpha/kernel/irq.c | 2 +- arch/arm/kernel/irq.c | 18 ++- arch/arm/kernel/vmlinux.lds.S | 1 + arch/arm/oprofile/op_model_mpcore.c | 2 +- arch/blackfin/kernel/irqchip.c | 5 + arch/ia64/kernel/iosapic.c | 2 +- arch/ia64/kernel/irq.c | 4 +- arch/ia64/kernel/irq_ia64.c | 12 ++- arch/ia64/kernel/msi_ia64.c | 4 +- arch/ia64/kernel/vmlinux.lds.S | 1 + arch/ia64/sn/kernel/msi_sn.c | 2 +- arch/mips/include/asm/irq.h | 2 +- arch/mips/kernel/irq-gic.c | 2 +- arch/mips/kernel/smtc.c | 6 +- arch/mips/mti-malta/malta-smtc.c | 5 +- arch/mips/sgi-ip22/ip22-int.c | 2 +- arch/mips/sgi-ip22/ip22-time.c | 2 +- arch/mips/sibyte/bcm1480/smp.c | 3 +- arch/mips/sibyte/sb1250/smp.c | 3 +- arch/mn10300/kernel/mn10300-watchdog.c | 3 +- arch/parisc/kernel/irq.c | 8 +- arch/powerpc/kernel/irq.c | 2 +- arch/powerpc/kernel/vmlinux.lds.S | 1 + arch/powerpc/platforms/pseries/xics.c | 5 +- arch/powerpc/sysdev/mpic.c | 3 +- arch/sparc/kernel/irq_64.c | 5 +- arch/sparc/kernel/time_64.c | 2 +- arch/x86/ia32/ia32entry.S | 8 +- arch/x86/include/asm/apicnum.h | 12 ++ arch/x86/include/asm/current.h | 24 +--- arch/x86/include/asm/e820.h | 11 ++- arch/x86/include/asm/hardirq_64.h | 24 +++- arch/x86/include/asm/irq_regs_32.h | 4 +- arch/x86/include/asm/irq_vectors.h | 13 ++- arch/x86/include/asm/mce.h | 5 +- arch/x86/include/asm/mmu_context_32.h | 12 +- arch/x86/include/asm/mmu_context_64.h | 16 +-- arch/x86/include/asm/mtrr.h | 1 + arch/x86/include/asm/page_64.h | 4 +- arch/x86/include/asm/paravirt.h | 8 +- arch/x86/include/asm/pda.h | 124 +++---------------- arch/x86/include/asm/percpu.h | 159 ++++++++++-------------- arch/x86/include/asm/prctl.h | 4 - arch/x86/include/asm/processor.h | 3 + arch/x86/include/asm/ptrace-abi.h | 5 +- arch/x86/include/asm/setup.h | 9 +- arch/x86/include/asm/sigcontext.h | 2 +- arch/x86/include/asm/sigcontext32.h | 2 + arch/x86/include/asm/smp.h | 8 +- arch/x86/include/asm/system.h | 4 +- arch/x86/include/asm/thread_info.h | 20 ++-- arch/x86/include/asm/tlbflush.h | 15 +-- arch/x86/include/asm/topology.h | 8 +- arch/x86/include/asm/trampoline.h | 1 + arch/x86/include/asm/uv/uv_bau.h | 3 +- arch/x86/kernel/acpi/sleep.c | 1 + arch/x86/kernel/apic.c | 20 ++-- arch/x86/kernel/asm-offsets_64.c | 8 +- arch/x86/kernel/cpu/common.c | 78 ++++-------- arch/x86/kernel/cpu/intel_cacheinfo.c | 63 +++++++--- arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 21 ++- arch/x86/kernel/dumpstack_64.c | 35 +++--- arch/x86/kernel/entry_64.S | 41 +++--- arch/x86/kernel/head64.c | 23 +---- arch/x86/kernel/head_64.S | 47 ++++++- arch/x86/kernel/io_apic.c | 44 +++++-- arch/x86/kernel/irq.c | 6 +- arch/x86/kernel/irq_32.c | 2 +- arch/x86/kernel/irq_64.c | 5 +- arch/x86/kernel/nmi.c | 10 +-- arch/x86/kernel/process_32.c | 5 +- arch/x86/kernel/process_64.c | 22 ++-- arch/x86/kernel/setup_percpu.c | 207 +++++++++++++++++------------- arch/x86/kernel/smpboot.c | 68 +--------- arch/x86/kernel/smpcommon.c | 10 +- arch/x86/kernel/tlb_32.c | 85 +++++-------- arch/x86/kernel/tlb_64.c | 76 +++++++----- arch/x86/kernel/tlb_uv.c | 16 ++-- arch/x86/kernel/vmlinux_32.lds.S | 9 +-- arch/x86/kernel/vmlinux_64.lds.S | 22 +++- arch/x86/kernel/x8664_ksyms_64.c | 2 - arch/x86/mach-voyager/voyager_smp.c | 6 +- arch/x86/xen/enlighten.c | 47 +++---- arch/x86/xen/irq.c | 8 +- arch/x86/xen/mmu.c | 8 +- arch/x86/xen/multicalls.h | 2 +- arch/x86/xen/smp.c | 33 +---- arch/x86/xen/xen-asm_64.S | 31 +++--- drivers/base/cpu.c | 2 +- drivers/base/topology.c | 33 +++--- drivers/firmware/dcdbas.c | 12 ++- drivers/misc/sgi-xp/xpc_main.c | 2 +- drivers/net/sfc/efx.c | 17 ++- drivers/oprofile/buffer_sync.c | 22 +++- drivers/oprofile/buffer_sync.h | 4 + drivers/oprofile/cpu_buffer.c | 5 + drivers/oprofile/cpu_buffer.h | 7 + drivers/oprofile/oprof.c | 9 ++- drivers/xen/events.c | 26 +++- drivers/xen/manage.c | 2 +- fs/btrfs/locking.c | 10 -- include/asm-generic/percpu.h | 52 ++++++++ include/asm-generic/sections.h | 2 +- include/asm-generic/vmlinux.lds.h | 75 ++++++++++- include/linux/aio_abi.h | 1 + include/linux/atalk.h | 1 + include/linux/atmbr2684.h | 1 + include/linux/atmdev.h | 2 + include/linux/auto_fs4.h | 1 + include/linux/bfs_fs.h | 2 + include/linux/blktrace_api.h | 2 + include/linux/can/bcm.h | 2 + include/linux/capability.h | 8 +- include/linux/cdrom.h | 1 + include/linux/cgroupstats.h | 1 + include/linux/cm4000_cs.h | 2 +- include/linux/coda_psdev.h | 2 + include/linux/dlm_plock.h | 2 + include/linux/dn.h | 2 + include/linux/dvb/dmx.h | 2 +- include/linux/dvb/frontend.h | 3 +- include/linux/dvb/net.h | 3 +- include/linux/dvb/video.h | 7 +- include/linux/edd.h | 2 + include/linux/efs_fs_sb.h | 1 + include/linux/elf-fdpic.h | 2 + include/linux/elfcore.h | 2 + include/linux/errqueue.h | 2 + include/linux/fb.h | 4 +- include/linux/genetlink.h | 1 + include/linux/gfs2_ondisk.h | 2 + include/linux/hiddev.h | 2 + include/linux/icmpv6.h | 1 + include/linux/if_addr.h | 1 + include/linux/if_addrlabel.h | 2 + include/linux/if_fc.h | 1 + include/linux/if_hippi.h | 1 + include/linux/if_link.h | 1 + include/linux/if_ppp.h | 1 + include/linux/if_strip.h | 2 + include/linux/if_tr.h | 1 + include/linux/igmp.h | 1 + include/linux/in6.h | 2 +- include/linux/inet_diag.h | 2 + include/linux/interrupt.h | 1 + include/linux/ip6_tunnel.h | 2 + include/linux/ipv6.h | 1 + include/linux/ipv6_route.h | 2 + include/linux/ipx.h | 1 + include/linux/irda.h | 2 + include/linux/irq.h | 86 ++++++++++++- include/linux/irqnr.h | 1 + include/linux/kernel.h | 3 +- include/linux/minix_fs.h | 1 + include/linux/msdos_fs.h | 1 + include/linux/mutex.h | 5 +- include/linux/neighbour.h | 1 + include/linux/netfilter/xt_conntrack.h | 1 + include/linux/nfs_idmap.h | 2 + include/linux/nfsd/export.h | 3 +- include/linux/nfsd/nfsfh.h | 3 +- include/linux/nfsd/stats.h | 2 + include/linux/nfsd/syscall.h | 3 +- include/linux/nubus.h | 5 +- include/linux/phonet.h | 2 + include/linux/pkt_cls.h | 5 +- include/linux/pkt_sched.h | 2 + include/linux/pktcdvd.h | 2 + include/linux/ppp_defs.h | 2 + include/linux/raid/md_p.h | 2 + include/linux/random.h | 1 + include/linux/raw.h | 2 + include/linux/rtnetlink.h | 1 + include/linux/sched.h | 19 +++- include/linux/signalfd.h | 1 + include/linux/socket.h | 13 +- include/linux/sound.h | 2 + include/linux/spi/spidev.h | 1 + include/linux/synclink.h | 2 + include/linux/taskstats.h | 2 + include/linux/tc_act/tc_gact.h | 1 + include/linux/tc_act/tc_mirred.h | 1 + include/linux/tc_act/tc_pedit.h | 1 + include/linux/tc_ematch/tc_em_cmp.h | 1 + include/linux/tc_ematch/tc_em_meta.h | 1 + include/linux/tc_ematch/tc_em_nbyte.h | 1 + include/linux/tc_ematch/tc_em_text.h | 1 + include/linux/topology.h | 6 + include/linux/usb/cdc.h | 2 + include/linux/usb/gadgetfs.h | 2 +- include/linux/video_decoder.h | 2 + include/linux/video_encoder.h | 2 + include/linux/videodev.h | 1 + include/linux/videodev2.h | 2 +- include/linux/virtio_blk.h | 1 + include/linux/virtio_console.h | 2 + include/linux/virtio_net.h | 2 + include/mtd/inftl-user.h | 2 + include/sound/hdsp.h | 2 + include/video/sisfb.h | 2 +- include/video/uvesafb.h | 2 + init/Kconfig | 179 ++++++++++++++------------- kernel/Makefile | 1 + kernel/fork.c | 2 +- kernel/hung_task.c | 206 ++++++++++++++++++++++++++++++ kernel/irq/chip.c | 5 +- kernel/irq/handle.c | 57 +++++---- kernel/irq/internals.h | 7 + kernel/irq/manage.c | 12 +- kernel/irq/migration.c | 12 +- kernel/irq/numa_migrate.c | 19 +++- kernel/irq/proc.c | 4 +- kernel/mutex-debug.c | 9 +-- kernel/mutex-debug.h | 18 ++-- kernel/mutex.c | 121 ++++++++++++++++--- kernel/mutex.h | 22 +++- kernel/rcuclassic.c | 2 +- kernel/rcutree.c | 2 +- kernel/relay.c | 4 +- kernel/sched.c | 71 ++++++++++- kernel/sched_features.h | 1 + kernel/sched_rt.c | 36 ++++-- kernel/softirq.c | 5 + kernel/softlockup.c | 109 ++--------------- kernel/sysctl.c | 17 +++- lib/Kconfig.debug | 38 ++++++ lib/smp_processor_id.c | 2 +- 228 files changed, 1937 insertions(+), 1288 deletions(-) create mode 100644 arch/x86/include/asm/apicnum.h create mode 100644 kernel/hung_task.c Merging cpus4096/auto-cpus4096-next $ git merge cpus4096/auto-cpus4096-next Auto-merged arch/x86/include/asm/topology.h Auto-merged arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c Recorded preimage for 'arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c' Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c'. Created commit fe0bdf6: Merge commit 'cpus4096/auto-cpus4096-next' $ git diff -M --stat --summary HEAD^.. arch/ia64/include/asm/topology.h | 2 +- arch/x86/include/asm/topology.h | 17 ++++++++++++++--- arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 11 ++++------- 3 files changed, 19 insertions(+), 11 deletions(-) Merging ftrace/auto-ftrace-next $ git merge ftrace/auto-ftrace-next Auto-merged Documentation/kernel-parameters.txt Auto-merged Documentation/sysrq.txt Auto-merged MAINTAINERS Auto-merged arch/ia64/Kconfig Auto-merged drivers/char/sysrq.c Auto-merged init/main.c Auto-merged kernel/relay.c Auto-merged scripts/Makefile.build Merge made by recursive. Documentation/ABI/testing/debugfs-kmemtrace | 71 +++ Documentation/kernel-parameters.txt | 10 + Documentation/sysrq.txt | 2 + Documentation/tracers/mmiotrace.txt | 6 +- Documentation/vm/kmemtrace.txt | 126 ++++ MAINTAINERS | 6 + arch/ia64/Kconfig | 3 + arch/ia64/include/asm/ftrace.h | 28 + arch/ia64/kernel/Makefile | 5 + arch/ia64/kernel/entry.S | 100 ++++ arch/ia64/kernel/ftrace.c | 206 +++++++ arch/ia64/kernel/ia64_ksyms.c | 6 + arch/x86/Kconfig.debug | 24 +- arch/x86/kvm/Kconfig | 3 +- drivers/char/sysrq.c | 2 +- include/linux/ftrace.h | 4 + include/linux/slab_def.h | 68 ++- include/linux/slob_def.h | 9 +- include/linux/slub_def.h | 53 ++- include/trace/kmemtrace.h | 75 +++ include/trace/workqueue.h | 25 + init/main.c | 2 + kernel/relay.c | 4 +- kernel/trace/Kconfig | 55 ++ kernel/trace/Makefile | 4 + kernel/trace/ftrace.c | 45 +- kernel/trace/kmemtrace.c | 350 +++++++++++ kernel/trace/ring_buffer.c | 50 +- kernel/trace/trace.c | 742 ++---------------------- kernel/trace/trace.h | 46 +- kernel/trace/trace_boot.c | 1 + kernel/trace/trace_branch.c | 278 ++++++---- kernel/trace/trace_functions_graph.c | 8 +- kernel/trace/trace_hw_branches.c | 1 + kernel/trace/trace_mmiotrace.c | 18 +- kernel/trace/trace_output.c | 832 +++++++++++++++++++++++++++ kernel/trace/trace_output.h | 59 ++ kernel/trace/trace_power.c | 1 + kernel/trace/trace_selftest.c | 1 - kernel/trace/trace_stat.c | 319 ++++++++++ kernel/trace/trace_stat.h | 31 + kernel/trace/trace_workqueue.c | 287 +++++++++ kernel/workqueue.c | 16 +- mm/slab.c | 71 ++- mm/slob.c | 37 +- mm/slub.c | 83 +++- scripts/Makefile.build | 13 +- scripts/recordmcount.pl | 18 +- 48 files changed, 3252 insertions(+), 952 deletions(-) create mode 100644 Documentation/ABI/testing/debugfs-kmemtrace create mode 100644 Documentation/vm/kmemtrace.txt create mode 100644 arch/ia64/include/asm/ftrace.h create mode 100644 arch/ia64/kernel/ftrace.c create mode 100644 include/trace/kmemtrace.h create mode 100644 include/trace/workqueue.h create mode 100644 kernel/trace/kmemtrace.c create mode 100644 kernel/trace/trace_output.c create mode 100644 kernel/trace/trace_output.h create mode 100644 kernel/trace/trace_stat.c create mode 100644 kernel/trace/trace_stat.h create mode 100644 kernel/trace/trace_workqueue.c Merging genirq/auto-genirq-next $ git merge genirq/auto-genirq-next Auto-merged kernel/irq/chip.c Merge made by recursive. kernel/irq/chip.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 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 | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) Merging sched/auto-sched-next $ git merge sched/auto-sched-next Auto-merged include/linux/sched.h Auto-merged init/Kconfig Auto-merged kernel/sched.c Auto-merged kernel/sched_features.h Auto-merged kernel/sched_rt.c Merge made by recursive. include/linux/init_task.h | 1 + include/linux/plist.h | 9 +- include/linux/sched.h | 7 +- init/Kconfig | 1 - kernel/sched.c | 129 ++++++++++-- kernel/sched_debug.c | 1 + kernel/sched_fair.c | 59 +++++- kernel/sched_features.h | 3 +- kernel/sched_rt.c | 537 +++++++++++++++++++++++++++++++-------------- lib/Kconfig | 6 - lib/Makefile | 4 +- 11 files changed, 557 insertions(+), 200 deletions(-) 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/include/asm/pda.h CONFLICT (content): Merge conflict in arch/x86/include/asm/pda.h Auto-merged arch/x86/include/asm/system.h CONFLICT (content): Merge conflict in arch/x86/include/asm/system.h Auto-merged arch/x86/kernel/process_64.c Auto-merged arch/x86/mm/fault.c Auto-merged include/linux/magic.h Auto-merged include/linux/sched.h Auto-merged init/main.c Auto-merged kernel/exit.c Auto-merged kernel/fork.c Auto-merged kernel/panic.c Auto-merged kernel/sched.c Recorded preimage for 'arch/x86/include/asm/pda.h' Recorded preimage for 'arch/x86/include/asm/system.h' Automatic merge failed; fix conflicts and then commit the result. $ git reset --hard HEAD is now at cfa667f Merge commit 'sched/auto-sched-next' Merging timers/auto-timers-next $ git merge timers/auto-timers-next Auto-merged include/linux/init_task.h Auto-merged include/linux/sched.h Auto-merged kernel/fork.c Merge made by recursive. arch/x86/kernel/hpet.c | 2 +- arch/x86/kernel/quirks.c | 3 +- include/linux/clockchips.h | 1 + include/linux/init_task.h | 6 ++++ include/linux/sched.h | 29 +++++++++++------- include/linux/workqueue.h | 6 ++++ kernel/fork.c | 16 ++++----- kernel/hrtimer.c | 34 ++++++++++++++++++++- kernel/posix-cpu-timers.c | 70 -------------------------------------------- kernel/sched_stats.h | 33 +++++++++----------- kernel/time/tick-common.c | 26 ++++++++++++---- kernel/time/tick-sched.c | 2 +- 12 files changed, 109 insertions(+), 119 deletions(-) Merging pci/linux-next $ git merge pci/linux-next Auto-merged Documentation/kernel-parameters.txt Auto-merged drivers/pci/pci.c Auto-merged drivers/pci/pci.h Merge made by recursive. Documentation/kernel-parameters.txt | 2 + arch/x86/pci/early.c | 19 ++-- drivers/pci/hotplug/pciehp_acpi.c | 16 +--- drivers/pci/hotplug/pciehp_core.c | 18 +--- drivers/pci/pci.c | 17 ++- drivers/pci/pci.h | 20 ++-- drivers/pci/pcie/aer/aerdrv.c | 28 +----- drivers/pci/pcie/aer/aerdrv_core.c | 10 +- drivers/pci/pcie/portdrv.h | 8 +- drivers/pci/pcie/portdrv_bus.c | 18 ++-- drivers/pci/pcie/portdrv_core.c | 173 ++++++++++++++++++----------------- drivers/pci/pcie/portdrv_pci.c | 61 ++++--------- include/linux/pcieport_if.h | 24 ++--- 13 files changed, 181 insertions(+), 233 deletions(-) Merging quilt/device-mapper $ git merge quilt/device-mapper Merge made by recursive. drivers/md/dm-ioctl.c | 7 ++- drivers/md/dm-target.c | 104 ++++++++++++----------------------------- drivers/md/dm.h | 2 +- include/linux/device-mapper.h | 3 + 4 files changed, 38 insertions(+), 78 deletions(-) Merging hid/for-next $ git merge hid/for-next Merge made by recursive. drivers/hid/Kconfig | 6 +- drivers/hid/hid-core.c | 16 ++ drivers/hid/hid-microsoft.c | 13 +- drivers/hid/hidraw.c | 17 ++- drivers/hid/usbhid/hid-core.c | 435 ++++++++++++++++++++++++++++++++--------- drivers/hid/usbhid/hiddev.c | 17 ++- drivers/hid/usbhid/usbhid.h | 14 +- include/linux/hid.h | 6 + 8 files changed, 409 insertions(+), 115 deletions(-) $ git reset --hard HEAD^ HEAD is now at 6a37181 Merge branch 'quilt/device-mapper' Merging quilt/i2c $ git merge quilt/i2c Auto-merged MAINTAINERS Merge made by recursive. MAINTAINERS | 2 +- drivers/gpu/drm/i915/intel_i2c.c | 4 -- drivers/i2c/busses/i2c-acorn.c | 1 - drivers/i2c/busses/i2c-ali1535.c | 1 - drivers/i2c/busses/i2c-ali1563.c | 1 - drivers/i2c/busses/i2c-ali15x3.c | 1 - drivers/i2c/busses/i2c-amd756.c | 1 - drivers/i2c/busses/i2c-amd8111.c | 1 - drivers/i2c/busses/i2c-au1550.c | 1 - drivers/i2c/busses/i2c-bfin-twi.c | 1 - drivers/i2c/busses/i2c-elektor.c | 1 - drivers/i2c/busses/i2c-hydra.c | 1 - drivers/i2c/busses/i2c-i801.c | 1 - drivers/i2c/busses/i2c-ibm_iic.c | 1 - drivers/i2c/busses/i2c-iop3xx.c | 1 - drivers/i2c/busses/i2c-ixp2000.c | 1 - drivers/i2c/busses/i2c-mpc.c | 1 - drivers/i2c/busses/i2c-mv64xxx.c | 1 - drivers/i2c/busses/i2c-nforce2.c | 1 - drivers/i2c/busses/i2c-parport-light.c | 1 - drivers/i2c/busses/i2c-parport.c | 1 - drivers/i2c/busses/i2c-pca-isa.c | 1 - drivers/i2c/busses/i2c-piix4.c | 1 - drivers/i2c/busses/i2c-sibyte.c | 2 - drivers/i2c/busses/i2c-sis5595.c | 1 - drivers/i2c/busses/i2c-sis630.c | 1 - drivers/i2c/busses/i2c-sis96x.c | 1 - drivers/i2c/busses/i2c-via.c | 1 - drivers/i2c/busses/i2c-viapro.c | 1 - drivers/i2c/busses/i2c-voodoo3.c | 2 - drivers/i2c/busses/scx200_acb.c | 1 - drivers/i2c/busses/scx200_i2c.c | 1 - drivers/ieee1394/pcilynx.c | 1 - drivers/video/aty/radeon_i2c.c | 1 - drivers/video/i810/i810-i2c.c | 1 - drivers/video/intelfb/intelfb_i2c.c | 1 - drivers/video/nvidia/nv_i2c.c | 1 - drivers/video/savage/savagefb-i2c.c | 1 - include/linux/i2c-id.h | 61 -------------------------------- include/linux/i2c.h | 8 +++-- 40 files changed, 6 insertions(+), 107 deletions(-) Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Merge made by recursive. drivers/hwmon/ds1621.c | 79 +++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 65 insertions(+), 14 deletions(-) Merging quilt/kernel-doc $ git merge quilt/kernel-doc Already up-to-date. Merging v4l-dvb/master $ git merge v4l-dvb/master Auto-merged drivers/media/video/uvc/uvc_status.c Merge made by recursive. Documentation/video4linux/v4lgrab.c | 25 +- drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 24 +- drivers/media/dvb/dvb-core/dvb_ca_en50221.h | 6 +- drivers/media/dvb/dvb-usb/dib0700_devices.c | 18 +- drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 2 + drivers/media/dvb/frontends/stb0899_algo.c | 3 + drivers/media/video/cs5345.c | 1 - drivers/media/video/cx23885/cx23885-417.c | 3 +- drivers/media/video/cx23885/cx23885-video.c | 5 +- drivers/media/video/cx88/cx88-dvb.c | 72 ++-- drivers/media/video/cx88/cx88.h | 2 +- drivers/media/video/em28xx/em28xx-core.c | 9 + drivers/media/video/em28xx/em28xx-video.c | 41 +- drivers/media/video/em28xx/em28xx.h | 19 + drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 12 + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 19 + drivers/media/video/pvrusb2/pvrusb2-hdw.h | 6 +- drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 12 +- drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 2 +- drivers/media/video/pwc/pwc-if.c | 1 - drivers/media/video/saa7127.c | 52 +- drivers/media/video/saa7134/saa7134-core.c | 4 + drivers/media/video/saa717x.c | 1 - drivers/media/video/tveeprom.c | 3 + drivers/media/video/tvp514x.c | 2 +- drivers/media/video/upd64031a.c | 1 - drivers/media/video/upd64083.c | 1 - drivers/media/video/uvc/uvc_ctrl.c | 7 +- drivers/media/video/uvc/uvc_driver.c | 55 +- drivers/media/video/uvc/uvc_isight.c | 2 + drivers/media/video/uvc/uvc_queue.c | 31 +- drivers/media/video/uvc/uvc_status.c | 3 +- drivers/media/video/uvc/uvc_v4l2.c | 10 +- drivers/media/video/uvc/uvc_video.c | 31 +- drivers/media/video/uvc/uvcvideo.h | 232 ++++---- drivers/media/video/v4l2-subdev.c | 10 +- drivers/media/video/vivi.c | 186 +++++-- drivers/media/video/zoran/zoran.h | 12 +- drivers/media/video/zoran/zoran_card.c | 620 ++++++++++---------- drivers/media/video/zoran/zoran_card.h | 2 - drivers/media/video/zoran/zoran_driver.c | 105 ++--- include/media/v4l2-device.h | 8 +- include/media/v4l2-subdev.h | 3 + 43 files changed, 913 insertions(+), 750 deletions(-) Merging quota/for_next $ git merge quota/for_next Merge made by recursive. fs/dquot.c | 514 +++++++++++++++++++++++++++++++--------------- fs/ext3/super.c | 44 +---- fs/ext4/super.c | 44 +---- fs/reiserfs/super.c | 58 +----- include/linux/quota.h | 9 + include/linux/quotaops.h | 90 +++++++- 6 files changed, 440 insertions(+), 319 deletions(-) $ git reset --hard HEAD^ HEAD is now at ff2aa6f Merge commit 'v4l-dvb/master' Merging jfs/next $ git merge jfs/next Merge made by recursive. fs/jfs/jfs_extent.c | 63 +++++-------- fs/jfs/jfs_imap.c | 10 +-- fs/jfs/jfs_types.h | 29 ------ fs/jfs/jfs_xtree.c | 263 +-------------------------------------------------- fs/jfs/jfs_xtree.h | 2 - 5 files changed, 28 insertions(+), 339 deletions(-) Merging kbuild/master $ git merge kbuild/master Already up-to-date. Merging quilt/ide $ git merge quilt/ide Merge made by recursive. drivers/ide/Kconfig | 10 ++ drivers/ide/Makefile | 1 + drivers/ide/cs5536.c | 309 +++++++++++++++++++++++++++++++++++++++++++++++ drivers/ide/ide-acpi.c | 214 ++++++++------------------------- drivers/ide/ide-atapi.c | 21 +++- drivers/ide/ide-io.c | 20 --- drivers/ide/ide-iops.c | 5 +- drivers/ide/ide-probe.c | 85 +++++--------- drivers/ide/ide-proc.c | 2 +- drivers/ide/ide.c | 2 + drivers/ide/via82cxxx.c | 5 + include/linux/ide.h | 12 ++- 12 files changed, 439 insertions(+), 247 deletions(-) create mode 100644 drivers/ide/cs5536.c Merging libata/NEXT $ git merge libata/NEXT Already up-to-date. Merging nfs/linux-next $ git merge nfs/linux-next Auto-merged init/Kconfig Auto-merged kernel/Makefile Auto-merged kernel/sysctl.c Merge made by recursive. Documentation/filesystems/caching/backend-api.txt | 658 ++++++++++++++++ Documentation/filesystems/caching/cachefiles.txt | 501 ++++++++++++ Documentation/filesystems/caching/fscache.txt | 333 ++++++++ Documentation/filesystems/caching/netfs-api.txt | 800 +++++++++++++++++++ Documentation/filesystems/caching/object.txt | 313 ++++++++ Documentation/filesystems/caching/operations.txt | 213 +++++ Documentation/slow-work.txt | 174 +++++ fs/Kconfig | 24 + fs/Makefile | 2 + fs/afs/Makefile | 3 + fs/afs/cache.c | 503 ++++++++----- fs/afs/cache.h | 15 +- fs/afs/cell.c | 16 +- fs/afs/file.c | 220 ++++-- fs/afs/inode.c | 31 +- fs/afs/internal.h | 53 +- fs/afs/main.c | 27 +- fs/afs/mntpt.c | 4 +- fs/afs/vlocation.c | 25 +- fs/afs/volume.c | 14 +- fs/afs/write.c | 21 + fs/cachefiles/Kconfig | 39 + fs/cachefiles/Makefile | 18 + fs/cachefiles/cf-bind.c | 286 +++++++ fs/cachefiles/cf-daemon.c | 754 ++++++++++++++++++ fs/cachefiles/cf-interface.c | 449 +++++++++++ fs/cachefiles/cf-internal.h | 360 +++++++++ fs/cachefiles/cf-key.c | 159 ++++ fs/cachefiles/cf-main.c | 106 +++ fs/cachefiles/cf-namei.c | 772 +++++++++++++++++++ fs/cachefiles/cf-proc.c | 134 ++++ fs/cachefiles/cf-rdwr.c | 853 +++++++++++++++++++++ fs/cachefiles/cf-security.c | 116 +++ fs/cachefiles/cf-xattr.c | 291 +++++++ fs/ext2/inode.c | 2 + fs/ext3/inode.c | 9 +- fs/fscache/Kconfig | 56 ++ fs/fscache/Makefile | 19 + fs/fscache/fsc-cache.c | 415 ++++++++++ fs/fscache/fsc-cookie.c | 498 ++++++++++++ fs/fscache/fsc-fsdef.c | 144 ++++ fs/fscache/fsc-histogram.c | 109 +++ fs/fscache/fsc-internal.h | 380 +++++++++ fs/fscache/fsc-main.c | 124 +++ fs/fscache/fsc-netfs.c | 103 +++ fs/fscache/fsc-object.c | 810 +++++++++++++++++++ fs/fscache/fsc-operation.c | 459 +++++++++++ fs/fscache/fsc-page.c | 771 +++++++++++++++++++ fs/fscache/fsc-proc.c | 68 ++ fs/fscache/fsc-stats.c | 212 +++++ fs/nfs/Makefile | 1 + fs/nfs/client.c | 14 +- fs/nfs/file.c | 37 +- fs/nfs/fscache-index.c | 337 ++++++++ fs/nfs/fscache.c | 521 +++++++++++++ fs/nfs/fscache.h | 208 +++++ fs/nfs/inode.c | 17 +- fs/nfs/internal.h | 4 + fs/nfs/iostat.h | 18 + fs/nfs/read.c | 27 +- fs/nfs/super.c | 45 +- fs/splice.c | 3 +- fs/super.c | 1 + include/linux/fs.h | 7 + include/linux/fscache-cache.h | 504 ++++++++++++ include/linux/fscache.h | 592 ++++++++++++++ include/linux/nfs_fs.h | 13 + include/linux/nfs_fs_sb.h | 11 + include/linux/nfs_iostat.h | 12 + include/linux/page-flags.h | 43 +- include/linux/pagemap.h | 21 + include/linux/slow-work.h | 95 +++ init/Kconfig | 12 + kernel/Makefile | 1 + kernel/slow-work.c | 640 ++++++++++++++++ kernel/sysctl.c | 9 + mm/filemap.c | 99 +++ mm/migrate.c | 10 +- mm/readahead.c | 40 +- mm/swap.c | 4 +- mm/truncate.c | 10 +- mm/vmscan.c | 6 +- security/security.c | 2 + 83 files changed, 15436 insertions(+), 394 deletions(-) create mode 100644 Documentation/filesystems/caching/backend-api.txt create mode 100644 Documentation/filesystems/caching/cachefiles.txt create mode 100644 Documentation/filesystems/caching/fscache.txt create mode 100644 Documentation/filesystems/caching/netfs-api.txt create mode 100644 Documentation/filesystems/caching/object.txt create mode 100644 Documentation/filesystems/caching/operations.txt create mode 100644 Documentation/slow-work.txt create mode 100644 fs/cachefiles/Kconfig create mode 100644 fs/cachefiles/Makefile create mode 100644 fs/cachefiles/cf-bind.c create mode 100644 fs/cachefiles/cf-daemon.c create mode 100644 fs/cachefiles/cf-interface.c create mode 100644 fs/cachefiles/cf-internal.h create mode 100644 fs/cachefiles/cf-key.c create mode 100644 fs/cachefiles/cf-main.c create mode 100644 fs/cachefiles/cf-namei.c create mode 100644 fs/cachefiles/cf-proc.c create mode 100644 fs/cachefiles/cf-rdwr.c create mode 100644 fs/cachefiles/cf-security.c create mode 100644 fs/cachefiles/cf-xattr.c create mode 100644 fs/fscache/Kconfig create mode 100644 fs/fscache/Makefile create mode 100644 fs/fscache/fsc-cache.c create mode 100644 fs/fscache/fsc-cookie.c create mode 100644 fs/fscache/fsc-fsdef.c create mode 100644 fs/fscache/fsc-histogram.c create mode 100644 fs/fscache/fsc-internal.h create mode 100644 fs/fscache/fsc-main.c create mode 100644 fs/fscache/fsc-netfs.c create mode 100644 fs/fscache/fsc-object.c create mode 100644 fs/fscache/fsc-operation.c create mode 100644 fs/fscache/fsc-page.c create mode 100644 fs/fscache/fsc-proc.c create mode 100644 fs/fscache/fsc-stats.c create mode 100644 fs/nfs/fscache-index.c create mode 100644 fs/nfs/fscache.c create mode 100644 fs/nfs/fscache.h create mode 100644 include/linux/fscache-cache.h create mode 100644 include/linux/fscache.h create mode 100644 include/linux/slow-work.h create mode 100644 kernel/slow-work.c Merging xfs/master $ git merge xfs/master Auto-merged MAINTAINERS Merge made by recursive. fs/xfs/quota/xfs_dquot.c | 2 +- fs/xfs/xfs_ag.h | 6 +- fs/xfs/xfs_alloc_btree.c | 2 +- fs/xfs/xfs_attr.c | 26 ++++---- fs/xfs/xfs_bmap.c | 166 ++++++++++++++++++++++---------------------- fs/xfs/xfs_bmap.h | 2 - fs/xfs/xfs_bmap_btree.c | 10 ++-- fs/xfs/xfs_bmap_btree.h | 4 - fs/xfs/xfs_btree.c | 6 +- fs/xfs/xfs_da_btree.c | 8 +- fs/xfs/xfs_ialloc.c | 6 +- fs/xfs/xfs_ialloc.h | 2 - fs/xfs/xfs_ialloc_btree.h | 1 - fs/xfs/xfs_inode.c | 6 +- fs/xfs/xfs_inode_item.h | 4 - fs/xfs/xfs_iomap.c | 10 ++-- fs/xfs/xfs_itable.c | 6 +- fs/xfs/xfs_mount.h | 6 +- fs/xfs/xfs_rename.c | 2 +- fs/xfs/xfs_rtalloc.c | 2 +- fs/xfs/xfs_rw.h | 1 - fs/xfs/xfs_sb.h | 2 +- fs/xfs/xfs_vnodeops.c | 20 +++--- 23 files changed, 142 insertions(+), 158 deletions(-) Merging infiniband/for-next $ git merge infiniband/for-next Merge made by recursive. drivers/infiniband/core/cm.c | 15 ++-- drivers/infiniband/core/cm_msgs.h | 22 +++--- drivers/infiniband/core/mad_rmpp.c | 2 +- drivers/infiniband/hw/amso1100/c2.c | 20 +++-- drivers/infiniband/hw/amso1100/c2_provider.c | 15 ++-- drivers/infiniband/hw/cxgb3/iwch_qp.c | 4 +- drivers/infiniband/hw/ehca/ehca_sqp.c | 8 +- drivers/infiniband/hw/ipath/ipath_eeprom.c | 4 +- drivers/infiniband/hw/ipath/ipath_mad.c | 95 ++++++++++++------------- drivers/infiniband/hw/ipath/ipath_rc.c | 2 +- drivers/infiniband/hw/ipath/ipath_sdma.c | 4 +- drivers/infiniband/hw/ipath/ipath_uc.c | 2 +- drivers/infiniband/hw/ipath/ipath_ud.c | 4 +- drivers/infiniband/hw/ipath/ipath_user_sdma.c | 6 +- drivers/infiniband/hw/ipath/ipath_verbs.c | 2 +- drivers/infiniband/hw/ipath/ipath_verbs.h | 10 ++-- drivers/infiniband/hw/mlx4/qp.c | 22 +++--- drivers/infiniband/hw/nes/nes_nic.c | 22 ++++--- drivers/infiniband/ulp/ipoib/ipoib_main.c | 20 +++-- include/rdma/ib_cm.h | 12 ++-- include/rdma/ib_mad.h | 2 +- include/rdma/ib_smi.h | 34 +++++----- 22 files changed, 169 insertions(+), 158 deletions(-) Merging acpi/test $ git merge acpi/test Auto-merged MAINTAINERS Auto-merged arch/x86/kernel/acpi/sleep.c Auto-merged arch/x86/kernel/reboot.c Merge made by recursive. Documentation/feature-removal-schedule.txt | 8 + MAINTAINERS | 5 + arch/x86/kernel/acpi/sleep.c | 4 +- arch/x86/kernel/reboot.c | 2 +- drivers/acpi/battery.c | 14 +- drivers/acpi/ec.c | 2 +- drivers/acpi/pci_link.c | 39 +- drivers/acpi/sbs.c | 31 +- drivers/acpi/sleep.c | 51 +- drivers/platform/x86/Kconfig | 13 + drivers/platform/x86/Makefile | 1 + drivers/platform/x86/oqo-wmi.c | 941 ++++++++++++++++++++++++++++ drivers/platform/x86/panasonic-laptop.c | 2 +- drivers/power/power_supply_sysfs.c | 2 + include/linux/power_supply.h | 2 + kernel/power/main.c | 26 +- 16 files changed, 1060 insertions(+), 83 deletions(-) create mode 100644 drivers/platform/x86/oqo-wmi.c Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Auto-merged fs/Kconfig Merge made by recursive. Documentation/filesystems/nfs-rdma.txt | 4 +- fs/Kconfig | 5 +- fs/nfsd/nfs3proc.c | 5 +- fs/nfsd/nfs4state.c | 163 ++++++++++++++++++-------------- 4 files changed, 98 insertions(+), 79 deletions(-) Merging ieee1394/for-next $ git merge ieee1394/for-next Merge made by recursive. drivers/firewire/fw-card.c | 70 +-- drivers/firewire/fw-cdev.c | 1006 +++++++++++++++++-------- drivers/firewire/fw-device.c | 43 +- drivers/firewire/fw-device.h | 7 +- drivers/firewire/fw-iso.c | 225 +++++- drivers/firewire/fw-ohci.c | 240 +++--- drivers/firewire/fw-sbp2.c | 57 +- drivers/firewire/fw-topology.c | 40 +- drivers/firewire/fw-topology.h | 19 +- drivers/firewire/fw-transaction.c | 151 ++--- drivers/firewire/fw-transaction.h | 136 ++--- drivers/ieee1394/dma.h | 1 + drivers/ieee1394/ieee1394_core.c | 1 + drivers/ieee1394/ieee1394_transactions.c | 29 + drivers/ieee1394/ieee1394_transactions.h | 2 + drivers/ieee1394/iso.h | 1 + drivers/ieee1394/nodemgr.c | 10 +- drivers/ieee1394/nodemgr.h | 18 + drivers/media/dvb/Kconfig | 2 + drivers/media/dvb/Makefile | 2 + drivers/media/dvb/firewire/Kconfig | 12 + drivers/media/dvb/firewire/Makefile | 11 + drivers/media/dvb/firewire/avc.c | 1180 +++++++++++++++++++++++++++++ drivers/media/dvb/firewire/avc.h | 427 +++++++++++ drivers/media/dvb/firewire/firedtv-1394.c | 378 +++++++++ drivers/media/dvb/firewire/firedtv-ci.c | 261 +++++++ drivers/media/dvb/firewire/firedtv-ci.h | 9 + drivers/media/dvb/firewire/firedtv-dvb.c | 276 +++++++ drivers/media/dvb/firewire/firedtv-fe.c | 244 ++++++ drivers/media/dvb/firewire/firedtv-rc.c | 191 +++++ drivers/media/dvb/firewire/firedtv-rc.h | 11 + drivers/media/dvb/firewire/firedtv.h | 190 +++++ include/linux/firewire-cdev.h | 170 ++++- 33 files changed, 4633 insertions(+), 787 deletions(-) create mode 100644 drivers/media/dvb/firewire/Kconfig create mode 100644 drivers/media/dvb/firewire/Makefile create mode 100644 drivers/media/dvb/firewire/avc.c create mode 100644 drivers/media/dvb/firewire/avc.h create mode 100644 drivers/media/dvb/firewire/firedtv-1394.c create mode 100644 drivers/media/dvb/firewire/firedtv-ci.c create mode 100644 drivers/media/dvb/firewire/firedtv-ci.h create mode 100644 drivers/media/dvb/firewire/firedtv-dvb.c create mode 100644 drivers/media/dvb/firewire/firedtv-fe.c create mode 100644 drivers/media/dvb/firewire/firedtv-rc.c create mode 100644 drivers/media/dvb/firewire/firedtv-rc.h create mode 100644 drivers/media/dvb/firewire/firedtv.h Merging ubi/linux-next $ git merge ubi/linux-next Merge made by recursive. drivers/mtd/ubi/cdev.c | 148 ++++++++++++++++++++++++++++++++------------- drivers/mtd/ubi/gluebi.c | 11 +--- drivers/mtd/ubi/scan.c | 8 +-- drivers/mtd/ubi/ubi.h | 6 +- drivers/mtd/ubi/upd.c | 21 ++---- drivers/mtd/ubi/vmt.c | 17 ++--- include/mtd/ubi-user.h | 98 +++++++++++++++++++++++------- 7 files changed, 204 insertions(+), 105 deletions(-) Merging kvm/master $ git merge kvm/master Auto-merged arch/powerpc/kernel/asm-offsets.c Auto-merged arch/x86/kvm/Kconfig Auto-merged include/linux/kvm.h Merge made by recursive. arch/ia64/include/asm/kvm.h | 49 ++- arch/ia64/include/asm/kvm_host.h | 8 +- arch/ia64/kvm/Kconfig | 4 + arch/ia64/kvm/kvm-ia64.c | 100 ++++- arch/ia64/kvm/process.c | 32 +- arch/ia64/kvm/vcpu.c | 39 +-- arch/ia64/kvm/vtlb.c | 5 - arch/powerpc/include/asm/kvm.h | 7 + arch/powerpc/include/asm/kvm_44x.h | 7 + arch/powerpc/include/asm/kvm_asm.h | 7 +- arch/powerpc/include/asm/kvm_e500.h | 67 +++ arch/powerpc/include/asm/kvm_host.h | 21 +- arch/powerpc/include/asm/kvm_ppc.h | 15 +- arch/powerpc/include/asm/mmu-fsl-booke.h | 2 + arch/powerpc/kernel/asm-offsets.c | 4 +- arch/powerpc/kvm/44x.c | 72 +--- arch/powerpc/kvm/44x_emulate.c | 217 +------- arch/powerpc/kvm/44x_tlb.c | 39 +- arch/powerpc/kvm/44x_tlb.h | 9 - arch/powerpc/kvm/Kconfig | 16 + arch/powerpc/kvm/Makefile | 10 + arch/powerpc/kvm/booke.c | 50 +- arch/powerpc/kvm/booke.h | 35 +- arch/powerpc/kvm/booke_emulate.c | 266 +++++++++ arch/powerpc/kvm/booke_interrupts.S | 5 + arch/powerpc/kvm/e500.c | 169 ++++++ arch/powerpc/kvm/e500_emulate.c | 194 +++++++ arch/powerpc/kvm/e500_tlb.c | 737 +++++++++++++++++++++++++ arch/powerpc/kvm/e500_tlb.h | 184 +++++++ arch/powerpc/kvm/emulate.c | 93 +++- arch/powerpc/kvm/powerpc.c | 35 +- arch/s390/include/asm/kvm.h | 7 + arch/s390/include/asm/kvm_host.h | 3 - arch/s390/kvm/Kconfig | 3 + arch/s390/kvm/kvm-s390.c | 8 +- arch/x86/include/asm/kvm.h | 23 + arch/x86/include/asm/kvm_host.h | 59 ++- arch/x86/include/asm/msr-index.h | 7 + arch/x86/include/asm/svm.h | 4 - arch/x86/include/asm/virtext.h | 2 +- arch/x86/include/asm/vmx.h | 5 +- arch/x86/kvm/Kconfig | 4 + arch/x86/kvm/i8254.c | 23 +- arch/x86/kvm/i8254.h | 2 + arch/x86/kvm/kvm_svm.h | 16 +- arch/x86/kvm/mmu.c | 217 ++++---- arch/x86/kvm/paging_tmpl.h | 213 ++++----- arch/x86/kvm/svm.c | 868 ++++++++++++++++++++++++++---- arch/x86/kvm/vmx.c | 303 +++++++---- arch/x86/kvm/x86.c | 304 +++++++---- arch/x86/kvm/x86_emulate.c | 56 ++- include/linux/kvm.h | 61 ++- include/linux/kvm_host.h | 25 +- include/linux/kvm_types.h | 13 - virt/kvm/ioapic.c | 6 + virt/kvm/irq_comm.c | 24 + virt/kvm/kvm_main.c | 67 ++- 57 files changed, 3707 insertions(+), 1114 deletions(-) create mode 100644 arch/powerpc/include/asm/kvm_e500.h create mode 100644 arch/powerpc/kvm/booke_emulate.c create mode 100644 arch/powerpc/kvm/e500.c create mode 100644 arch/powerpc/kvm/e500_emulate.c create mode 100644 arch/powerpc/kvm/e500_tlb.c create mode 100644 arch/powerpc/kvm/e500_tlb.h Merging dlm/next $ git merge dlm/next Already up-to-date. Merging scsi/master $ git merge scsi/master Auto-merged drivers/scsi/scsi.c Merge made by recursive. drivers/scsi/Kconfig | 2 + drivers/scsi/scsi.c | 104 +++++++++++ drivers/scsi/scsi_debug.c | 443 +++++++++++++++++++++++++++++++++++++++++++- drivers/scsi/scsi_sysfs.c | 1 - drivers/scsi/ses.c | 31 +--- include/scsi/scsi_device.h | 1 + 6 files changed, 547 insertions(+), 35 deletions(-) Merging ocfs2/linux-next $ git merge ocfs2/linux-next Merge made by recursive. fs/configfs/dir.c | 59 +++++++++++ fs/dquot.c | 218 ++++++++++++++++++++++------------------ fs/ocfs2/cluster/heartbeat.c | 96 +++++++++++++++++- fs/ocfs2/cluster/heartbeat.h | 3 +- fs/ocfs2/cluster/nodemanager.c | 9 ++- fs/ocfs2/dcache.c | 42 +++++++- fs/ocfs2/dcache.h | 9 ++- fs/ocfs2/journal.c | 12 -- fs/ocfs2/journal.h | 11 ++ fs/ocfs2/localalloc.c | 86 ---------------- fs/ocfs2/ocfs2.h | 12 ++- fs/ocfs2/quota_global.c | 173 +------------------------------- fs/ocfs2/super.c | 179 ++++++++++++++++++++++++++++++++ fs/ocfs2/xattr.c | 17 ++-- include/linux/quotaops.h | 2 - 15 files changed, 542 insertions(+), 386 deletions(-) Merging ext4/next $ git merge ext4/next Merge made by recursive. fs/ext3/namei.c | 20 ++++++++++++++------ fs/ext4/ext4.h | 17 +++++------------ fs/ext4/ext4_i.h | 3 --- fs/ext4/ext4_sb.h | 4 ---- fs/ext4/inode.c | 4 ++-- fs/ext4/mballoc.h | 1 - fs/ext4/namei.c | 21 +++++++++++++++------ fs/jbd2/journal.c | 6 +++--- include/linux/jbd2.h | 3 ++- 9 files changed, 41 insertions(+), 38 deletions(-) Merging async_tx/next $ git merge async_tx/next Merge made by recursive. drivers/dma/dmaengine.c | 2 ++ drivers/dma/dmatest.c | 35 +++++++++++++++++++++++++++++++---- drivers/dma/fsldma.c | 8 +++++--- 3 files changed, 38 insertions(+), 7 deletions(-) Merging udf/for_next $ git merge udf/for_next Merge made by recursive. Documentation/filesystems/udf.txt | 2 + fs/udf/balloc.c | 113 +++++----- fs/udf/dir.c | 14 +- fs/udf/directory.c | 38 ++-- fs/udf/ecma_167.h | 416 ++++++++++++++++++------------------ fs/udf/ialloc.c | 4 +- fs/udf/inode.c | 213 ++++++++++--------- fs/udf/misc.c | 29 ++-- fs/udf/namei.c | 86 ++++---- fs/udf/osta_udf.h | 22 +- fs/udf/partition.c | 2 +- fs/udf/super.c | 139 ++++++++----- fs/udf/truncate.c | 44 ++-- fs/udf/udf_i.h | 6 +- fs/udf/udf_sb.h | 4 + fs/udf/udfdecl.h | 46 +++-- fs/udf/udfend.h | 28 ++-- fs/udf/udftime.c | 6 +- fs/udf/unicode.c | 41 +++-- 19 files changed, 663 insertions(+), 590 deletions(-) Merging net/master $ git merge net/master Already up-to-date. Merging mtd/master $ git merge mtd/master Merge made by recursive. drivers/mtd/chips/map_rom.c | 8 ++++++++ drivers/mtd/lpddr/Kconfig | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) Merging wireless/master $ git merge wireless/master Already up-to-date. Merging crypto/master $ git merge crypto/master Already up-to-date. Merging vfs/for-next $ git merge vfs/for-next Already up-to-date. Merging sound/for-next $ git merge sound/for-next Already uptodate! Merge made by recursive. Merging cpufreq/next $ git merge cpufreq/next Auto-merged arch/x86/kernel/cpu/cpufreq/powernow-k7.c Merge made by recursive. arch/x86/kernel/cpu/cpufreq/powernow-k7.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merging v9fs/for-next $ git merge v9fs/for-next Already up-to-date. Merging quilt/rr $ git merge quilt/rr Auto-merged kernel/module.c Auto-merged kernel/workqueue.c Merge made by recursive. include/linux/module.h | 25 ++++++++++++++++--------- kernel/module.c | 33 +++++++++++++++++++++++---------- kernel/workqueue.c | 20 ++++++++++---------- 3 files changed, 49 insertions(+), 29 deletions(-) Merging cifs/master $ git merge cifs/master Merge made by recursive. fs/cifs/CHANGES | 4 +- fs/cifs/cifsencrypt.c | 18 ++++---- fs/cifs/cifsproto.h | 4 +- fs/cifs/connect.c | 4 +- fs/cifs/inode.c | 5 ++ fs/cifs/md5.c | 38 +++++++++--------- fs/cifs/md5.h | 6 +- fs/cifs/transport.c | 107 +++++++++---------------------------------------- 8 files changed, 61 insertions(+), 125 deletions(-) Merging mmc/next $ git merge mmc/next Already up-to-date. Merging gfs2/master $ git merge gfs2/master Removed fs/gfs2/locking.c Removed fs/gfs2/locking/dlm/Makefile Removed fs/gfs2/locking/dlm/lock.c Removed fs/gfs2/locking/dlm/lock_dlm.h Removed fs/gfs2/locking/dlm/main.c Removed fs/gfs2/locking/dlm/mount.c Removed fs/gfs2/locking/dlm/sysfs.c Removed fs/gfs2/locking/dlm/thread.c Removed fs/gfs2/mount.h Removed include/linux/lm_interface.h Merge made by recursive. fs/gfs2/Kconfig | 17 +- fs/gfs2/Makefile | 4 +- fs/gfs2/acl.c | 1 - fs/gfs2/bmap.c | 1 - fs/gfs2/dir.c | 1 - fs/gfs2/eaops.c | 1 - fs/gfs2/eattr.c | 1 - fs/gfs2/glock.c | 251 +++++---------- fs/gfs2/glock.h | 127 +++++++- fs/gfs2/glops.c | 14 - fs/gfs2/incore.h | 67 ++++- fs/gfs2/inode.c | 13 +- fs/gfs2/inode.h | 22 +- fs/gfs2/lock_dlm.c | 240 ++++++++++++++ fs/gfs2/locking.c | 232 ------------- fs/gfs2/locking/dlm/Makefile | 3 - fs/gfs2/locking/dlm/lock.c | 708 ---------------------------------------- fs/gfs2/locking/dlm/lock_dlm.h | 166 ---------- fs/gfs2/locking/dlm/main.c | 48 --- fs/gfs2/locking/dlm/mount.c | 276 ---------------- fs/gfs2/locking/dlm/sysfs.c | 226 ------------- fs/gfs2/locking/dlm/thread.c | 68 ---- fs/gfs2/log.c | 1 - fs/gfs2/lops.c | 1 - fs/gfs2/main.c | 13 +- fs/gfs2/meta_io.c | 1 - fs/gfs2/mount.c | 112 +------ fs/gfs2/mount.h | 17 - fs/gfs2/ops_address.c | 2 +- fs/gfs2/ops_dentry.c | 1 - fs/gfs2/ops_export.c | 1 - fs/gfs2/ops_file.c | 74 ++--- fs/gfs2/ops_fstype.c | 147 ++++++--- fs/gfs2/ops_inode.c | 1 - fs/gfs2/ops_super.c | 42 ++- fs/gfs2/quota.c | 203 ++++++------ fs/gfs2/quota.h | 2 + fs/gfs2/recovery.c | 28 +- fs/gfs2/rgrp.c | 1 - fs/gfs2/super.c | 1 - fs/gfs2/super.h | 26 +- fs/gfs2/sys.c | 156 +++++++++- fs/gfs2/trans.c | 3 +- fs/gfs2/util.c | 11 +- include/linux/lm_interface.h | 277 ---------------- 45 files changed, 1013 insertions(+), 2595 deletions(-) create mode 100644 fs/gfs2/lock_dlm.c delete mode 100644 fs/gfs2/locking.c delete mode 100644 fs/gfs2/locking/dlm/Makefile delete mode 100644 fs/gfs2/locking/dlm/lock.c delete mode 100644 fs/gfs2/locking/dlm/lock_dlm.h delete mode 100644 fs/gfs2/locking/dlm/main.c delete mode 100644 fs/gfs2/locking/dlm/mount.c delete mode 100644 fs/gfs2/locking/dlm/sysfs.c delete mode 100644 fs/gfs2/locking/dlm/thread.c delete mode 100644 fs/gfs2/mount.h delete mode 100644 include/linux/lm_interface.h Merging input/next $ git merge input/next Already up-to-date. Merging bkl-removal/bkl-removal $ git merge bkl-removal/bkl-removal Auto-merged fs/fcntl.c Auto-merged fs/ioctl.c Auto-merged include/linux/fs.h Merge made by recursive. drivers/char/tty_io.c | 5 +-- fs/fcntl.c | 65 +++++++++++++++++++++++++++++++++++++++---------- fs/ioctl.c | 25 ++++--------------- fs/nfsd/vfs.c | 5 +++- include/linux/fs.h | 17 +++++++++++++ 5 files changed, 80 insertions(+), 37 deletions(-) Merging ubifs/linux-next $ git merge ubifs/linux-next Merge made by recursive. fs/ubifs/dir.c | 4 ++-- fs/ubifs/file.c | 8 ++++---- fs/ubifs/super.c | 11 ++++++----- fs/ubifs/ubifs.h | 14 +++++++------- 4 files changed, 19 insertions(+), 18 deletions(-) Merging lsm/for-next $ git merge lsm/for-next Already up-to-date. Merging block/for-next $ git merge block/for-next Already up-to-date. Merging embedded/master $ git merge embedded/master Already up-to-date. Merging firmware/master $ git merge firmware/master Removed drivers/media/dvb/ttpci/fdump.c Removed drivers/scsi/ql1040_fw.h Removed drivers/scsi/ql12160_fw.h Removed drivers/scsi/ql1280_fw.h Removed drivers/scsi/qlogicpti_asm.c Auto-merged firmware/Makefile Auto-merged firmware/WHENCE Removed sound/isa/wavefront/yss225.c Merge made by recursive. drivers/media/dvb/ttpci/Kconfig | 23 +- drivers/media/dvb/ttpci/Makefile | 9 - drivers/media/dvb/ttpci/av7110.c | 16 - drivers/media/dvb/ttpci/av7110_hw.c | 35 +- drivers/media/dvb/ttpci/av7110_hw.h | 3 +- drivers/media/dvb/ttpci/fdump.c | 44 - drivers/scsi/advansys.c | 1731 ++----------------- drivers/scsi/ql1040_fw.h | 2130 ---------------------- drivers/scsi/ql12160_fw.h | 1811 ------------------- drivers/scsi/ql1280_fw.h | 2048 --------------------- drivers/scsi/qla1280.c | 114 +- drivers/scsi/qla1280.h | 6 + drivers/scsi/qlogicpti.c | 63 +- drivers/scsi/qlogicpti_asm.c | 1160 ------------ firmware/.gitignore | 1 + firmware/Makefile | 29 +- firmware/WHENCE | 59 + firmware/advansys/3550.bin.ihex | 317 ++++ firmware/advansys/38C0800.bin.ihex | 336 ++++ firmware/advansys/38C1600.bin.ihex | 398 +++++ firmware/advansys/mcode.bin.ihex | 147 ++ firmware/av7110/Boot.S | 109 ++ firmware/av7110/bootcode.bin.ihex | 15 + {scripts => firmware}/ihex2fw.c | 0 firmware/qlogic/1040.bin.ihex | 2111 ++++++++++++++++++++++ firmware/qlogic/12160.bin.ihex | 1771 +++++++++++++++++++ firmware/qlogic/1280.bin.ihex | 2008 +++++++++++++++++++++ firmware/qlogic/isp1000.bin.ihex | 1158 ++++++++++++ firmware/yamaha/yss225_registers.bin.ihex | 998 +++++++++++ scripts/.gitignore | 1 - scripts/Makefile | 3 +- sound/isa/Kconfig | 10 - sound/isa/wavefront/wavefront_fx.c | 16 - sound/isa/wavefront/yss225.c | 2739 ----------------------------- 34 files changed, 9695 insertions(+), 11724 deletions(-) delete mode 100644 drivers/media/dvb/ttpci/fdump.c delete mode 100644 drivers/scsi/ql1040_fw.h delete mode 100644 drivers/scsi/ql12160_fw.h delete mode 100644 drivers/scsi/ql1280_fw.h delete mode 100644 drivers/scsi/qlogicpti_asm.c create mode 100644 firmware/advansys/3550.bin.ihex create mode 100644 firmware/advansys/38C0800.bin.ihex create mode 100644 firmware/advansys/38C1600.bin.ihex create mode 100644 firmware/advansys/mcode.bin.ihex create mode 100644 firmware/av7110/Boot.S create mode 100644 firmware/av7110/bootcode.bin.ihex rename {scripts => firmware}/ihex2fw.c (100%) create mode 100644 firmware/qlogic/1040.bin.ihex create mode 100644 firmware/qlogic/12160.bin.ihex create mode 100644 firmware/qlogic/1280.bin.ihex create mode 100644 firmware/qlogic/isp1000.bin.ihex create mode 100644 firmware/yamaha/yss225_registers.bin.ihex delete mode 100644 sound/isa/wavefront/yss225.c Merging pcmcia/master $ git merge pcmcia/master Already up-to-date. Merging battery/master $ git merge battery/master Already up-to-date. Merging leds/for-mm $ git merge leds/for-mm Auto-merged drivers/leds/Kconfig Auto-merged drivers/leds/Makefile Merge made by recursive. Documentation/powerpc/dts-bindings/gpio/led.txt | 46 ++++- drivers/leds/Kconfig | 28 +++- drivers/leds/Makefile | 3 + drivers/leds/led-class.c | 21 +++- drivers/leds/leds-dac124s085.c | 150 +++++++++++++++++ drivers/leds/leds-gpio.c | 205 ++++++++++++++++++----- drivers/leds/leds.h | 4 +- drivers/leds/ledtrig-default-on.c | 2 +- drivers/leds/ledtrig-heartbeat.c | 4 +- drivers/leds/ledtrig-ide-disk.c | 3 +- drivers/leds/ledtrig-timer.c | 2 +- include/linux/leds.h | 1 + 12 files changed, 408 insertions(+), 61 deletions(-) create mode 100644 drivers/leds/leds-dac124s085.c Merging backlight/for-mm $ git merge backlight/for-mm Merge made by recursive. drivers/video/backlight/mbp_nvidia_bl.c | 191 +++++++++++++++++++++++++------ 1 files changed, 155 insertions(+), 36 deletions(-) Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Merge made by recursive. include/linux/kgdb.h | 42 ++++++++++++++++++++++++++++++++++++++++-- kernel/kgdb.c | 6 +++--- 2 files changed, 43 insertions(+), 5 deletions(-) Merging slab/for-next $ git merge slab/for-next Already up-to-date. Merging uclinux/for-next $ git merge uclinux/for-next Already up-to-date. Merging md/for-next $ git merge md/for-next Already up-to-date. Merging kmemcheck/auto-kmemcheck-next $ git merge kmemcheck/auto-kmemcheck-next Auto-merged MAINTAINERS CONFLICT (content): Merge conflict in MAINTAINERS Auto-merged arch/x86/Kconfig.debug Auto-merged arch/x86/include/asm/pgtable.h Auto-merged arch/x86/kernel/traps.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 include/linux/gfp.h Auto-merged include/linux/interrupt.h Auto-merged include/linux/mm_types.h Auto-merged include/linux/slab_def.h Auto-merged init/main.c Auto-merged kernel/fork.c CONFLICT (content): Merge conflict in kernel/fork.c Auto-merged kernel/softirq.c Auto-merged kernel/sysctl.c Auto-merged mm/Makefile Auto-merged mm/slab.c Auto-merged mm/slub.c Resolved 'MAINTAINERS' using previous resolution. Resolved 'kernel/fork.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 5e93add: Merge commit 'kmemcheck/auto-kmemcheck-next' $ git diff -M --stat --summary HEAD^.. Documentation/kmemcheck.txt | 129 ++++++ MAINTAINERS | 8 + arch/x86/Kconfig.debug | 88 +++++ arch/x86/Makefile | 5 + arch/x86/include/asm/dma-mapping.h | 2 + arch/x86/include/asm/pgtable.h | 4 +- arch/x86/include/asm/pgtable_32.h | 6 + arch/x86/include/asm/pgtable_64.h | 6 + arch/x86/include/asm/string_32.h | 8 + arch/x86/include/asm/string_64.h | 8 + arch/x86/kernel/head_32.S | 2 +- arch/x86/kernel/process.c | 2 +- arch/x86/kernel/stacktrace.c | 7 + arch/x86/kernel/traps.c | 5 + arch/x86/mm/Makefile | 2 + arch/x86/mm/fault.c | 18 +- arch/x86/mm/init_32.c | 4 +- arch/x86/mm/init_64.c | 2 +- arch/x86/mm/kmemcheck/Makefile | 1 + arch/x86/mm/kmemcheck/error.c | 229 +++++++++++ arch/x86/mm/kmemcheck/error.h | 15 + arch/x86/mm/kmemcheck/kmemcheck.c | 752 ++++++++++++++++++++++++++++++++++++ arch/x86/mm/kmemcheck/opcode.c | 90 +++++ arch/x86/mm/kmemcheck/opcode.h | 10 + arch/x86/mm/kmemcheck/pte.c | 22 + arch/x86/mm/kmemcheck/pte.h | 10 + arch/x86/mm/kmemcheck/shadow.c | 124 ++++++ arch/x86/mm/kmemcheck/shadow.h | 16 + include/asm-x86/kmemcheck.h | 42 ++ include/linux/gfp.h | 3 +- include/linux/interrupt.h | 14 + include/linux/kmemcheck.h | 86 ++++ include/linux/mm_types.h | 8 + include/linux/slab.h | 7 + include/linux/slab_def.h | 81 ++++ include/linux/stacktrace.h | 3 + init/main.c | 4 + kernel/fork.c | 14 +- kernel/softirq.c | 11 + kernel/sysctl.c | 11 + mm/Makefile | 1 + mm/kmemcheck.c | 103 +++++ mm/slab.c | 101 +---- mm/slub.c | 20 +- 44 files changed, 1981 insertions(+), 103 deletions(-) create mode 100644 Documentation/kmemcheck.txt create mode 100644 arch/x86/mm/kmemcheck/Makefile create mode 100644 arch/x86/mm/kmemcheck/error.c create mode 100644 arch/x86/mm/kmemcheck/error.h create mode 100644 arch/x86/mm/kmemcheck/kmemcheck.c create mode 100644 arch/x86/mm/kmemcheck/opcode.c create mode 100644 arch/x86/mm/kmemcheck/opcode.h create mode 100644 arch/x86/mm/kmemcheck/pte.c create mode 100644 arch/x86/mm/kmemcheck/pte.h create mode 100644 arch/x86/mm/kmemcheck/shadow.c create mode 100644 arch/x86/mm/kmemcheck/shadow.h create mode 100644 include/asm-x86/kmemcheck.h create mode 100644 include/linux/kmemcheck.h create mode 100644 mm/kmemcheck.c Merging generic-ipi/auto-generic-ipi-next $ git merge generic-ipi/auto-generic-ipi-next Already up-to-date. Merging hdlc/hdlc-next $ git merge hdlc/hdlc-next Already up-to-date. Merging drm/drm-next $ git merge drm/drm-next Already up-to-date. Merging voltage/for-next $ git merge voltage/for-next Merge made by recursive. Documentation/ABI/testing/sysfs-class-regulator | 57 +++++++++++++++++++---- drivers/regulator/bq24022.c | 6 +-- drivers/regulator/core.c | 46 ++++++++++++++++++ drivers/regulator/virtual.c | 12 +++-- drivers/regulator/wm8350-regulator.c | 2 +- include/linux/regulator/driver.h | 17 +++++++ 6 files changed, 121 insertions(+), 19 deletions(-) Merging security-testing/next $ git merge security-testing/next Auto-merged MAINTAINERS Merge made by recursive. MAINTAINERS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging quilt/ttydev $ git merge quilt/ttydev Auto-merged drivers/net/usb/hso.c Merge made by recursive. Merging agp/agp-next $ git merge agp/agp-next Already up-to-date. Merging oprofile/auto-oprofile-next $ git merge oprofile/auto-oprofile-next Already uptodate! Merge made by recursive. Merging fastboot/auto-fastboot-next $ git merge fastboot/auto-fastboot-next Already up-to-date. Merging sparseirq/auto-sparseirq-next $ git merge sparseirq/auto-sparseirq-next Already uptodate! Merge made by recursive. Merging iommu/auto-iommu-next $ git merge iommu/auto-iommu-next Auto-merged lib/swiotlb.c Merge made by recursive. Merging uwb/for-upstream $ git merge uwb/for-upstream Auto-merged drivers/usb/wusbcore/rh.c Merge made by recursive. drivers/usb/host/whci/asl.c | 9 +++++++-- drivers/usb/host/whci/hw.c | 15 +++++++++++++++ drivers/usb/host/whci/pzl.c | 9 +++++++-- drivers/usb/host/whci/whcd.h | 1 + drivers/usb/wusbcore/devconnect.c | 1 + drivers/usb/wusbcore/rh.c | 3 +++ drivers/uwb/allocator.c | 1 - drivers/uwb/rsv.c | 17 +++++++++++++---- 8 files changed, 47 insertions(+), 9 deletions(-) Merging watchdog/master $ git merge watchdog/master Merge made by recursive. Merging proc/proc $ git merge proc/proc Removed fs/proc/inode-alloc.txt Auto-merged include/linux/magic.h Auto-merged kernel/exit.c Merge made by recursive. fs/proc/Makefile | 1 + fs/proc/automount.c | 28 +++++ fs/proc/base.c | 26 +++--- fs/proc/generic.c | 62 ++++++++---- fs/proc/inode-alloc.txt | 14 --- fs/proc/inode.c | 2 +- fs/proc/internal.h | 15 +++- fs/proc/proc_net.c | 235 ++++++++++++++++++++++++++++++++---------- include/linux/magic.h | 1 + include/linux/proc_fs.h | 10 +- include/net/net_namespace.h | 1 + kernel/exit.c | 2 +- security/selinux/hooks.c | 29 ++++- 13 files changed, 309 insertions(+), 117 deletions(-) create mode 100644 fs/proc/automount.c delete mode 100644 fs/proc/inode-alloc.txt Merging bdev/master $ git merge bdev/master Already up-to-date. Merging dwmw2-iommu/master $ git merge dwmw2-iommu/master Auto-merged drivers/pci/intel-iommu.c CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c Auto-merged include/linux/dma_remapping.h CONFLICT (content): Merge conflict in include/linux/dma_remapping.h Auto-merged include/linux/intel-iommu.h Resolved 'drivers/pci/intel-iommu.c' using previous resolution. Resolved 'include/linux/dma_remapping.h' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Created commit 16161d2: Merge commit 'dwmw2-iommu/master' $ git diff -M --stat --summary HEAD^.. Merging cputime/cputime $ git merge cputime/cputime Already up-to-date. Merging osd/linux-next $ git merge osd/linux-next Auto-merged MAINTAINERS Auto-merged drivers/scsi/Kconfig Merge made by recursive. Documentation/devices.txt | 6 + Documentation/scsi/osd.txt | 198 +++++ MAINTAINERS | 10 + drivers/scsi/Kconfig | 2 + drivers/scsi/Makefile | 2 + drivers/scsi/osd/Kbuild | 45 + drivers/scsi/osd/Kconfig | 53 ++ drivers/scsi/osd/Makefile | 37 + drivers/scsi/osd/osd_debug.h | 30 + drivers/scsi/osd/osd_initiator.c | 1646 ++++++++++++++++++++++++++++++++++++++ drivers/scsi/osd/osd_uld.c | 452 +++++++++++ drivers/scsi/scsi_scan.c | 1 + include/linux/major.h | 1 + include/scsi/osd_attributes.h | 327 ++++++++ include/scsi/osd_initiator.h | 428 ++++++++++ include/scsi/osd_protocol.h | 579 ++++++++++++++ include/scsi/osd_sec.h | 45 + include/scsi/osd_sense.h | 260 ++++++ include/scsi/osd_types.h | 40 + include/scsi/scsi.h | 1 + 20 files changed, 4163 insertions(+), 0 deletions(-) create mode 100644 Documentation/scsi/osd.txt create mode 100644 drivers/scsi/osd/Kbuild create mode 100644 drivers/scsi/osd/Kconfig create mode 100755 drivers/scsi/osd/Makefile create mode 100644 drivers/scsi/osd/osd_debug.h create mode 100644 drivers/scsi/osd/osd_initiator.c create mode 100644 drivers/scsi/osd/osd_uld.c create mode 100644 include/scsi/osd_attributes.h create mode 100644 include/scsi/osd_initiator.h create mode 100644 include/scsi/osd_protocol.h create mode 100644 include/scsi/osd_sec.h create mode 100644 include/scsi/osd_sense.h create mode 100644 include/scsi/osd_types.h Merging fatfs/master $ git merge fatfs/master Already up-to-date. Merging fuse/for-next $ git merge fuse/for-next Already up-to-date. Merging jc_docs/docs-next $ git merge jc_docs/docs-next Merge made by recursive. Documentation/SubmittingPatches | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) Merging nommu/master $ git merge nommu/master Already up-to-date. Merging trivial/for-next $ git merge trivial/for-next Auto-merged kernel/trace/ftrace.c Auto-merged lib/Kconfig.debug Merge made by recursive. Documentation/filesystems/ext3.txt | 14 ++++++++++++-- arch/arm/mach-netx/include/mach/netx-regs.h | 2 +- drivers/base/sys.c | 2 +- drivers/input/mouse/gpio_mouse.c | 2 +- drivers/isdn/mISDN/l1oip_codec.c | 2 +- drivers/net/skfp/h/hwmtm.h | 2 +- drivers/net/wan/farsync.c | 2 +- drivers/usb/wusbcore/security.c | 2 +- fs/proc/nommu.c | 2 +- lib/Kconfig.debug | 13 ------------- mm/page_alloc.c | 2 +- 11 files changed, 21 insertions(+), 24 deletions(-) Merging squashfs/master $ git merge squashfs/master Already up-to-date. Merging omap/for-next $ git merge omap/for-next Already up-to-date. Merging kmemleak/kmemleak $ git merge kmemleak/kmemleak Auto-merged Documentation/kernel-parameters.txt Auto-merged MAINTAINERS Auto-merged arch/arm/kernel/vmlinux.lds.S Auto-merged arch/x86/kernel/vmlinux_32.lds.S Auto-merged arch/x86/kernel/vmlinux_64.lds.S Auto-merged include/linux/slab.h CONFLICT (content): Merge conflict in include/linux/slab.h Auto-merged init/main.c CONFLICT (content): Merge conflict in init/main.c Auto-merged kernel/module.c Auto-merged lib/Kconfig.debug Auto-merged mm/Makefile Auto-merged mm/page_alloc.c Auto-merged mm/slab.c CONFLICT (content): Merge conflict in mm/slab.c Auto-merged mm/slob.c CONFLICT (content): Merge conflict in mm/slob.c Auto-merged mm/slub.c CONFLICT (content): Merge conflict in mm/slub.c Auto-merged mm/vmalloc.c CONFLICT (content): Merge conflict in mm/vmalloc.c Recorded preimage for 'mm/vmalloc.c' Resolved 'include/linux/slab.h' using previous resolution. Resolved 'init/main.c' using previous resolution. Resolved 'mm/slab.c' using previous resolution. Resolved 'mm/slob.c' using previous resolution. Resolved 'mm/slub.c' using previous resolution. Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'mm/vmalloc.c'. Created commit 69cf472: Merge commit 'kmemleak/kmemleak' $ git diff -M --stat --summary HEAD^.. Documentation/kernel-parameters.txt | 4 + Documentation/kmemleak.txt | 142 ++++ MAINTAINERS | 6 + arch/arm/kernel/vmlinux.lds.S | 2 + arch/x86/kernel/vmlinux_32.lds.S | 1 + arch/x86/kernel/vmlinux_64.lds.S | 1 + drivers/char/vt.c | 7 + include/linux/kmemleak.h | 96 +++ include/linux/percpu.h | 5 + include/linux/slab.h | 2 + init/main.c | 4 +- kernel/module.c | 56 ++ lib/Kconfig.debug | 33 + mm/Makefile | 2 + mm/kmemleak-test.c | 111 +++ mm/kmemleak.c | 1465 +++++++++++++++++++++++++++++++++++ mm/page_alloc.c | 11 + mm/slab.c | 32 +- mm/slob.c | 7 + mm/slub.c | 5 +- mm/vmalloc.c | 30 +- 21 files changed, 2015 insertions(+), 7 deletions(-) create mode 100644 Documentation/kmemleak.txt create mode 100644 include/linux/kmemleak.h create mode 100644 mm/kmemleak-test.c create mode 100644 mm/kmemleak.c Merging quilt/staging $ git merge quilt/staging Merge made by recursive. drivers/staging/Kconfig | 6 + drivers/staging/Makefile | 3 + drivers/staging/android/binder.c | 6 +- drivers/staging/android/lowmemorykiller.txt | 16 + drivers/staging/android/timed_gpio.c | 2 +- drivers/staging/comedi/Kconfig | 1 + drivers/staging/dst/Kconfig | 67 + drivers/staging/dst/Makefile | 3 + drivers/staging/dst/crypto.c | 731 ++++++++ drivers/staging/dst/dcore.c | 972 ++++++++++ drivers/staging/dst/export.c | 664 +++++++ drivers/staging/dst/state.c | 839 +++++++++ drivers/staging/dst/thread_pool.c | 345 ++++ drivers/staging/dst/trans.c | 335 ++++ drivers/staging/meilhaus/Kconfig | 21 +- drivers/staging/stlc45xx/Kconfig | 8 + drivers/staging/stlc45xx/Makefile | 1 + drivers/staging/stlc45xx/stlc45xx.c | 2606 +++++++++++++++++++++++++++ drivers/staging/stlc45xx/stlc45xx.h | 283 +++ drivers/staging/stlc45xx/stlc45xx_lmac.h | 434 +++++ drivers/staging/sxg/sxg.c | 1682 ++++++++++-------- drivers/staging/sxg/sxg.h | 884 +++++----- drivers/staging/sxg/sxg_os.h | 100 +- drivers/staging/sxg/sxgdbg.h | 101 +- drivers/staging/sxg/sxghif.h | 1079 +++++++----- drivers/staging/sxg/sxghw.h | 1550 ++++++++++------- drivers/staging/sxg/sxgphycode.h | 14 +- drivers/staging/tuxguardian/Kconfig | 8 + drivers/staging/tuxguardian/Makefile | 3 + drivers/staging/tuxguardian/capability.c | 102 ++ drivers/staging/tuxguardian/commoncap.c | 346 ++++ drivers/staging/tuxguardian/errors.h | 135 ++ drivers/staging/tuxguardian/tg-defs.c | 406 +++++ drivers/staging/tuxguardian/tg-defs.h | 52 + drivers/staging/tuxguardian/tg.c | 459 +++++ drivers/staging/tuxguardian/tg.h | 110 ++ include/linux/connector.h | 4 +- include/linux/dst.h | 587 ++++++ 38 files changed, 12573 insertions(+), 2392 deletions(-) create mode 100644 drivers/staging/android/lowmemorykiller.txt create mode 100644 drivers/staging/dst/Kconfig create mode 100644 drivers/staging/dst/Makefile create mode 100644 drivers/staging/dst/crypto.c create mode 100644 drivers/staging/dst/dcore.c create mode 100644 drivers/staging/dst/export.c create mode 100644 drivers/staging/dst/state.c create mode 100644 drivers/staging/dst/thread_pool.c create mode 100644 drivers/staging/dst/trans.c create mode 100644 drivers/staging/stlc45xx/Kconfig create mode 100644 drivers/staging/stlc45xx/Makefile create mode 100644 drivers/staging/stlc45xx/stlc45xx.c create mode 100644 drivers/staging/stlc45xx/stlc45xx.h create mode 100644 drivers/staging/stlc45xx/stlc45xx_lmac.h create mode 100644 drivers/staging/tuxguardian/Kconfig create mode 100644 drivers/staging/tuxguardian/Makefile create mode 100644 drivers/staging/tuxguardian/capability.c create mode 100644 drivers/staging/tuxguardian/commoncap.c create mode 100644 drivers/staging/tuxguardian/errors.h create mode 100644 drivers/staging/tuxguardian/tg-defs.c create mode 100644 drivers/staging/tuxguardian/tg-defs.h create mode 100644 drivers/staging/tuxguardian/tg.c create mode 100644 drivers/staging/tuxguardian/tg.h create mode 100644 include/linux/dst.h Merging scsi-post-merge/master $ git merge scsi-post-merge/master Already up-to-date.