--- /dev/null
+$ date
+Tue Apr 3 10:13:34 EST 2012
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at dd775ae Linux 3.4-rc1
+Merging origin/master (b1a808f Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi)
+$ git merge origin/master
+Updating dd775ae..b1a808f
+Fast-forward
+ Documentation/DocBook/device-drivers.tmpl | 17 +
+ Documentation/cgroups/cpusets.txt | 2 +-
+ Documentation/cpu-hotplug.txt | 22 +-
+ Documentation/ioctl/ioctl-number.txt | 1 +
+ arch/alpha/kernel/smp.c | 2 +-
+ arch/arm/kernel/kprobes.c | 2 +-
+ arch/arm/kernel/smp.c | 7 +-
+ arch/hexagon/kernel/smp.c | 8 +-
+ arch/ia64/kernel/acpi.c | 2 +-
+ arch/mips/cavium-octeon/smp.c | 4 +-
+ arch/mips/kernel/mips-mt-fpaff.c | 2 +-
+ arch/mips/kernel/proc.c | 2 +-
+ arch/mips/kernel/smp-bmips.c | 2 +-
+ arch/mips/kernel/smp.c | 27 +-
+ arch/mips/kernel/smtc.c | 2 +-
+ arch/mips/mm/c-octeon.c | 6 +-
+ arch/mips/netlogic/common/smp.c | 6 +-
+ arch/mips/pmc-sierra/yosemite/smp.c | 8 +-
+ arch/mips/sgi-ip27/ip27-smp.c | 2 +-
+ arch/mips/sibyte/bcm1480/smp.c | 7 +-
+ arch/mips/sibyte/sb1250/smp.c | 7 +-
+ arch/powerpc/boot/dts/p1020mbg-pc.dtsi | 151 +++++
+ arch/powerpc/boot/dts/p1020mbg-pc_32b.dts | 89 +++
+ arch/powerpc/boot/dts/p1020mbg-pc_36b.dts | 89 +++
+ arch/powerpc/boot/dts/p1020utm-pc.dtsi | 140 +++++
+ arch/powerpc/boot/dts/p1020utm-pc_32b.dts | 89 +++
+ arch/powerpc/boot/dts/p1020utm-pc_36b.dts | 89 +++
+ arch/powerpc/boot/dts/p2041rdb.dts | 3 -
+ arch/powerpc/boot/dts/p3041ds.dts | 4 -
+ arch/powerpc/boot/dts/p3060qds.dts | 2 -
+ arch/powerpc/boot/dts/p4080ds.dts | 3 -
+ arch/powerpc/boot/dts/p5020ds.dts | 4 -
+ arch/powerpc/configs/corenet32_smp_defconfig | 1 +
+ arch/powerpc/configs/corenet64_smp_defconfig | 2 +
+ arch/powerpc/configs/mpc85xx_defconfig | 1 +
+ arch/powerpc/configs/mpc85xx_smp_defconfig | 1 +
+ arch/powerpc/include/asm/epapr_hcalls.h | 7 +-
+ arch/powerpc/include/asm/fsl_guts.h | 26 +-
+ arch/powerpc/kernel/fadump.c | 2 +
+ arch/powerpc/kernel/kgdb.c | 1 +
+ arch/powerpc/kvm/book3s_emulate.c | 1 +
+ arch/powerpc/kvm/book3s_paired_singles.c | 1 +
+ arch/powerpc/kvm/book3s_pr.c | 1 +
+ arch/powerpc/platforms/52xx/mpc52xx_pci.c | 2 +-
+ arch/powerpc/platforms/85xx/mpc85xx_mds.c | 2 +-
+ arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 2 +-
+ arch/powerpc/platforms/85xx/p1022_ds.c | 4 +-
+ arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 2 +-
+ arch/powerpc/platforms/cell/qpace_setup.c | 2 +-
+ arch/powerpc/platforms/cell/setup.c | 2 +-
+ arch/powerpc/platforms/pseries/eeh_event.c | 4 +-
+ arch/powerpc/sysdev/qe_lib/qe.c | 22 +-
+ arch/sparc/kernel/leon_kernel.c | 6 +-
+ arch/tile/kernel/setup.c | 8 +-
+ arch/um/kernel/skas/process.c | 2 +-
+ arch/um/kernel/smp.c | 9 +-
+ arch/x86/xen/enlighten.c | 2 +-
+ crypto/ablkcipher.c | 4 +-
+ crypto/aead.c | 4 +-
+ crypto/crypto_user.c | 80 ++-
+ crypto/pcrypt.c | 8 +-
+ drivers/Kconfig | 2 +
+ drivers/Makefile | 1 +
+ drivers/cpufreq/db8500-cpufreq.c | 2 +-
+ drivers/hsi/Kconfig | 19 +
+ drivers/hsi/Makefile | 6 +
+ drivers/hsi/clients/Kconfig | 13 +
+ drivers/hsi/clients/Makefile | 5 +
+ drivers/hsi/clients/hsi_char.c | 802 ++++++++++++++++++++++++++
+ drivers/hsi/hsi.c | 494 ++++++++++++++++
+ drivers/hsi/hsi_boardinfo.c | 62 ++
+ drivers/hsi/hsi_core.h | 35 ++
+ drivers/net/ethernet/freescale/ucc_geth.c | 6 +-
+ include/crypto/internal/aead.h | 2 +
+ include/crypto/internal/skcipher.h | 2 +
+ include/linux/Kbuild | 1 +
+ include/linux/cpumask.h | 6 -
+ include/linux/cryptouser.h | 3 +
+ include/linux/hsi/Kbuild | 1 +
+ include/linux/hsi/hsi.h | 410 +++++++++++++
+ include/linux/hsi/hsi_char.h | 63 ++
+ init/Kconfig | 4 +-
+ kernel/cpuset.c | 10 +-
+ kernel/padata.c | 13 +-
+ scripts/tags.sh | 2 +-
+ sound/soc/fsl/mpc8610_hpcd.c | 8 +-
+ sound/soc/fsl/p1022_ds.c | 10 +-
+ 87 files changed, 2827 insertions(+), 165 deletions(-)
+ create mode 100644 arch/powerpc/boot/dts/p1020mbg-pc.dtsi
+ create mode 100644 arch/powerpc/boot/dts/p1020mbg-pc_32b.dts
+ create mode 100644 arch/powerpc/boot/dts/p1020mbg-pc_36b.dts
+ create mode 100644 arch/powerpc/boot/dts/p1020utm-pc.dtsi
+ create mode 100644 arch/powerpc/boot/dts/p1020utm-pc_32b.dts
+ create mode 100644 arch/powerpc/boot/dts/p1020utm-pc_36b.dts
+ create mode 100644 drivers/hsi/Kconfig
+ create mode 100644 drivers/hsi/Makefile
+ create mode 100644 drivers/hsi/clients/Kconfig
+ create mode 100644 drivers/hsi/clients/Makefile
+ create mode 100644 drivers/hsi/clients/hsi_char.c
+ create mode 100644 drivers/hsi/hsi.c
+ create mode 100644 drivers/hsi/hsi_boardinfo.c
+ create mode 100644 drivers/hsi/hsi_core.h
+ create mode 100644 include/linux/hsi/Kbuild
+ create mode 100644 include/linux/hsi/hsi.h
+ create mode 100644 include/linux/hsi/hsi_char.h
+Merging fixes/master (b1a808f Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi)
+$ git merge fixes/master
+Already up-to-date.
+Merging kbuild-current/rc-fixes (0eb043d Subject: [PATCH] tags.sh: Add missing quotes)
+$ git merge kbuild-current/rc-fixes
+Already up-to-date.
+Merging arm-current/fixes (6d00889 ARM: fix more fallout from 9f97da78bf (Disintegrate asm/system.h for ARM))
+$ git merge arm-current/fixes
+Merge made by the 'recursive' strategy.
+ arch/arm/kernel/bios32.c | 1 -
+ arch/arm/kernel/insn.c | 1 +
+ arch/arm/kernel/ptrace.c | 4 +++-
+ arch/arm/mach-omap2/include/mach/barriers.h | 2 ++
+ drivers/dma/sa11x0-dma.c | 2 +-
+ drivers/net/irda/sa1100_ir.c | 2 +-
+ 6 files changed, 8 insertions(+), 4 deletions(-)
+Merging m68k-current/for-linus (450aed7 m68k/q40: Add missing platform check before registering platform devices)
+$ git merge m68k-current/for-linus
+Merge made by the 'recursive' strategy.
+ arch/m68k/include/asm/atomic.h | 1 +
+ arch/m68k/mac/config.c | 3 +++
+ arch/m68k/q40/config.c | 3 +++
+ 3 files changed, 7 insertions(+)
+Merging powerpc-merge/merge (9b218f6 powerpc/eeh: Fix use of set_current_state() in eeh event handling set_current_state() wart)
+$ git merge powerpc-merge/merge
+Already up-to-date.
+Merging sparc/master (2533e82 sparc: pgtable_64: change include order)
+$ git merge sparc/master
+Merge made by the 'recursive' strategy.
+ arch/sparc/include/asm/pgtable_64.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging scsi-rc-fixes/master (41f8ad7 [SCSI] osd_uld: Bump MAX_OSD_DEVICES from 64 to 1,048,576)
+$ git merge scsi-rc-fixes/master
+Already up-to-date.
+Merging net/master (2240eb4 sky2: dont overwrite settings for PHY Quick link)
+$ git merge net/master
+Auto-merging net/rose/rose_dev.c
+Auto-merging net/ipv4/route.c
+Auto-merging net/core/dev.c
+Auto-merging drivers/net/ethernet/broadcom/tg3.c
+Auto-merging drivers/net/bonding/bond_main.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 13 +-
+ arch/x86/net/bpf_jit_comp.c | 2 +-
+ drivers/isdn/hardware/mISDN/avmfritz.c | 2 +-
+ drivers/isdn/hardware/mISDN/hfcpci.c | 2 +-
+ drivers/isdn/hardware/mISDN/hfcsusb.c | 2 +-
+ drivers/isdn/hardware/mISDN/mISDNipac.c | 2 +-
+ drivers/isdn/hardware/mISDN/mISDNisar.c | 2 +-
+ drivers/isdn/hardware/mISDN/netjet.c | 2 +-
+ drivers/isdn/hardware/mISDN/w6692.c | 2 +-
+ drivers/net/bonding/bond_main.c | 8 +-
+ drivers/net/eql.c | 7 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 7 +
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 40 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 3 +
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 3 +
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 1 -
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 2 +
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 464 ++++++++++++++++----
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 4 +
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 2 +-
+ drivers/net/ethernet/broadcom/tg3.c | 4 +-
+ drivers/net/ethernet/freescale/fsl_pq_mdio.c | 12 +-
+ drivers/net/ethernet/intel/e1000/e1000_main.c | 40 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 7 +-
+ drivers/net/ethernet/intel/igb/igb_main.c | 7 +-
+ drivers/net/ethernet/intel/igbvf/netdev.c | 7 +-
+ drivers/net/ethernet/intel/ixgb/ixgb_main.c | 6 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 13 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 7 +-
+ drivers/net/ethernet/marvell/sky2.c | 5 +-
+ drivers/net/ethernet/nxp/lpc_eth.c | 2 +-
+ drivers/net/ethernet/renesas/Kconfig | 5 +-
+ drivers/net/ethernet/renesas/sh_eth.c | 22 +-
+ drivers/net/ethernet/renesas/sh_eth.h | 15 +-
+ drivers/net/ethernet/via/via-rhine.c | 12 +-
+ drivers/net/rionet.c | 11 +-
+ drivers/net/usb/cdc-phonet.c | 4 +-
+ drivers/net/usb/cdc_eem.c | 1 +
+ drivers/net/usb/rtl8150.c | 26 --
+ drivers/net/usb/zaurus.c | 5 +
+ drivers/net/virtio_net.c | 7 +-
+ drivers/net/wimax/i2400m/netdev.c | 3 +-
+ drivers/net/wimax/i2400m/usb.c | 18 +
+ drivers/net/wireless/ath/ath9k/calib.c | 5 +-
+ drivers/net/wireless/ath/ath9k/init.c | 2 +-
+ drivers/net/wireless/ath/ath9k/main.c | 4 +-
+ drivers/net/wireless/ath/ath9k/recv.c | 4 +-
+ drivers/net/wireless/ipw2x00/ipw2200.c | 4 +-
+ drivers/net/wireless/iwlegacy/3945-mac.c | 2 -
+ drivers/net/wireless/iwlegacy/4965-mac.c | 2 -
+ drivers/net/wireless/iwlegacy/common.c | 31 +-
+ drivers/net/wireless/orinoco/main.c | 8 +
+ drivers/net/wireless/rt2x00/rt2800usb.c | 10 +-
+ drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 2 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 2 +-
+ drivers/usb/gadget/f_phonet.c | 2 +-
+ include/linux/if_eql.h | 2 +-
+ include/net/cfg80211.h | 6 +-
+ net/802/garp.c | 22 +-
+ net/core/dev.c | 1 +
+ net/ipv4/route.c | 2 +-
+ net/ipv6/route.c | 34 +-
+ net/mac80211/agg-rx.c | 3 +-
+ net/mac80211/main.c | 3 -
+ net/mac80211/scan.c | 2 +-
+ net/netfilter/nfnetlink_acct.c | 2 +-
+ net/rose/rose_dev.c | 4 +-
+ net/wireless/nl80211.c | 29 +-
+ 69 files changed, 705 insertions(+), 294 deletions(-)
+Merging sound-current/for-linus (c578ae0 ALSA: fix isa/opti9xx module param type)
+$ git merge sound-current/for-linus
+Already up-to-date.
+Merging pci-current/for-linus (4949be1 PCI: ignore pre-1.1 ASPM quirking when ASPM is disabled)
+$ git merge pci-current/for-linus
+Already up-to-date.
+Merging wireless/master (de312db mac80211: fix oper channel timestamp updation)
+$ git merge wireless/master
+Already up-to-date.
+Merging driver-core.current/driver-core-linus (dd775ae Linux 3.4-rc1)
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus (dd775ae Linux 3.4-rc1)
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus (dd775ae Linux 3.4-rc1)
+$ git merge usb.current/usb-linus
+Already up-to-date.
+Merging staging.current/staging-linus (dd775ae Linux 3.4-rc1)
+$ git merge staging.current/staging-linus
+Already up-to-date.
+Merging char-misc.current/char-misc-linus (dd775ae Linux 3.4-rc1)
+$ git merge char-misc.current/char-misc-linus
+Already up-to-date.
+Merging cpufreq-current/fixes (6139b65 Merge branch 'for_3.4/cpufreq' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes)
+$ git merge cpufreq-current/fixes
+Already up-to-date.
+Merging input-current/for-linus (f182394 Input: wacom - check for allocation failure in probe())
+$ git merge input-current/for-linus
+Already up-to-date.
+Merging md-current/for-linus (ecb178b md: Add judgement bb->unacked_exist in function md_ack_all_badblocks().)
+$ git merge md-current/for-linus
+Already up-to-date.
+Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
+$ git merge audit-current/for-linus
+Already up-to-date.
+Merging crypto-current/master (5219a53 crypto: user - Fix size of netlink dump message)
+$ git merge crypto-current/master
+Already up-to-date.
+Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
+$ git merge ide/master
+Already up-to-date.
+Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
+$ git merge dwmw2/master
+Already up-to-date.
+Merging irqdomain-current/irqdomain/merge (d4886bc irqdomain/powerpc: updated defconfigs for VIRQ_DEBUG rename)
+$ git merge irqdomain-current/irqdomain/merge
+Already up-to-date.
+Merging devicetree-current/devicetree/merge (31134ef dt: Linux DT usage model documentation)
+$ git merge devicetree-current/devicetree/merge
+Already up-to-date.
+Merging spi-current/spi/merge (cc4d22a spi/imx: mark base member in spi_imx_data as __iomem)
+$ git merge spi-current/spi/merge
+Merge made by the 'recursive' strategy.
+ drivers/spi/spi-davinci.c | 6 +++---
+ drivers/spi/spi-fsl-spi.c | 4 +++-
+ drivers/spi/spi-imx.c | 2 +-
+ include/linux/amba/pl022.h | 2 ++
+ 4 files changed, 9 insertions(+), 5 deletions(-)
+Merging gpio-current/gpio/merge (d7ce1db gpio/sodaville: Convert sodaville driver to new irqdomain API)
+$ git merge gpio-current/gpio/merge
+Merge made by the 'recursive' strategy.
+ drivers/gpio/Kconfig | 2 +-
+ drivers/gpio/gpio-sodaville.c | 23 ++++++++++-------------
+ 2 files changed, 11 insertions(+), 14 deletions(-)
+Merging arm/for-next (6d00889 ARM: fix more fallout from 9f97da78bf (Disintegrate asm/system.h for ARM))
+$ git merge arm/for-next
+Already up-to-date.
+Merging arm-perf/for-next/perf (c16fa4f Linux 3.3)
+$ git merge arm-perf/for-next/perf
+Already up-to-date.
+Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
+$ git merge davinci/davinci-next
+Already up-to-date.
+Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
+$ git merge samsung/next-samsung
+Already up-to-date.
+Merging s5p/for-next (dd775ae Linux 3.4-rc1)
+$ git merge s5p/for-next
+Already up-to-date.
+Merging tegra/for-next (8c3ec84 ARM: tegra: Fix device tree AUXDATA for USB/EHCI)
+$ git merge tegra/for-next
+Already up-to-date.
+Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
+$ git merge xilinx/arm-next
+Already up-to-date.
+Merging blackfin/for-linus (0172c0a blackfin: gpio: fix compile error if !CONFIG_GPIOLIB)
+$ git merge blackfin/for-linus
+Merge made by the 'recursive' strategy.
+ arch/blackfin/Kconfig | 2 +-
+ arch/blackfin/include/asm/gpio.h | 14 ++++++++++++--
+ 2 files changed, 13 insertions(+), 3 deletions(-)
+Merging c6x/for-linux-next (fde7d90 Linux 3.3-rc7)
+$ git merge c6x/for-linux-next
+Already up-to-date.
+Merging cris/for-next (ea78f5b CRIS: Update documentation)
+$ git merge cris/for-next
+Auto-merging drivers/net/cris/eth_v10.c
+Auto-merging arch/cris/arch-v32/kernel/ptrace.c
+Auto-merging arch/cris/arch-v32/drivers/cryptocop.c
+Merge made by the 'recursive' strategy.
+ Documentation/cris/README | 62 +++++++++++++++----------------
+ arch/cris/arch-v32/drivers/cryptocop.c | 6 +--
+ arch/cris/arch-v32/kernel/ptrace.c | 2 -
+ arch/cris/include/arch-v32/arch/cache.h | 2 +-
+ drivers/net/cris/eth_v10.c | 1 -
+ 5 files changed, 34 insertions(+), 39 deletions(-)
+Merging quilt/hexagon (110b372 Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h)
+$ git merge quilt/hexagon
+Resolved 'arch/hexagon/Kconfig' using previous resolution.
+Auto-merging arch/hexagon/kernel/vdso.c
+Auto-merging arch/hexagon/kernel/ptrace.c
+Auto-merging arch/hexagon/Kconfig
+CONFLICT (content): Merge conflict in arch/hexagon/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master db3b694] Merge branch 'quilt/hexagon'
+$ git diff -M --stat --summary HEAD^..
+ arch/hexagon/Kconfig | 23 ++++-------------------
+ arch/hexagon/Makefile | 4 ----
+ arch/hexagon/include/asm/spinlock_types.h | 2 --
+ arch/hexagon/kernel/dma.c | 1 +
+ arch/hexagon/kernel/ptrace.c | 1 +
+ arch/hexagon/kernel/time.c | 7 +++----
+ arch/hexagon/kernel/vdso.c | 1 +
+ 7 files changed, 10 insertions(+), 29 deletions(-)
+Merging ia64/next (16f2634 [IA64] Normalize return value of chip->irq_set_affinity() method)
+$ git merge ia64/next
+Auto-merging arch/ia64/sn/kernel/irq.c
+Auto-merging arch/ia64/kernel/msi_ia64.c
+Auto-merging arch/ia64/kernel/iosapic.c
+Merge made by the 'recursive' strategy.
+ arch/ia64/kernel/iosapic.c | 4 +++-
+ arch/ia64/kernel/msi_ia64.c | 4 ++--
+ arch/ia64/sn/kernel/irq.c | 2 +-
+ arch/ia64/sn/kernel/msi_sn.c | 2 +-
+ 4 files changed, 7 insertions(+), 5 deletions(-)
+Merging m68k/for-next (1a9268f scsi/atari: Make more functions static)
+$ git merge m68k/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/amiga/platform.c | 126 ++++++++++++++++++++++++---------
+ arch/m68k/atari/ataints.c | 4 +-
+ arch/m68k/include/asm/atariints.h | 4 +-
+ arch/m68k/include/asm/entry.h | 2 -
+ drivers/net/ethernet/amd/ariadne.c | 8 +--
+ drivers/net/ethernet/amd/atarilance.c | 11 ++-
+ drivers/scsi/atari_scsi.c | 26 ++++---
+ drivers/scsi/atari_scsi.h | 5 --
+ 8 files changed, 122 insertions(+), 64 deletions(-)
+Merging m68knommu/for-next (ae909ea m68knommu: factor more common ColdFire cpu reset code)
+$ git merge m68knommu/for-next
+Already up-to-date.
+Merging microblaze/next (0dd90aa microblaze: Fix ret_from_fork declaration)
+$ git merge microblaze/next
+Merge made by the 'recursive' strategy.
+ arch/microblaze/include/asm/cmpxchg.h | 2 +
+ arch/microblaze/include/asm/futex.h | 2 +-
+ arch/microblaze/include/asm/processor.h | 4 +-
+ arch/microblaze/kernel/early_printk.c | 2 +
+ arch/microblaze/kernel/setup.c | 2 +
+ arch/microblaze/kernel/unwind.c | 1 +
+ arch/microblaze/lib/uaccess_old.S | 98 +++++++++++++++++++------------
+ 7 files changed, 72 insertions(+), 39 deletions(-)
+Merging mips/mips-for-linux-next (2fea377 Merge branch 'fixes-for-linus' into mips-for-linux-next)
+$ git merge mips/mips-for-linux-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging openrisc/for-upstream (fa8d9d7 OpenRISC: Remove memory_start/end prototypes)
+$ git merge openrisc/for-upstream
+Already up-to-date.
+Merging parisc/for-next (c60dc74 Merge branch 'fixes' into for-next)
+$ git merge parisc/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging powerpc/next (0195c00 Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system)
+$ git merge powerpc/next
+Already up-to-date.
+Merging 4xx/next (b5594a7 powerpc/44x: Add additional device support for APM821xx SoC and Bluestone board)
+$ git merge 4xx/next
+Already up-to-date.
+Merging mpc5xxx/next (7b6bb64 powerpc/5200: convert mpc5200 to use of_platform_populate())
+$ git merge mpc5xxx/next
+Merge made by the 'recursive' strategy.
+Merging galak/next (fa1b42b powerpc/qe: Update the SNUM table for MPC8569 Rev2.0)
+$ git merge galak/next
+Already up-to-date.
+Merging s390/features (b7918da [S390] update default configuration)
+$ git merge s390/features
+Merge made by the 'recursive' strategy.
+ arch/s390/Kconfig | 1 -
+ arch/s390/defconfig | 37 +++++++++++------------
+ arch/s390/include/asm/pgalloc.h | 3 --
+ arch/s390/include/asm/tlb.h | 22 +-------------
+ arch/s390/mm/maccess.c | 27 +++++++++++------
+ arch/s390/mm/pgtable.c | 63 +++++++++++++++++++++++++++++++++++++--
+ drivers/s390/block/dasd_eckd.c | 24 ++++++++++-----
+ drivers/s390/char/vmur.c | 2 +-
+ 8 files changed, 114 insertions(+), 65 deletions(-)
+Merging sparc-next/master (e9b57cc sparc: Use vsprintf extention %pf with builtin_return_address)
+$ git merge sparc-next/master
+Auto-merging arch/sparc/kernel/unaligned_64.c
+Auto-merging arch/sparc/kernel/ds.c
+Merge made by the 'recursive' strategy.
+ arch/sparc/kernel/ds.c | 2 +-
+ arch/sparc/kernel/unaligned_64.c | 1 -
+ arch/sparc/mm/srmmu.c | 2 +-
+ 3 files changed, 2 insertions(+), 3 deletions(-)
+Merging tile/master (a6a18aa arch/tile: add descriptive text if the kernel reports a bad trap)
+$ git merge tile/master
+Auto-merging arch/tile/kernel/setup.c
+Merge made by the 'recursive' strategy.
+ arch/tile/Kconfig | 33 +
+ arch/tile/include/arch/spr_def_32.h | 56 ++
+ arch/tile/include/arch/spr_def_64.h | 43 ++
+ arch/tile/include/asm/Kbuild | 2 +-
+ arch/tile/include/asm/atomic.h | 50 +-
+ arch/tile/include/asm/atomic_32.h | 10 +
+ arch/tile/include/asm/byteorder.h | 20 +
+ arch/tile/include/asm/cachectl.h | 42 ++
+ arch/tile/include/asm/cmpxchg.h | 73 ++
+ arch/tile/include/asm/compat.h | 3 -
+ arch/tile/include/asm/elf.h | 5 +
+ arch/tile/include/asm/futex.h | 143 ++--
+ arch/tile/include/asm/hardwall.h | 18 +-
+ arch/tile/include/asm/hugetlb.h | 21 +
+ arch/tile/include/asm/irqflags.h | 34 +-
+ arch/tile/include/asm/kexec.h | 12 +
+ arch/tile/include/asm/mmu.h | 2 +-
+ arch/tile/include/asm/mmu_context.h | 8 +-
+ arch/tile/include/asm/module.h | 40 ++
+ arch/tile/include/asm/page.h | 18 +-
+ arch/tile/include/asm/pgalloc.h | 92 ++-
+ arch/tile/include/asm/pgtable.h | 111 ++-
+ arch/tile/include/asm/pgtable_32.h | 40 +-
+ arch/tile/include/asm/pgtable_64.h | 57 +-
+ arch/tile/include/asm/processor.h | 17 +-
+ arch/tile/include/asm/setup.h | 10 +-
+ arch/tile/include/asm/syscalls.h | 3 +-
+ arch/tile/include/asm/tlbflush.h | 17 +-
+ arch/tile/include/asm/uaccess.h | 222 +++---
+ arch/tile/include/asm/unistd.h | 4 +-
+ arch/tile/include/hv/drv_xgbe_intf.h | 2 +-
+ arch/tile/include/hv/hypervisor.h | 309 +++++---
+ arch/tile/kernel/Makefile | 3 +-
+ arch/tile/kernel/entry.S | 3 +-
+ arch/tile/kernel/hardwall.c | 754 +++++++++++++-------
+ arch/tile/kernel/head_32.S | 8 +-
+ arch/tile/kernel/head_64.S | 22 +-
+ arch/tile/kernel/hvglue.lds | 3 +-
+ arch/tile/kernel/intvec_64.S | 80 ++-
+ arch/tile/kernel/machine_kexec.c | 42 +-
+ arch/tile/kernel/module.c | 12 +-
+ arch/tile/kernel/proc.c | 1 +
+ arch/tile/kernel/process.c | 17 +-
+ .../{relocate_kernel.S => relocate_kernel_32.S} | 0
+ arch/tile/kernel/relocate_kernel_64.S | 260 +++++++
+ arch/tile/kernel/setup.c | 160 +++--
+ arch/tile/kernel/single_step.c | 16 +-
+ arch/tile/kernel/smp.c | 2 +-
+ arch/tile/kernel/stack.c | 14 +-
+ arch/tile/kernel/sys.c | 10 +-
+ arch/tile/kernel/sysfs.c | 8 +
+ arch/tile/kernel/tlb.c | 11 +-
+ arch/tile/kernel/traps.c | 30 +-
+ arch/tile/lib/atomic_32.c | 47 +-
+ arch/tile/lib/exports.c | 8 -
+ arch/tile/lib/memchr_64.c | 8 +-
+ arch/tile/lib/memcpy_64.c | 23 +-
+ arch/tile/lib/memcpy_tile64.c | 8 +-
+ arch/tile/lib/strchr_64.c | 15 +-
+ arch/tile/lib/string-endian.h | 33 +
+ arch/tile/lib/strlen_64.c | 11 +-
+ arch/tile/lib/usercopy_32.S | 76 --
+ arch/tile/lib/usercopy_64.S | 49 --
+ arch/tile/mm/fault.c | 2 +-
+ arch/tile/mm/homecache.c | 1 +
+ arch/tile/mm/hugetlbpage.c | 241 +++++--
+ arch/tile/mm/init.c | 19 +-
+ arch/tile/mm/migrate.h | 6 +
+ arch/tile/mm/migrate_32.S | 36 +-
+ arch/tile/mm/migrate_64.S | 34 +-
+ arch/tile/mm/pgtable.c | 40 +-
+ drivers/net/ethernet/tile/tilepro.c | 2 +-
+ include/asm-generic/pgtable.h | 5 +-
+ include/linux/hugetlb.h | 8 +
+ mm/hugetlb.c | 1 +
+ mm/pgtable-generic.c | 4 +-
+ 76 files changed, 2445 insertions(+), 1205 deletions(-)
+ create mode 100644 arch/tile/include/asm/cachectl.h
+ create mode 100644 arch/tile/include/asm/cmpxchg.h
+ create mode 100644 arch/tile/include/asm/module.h
+ rename arch/tile/kernel/{relocate_kernel.S => relocate_kernel_32.S} (100%)
+ create mode 100644 arch/tile/kernel/relocate_kernel_64.S
+ create mode 100644 arch/tile/lib/string-endian.h
+Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two"))
+$ git merge unicore32/unicore32
+Already up-to-date.
+Merging ceph/master (c666601 rbd: move snap_rwsem to the device, rename to header_rwsem)
+$ git merge ceph/master
+Already up-to-date.
+Merging cifs/master (66189be CIFS: Fix VFS lock usage for oplocked files)
+$ git merge cifs/master
+Merge made by the 'recursive' strategy.
+ fs/cifs/cifssmb.c | 24 ++++++++++++------------
+ fs/cifs/file.c | 10 +++++++++-
+ fs/cifs/netmisc.c | 3 +--
+ fs/locks.c | 3 ++-
+ include/linux/fs.h | 5 +++++
+ 5 files changed, 29 insertions(+), 16 deletions(-)
+Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
+$ git merge configfs/linux-next
+Already up-to-date.
+Merging ecryptfs/next (6cfd4b4 ecryptfs: remove the second argument of k[un]map_atomic())
+$ git merge ecryptfs/next
+Resolved 'fs/ecryptfs/ecryptfs_kernel.h' using previous resolution.
+Auto-merging fs/ecryptfs/mmap.c
+Auto-merging fs/ecryptfs/ecryptfs_kernel.h
+CONFLICT (content): Merge conflict in fs/ecryptfs/ecryptfs_kernel.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 625f676] Merge remote-tracking branch 'ecryptfs/next'
+$ git diff -M --stat --summary HEAD^..
+ fs/ecryptfs/mmap.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+Merging ext3/for_next (c2d9fae ext2: Remove s_dirt handling)
+$ git merge ext3/for_next
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/ext3.txt | 6 +++---
+ fs/ext2/balloc.c | 2 --
+ fs/ext2/ialloc.c | 2 --
+ fs/ext2/super.c | 6 ------
+ fs/ext2/xattr.c | 1 -
+ fs/ext3/ialloc.c | 20 ++------------------
+ fs/jbd/commit.c | 10 +++++++---
+ fs/jbd/journal.c | 2 ++
+ fs/jbd/transaction.c | 2 --
+ include/linux/jbd.h | 15 +++++++++------
+ include/trace/events/jbd.h | 24 ++++++++----------------
+ 11 files changed, 31 insertions(+), 59 deletions(-)
+Merging ext4/dev (9d547c3 vfs: remove unused superblock helpers)
+$ git merge ext4/dev
+Already up-to-date.
+Merging fuse/for-next (4273b79 fuse: O_DIRECT support for files)
+$ git merge fuse/for-next
+Auto-merging fs/fuse/file.c
+Merge made by the 'recursive' strategy.
+ fs/fuse/dir.c | 25 ++++++-----
+ fs/fuse/file.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++++--------
+ 2 files changed, 127 insertions(+), 27 deletions(-)
+Merging gfs2/master (dfa8511 GFS2: use depends instead of select in kconfig)
+$ git merge gfs2/master
+Merge made by the 'recursive' strategy.
+ fs/gfs2/Kconfig | 7 ++-----
+ fs/gfs2/rgrp.c | 1 +
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+Merging logfs/master (dd775ae Linux 3.4-rc1)
+$ git merge logfs/master
+Already up-to-date.
+Merging nfs/linux-next (b1a808f Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi)
+$ git merge nfs/linux-next
+Already up-to-date.
+Merging nfsd/nfsd-next (797a9d7 nfsd: only register cld pipe notifier when CONFIG_NFSD_V4 is enabled)
+$ git merge nfsd/nfsd-next
+Already up-to-date.
+Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap)
+$ git merge ocfs2/linux-next
+Already up-to-date.
+Merging omfs/for-next (976d167 Linux 3.1-rc9)
+$ git merge omfs/for-next
+Already up-to-date.
+Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
+$ git merge squashfs/master
+Already up-to-date.
+Merging v9fs/for-next (5bdad93 9p: statfs should not override server f_type)
+$ git merge v9fs/for-next
+Already up-to-date.
+Merging ubifs/linux-next (dd775ae Linux 3.4-rc1)
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/for-next (5a5881c xfs: add lots of attribute trace points)
+$ git merge xfs/for-next
+Already up-to-date.
+Merging vfs/for-next (07c0c5d ext4: initialization of ext4_li_mtx needs to be done earlier)
+$ git merge vfs/for-next
+Already up-to-date.
+Merging pci/linux-next (1488d51 PCI: Bjorn gets PCI hotplug too)
+$ git merge pci/linux-next
+Already up-to-date.
+Merging hid/for-next (d464c92 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
+$ git merge hid/for-next
+Already up-to-date.
+Merging quilt/i2c (48a4675 Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound)
+$ git merge quilt/i2c
+Already up-to-date.
+Merging bjdooks-i2c/next-i2c (fc84fe1 Merge branch 'for_3.3/i2c/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-33/i2c/omap)
+$ git merge bjdooks-i2c/next-i2c
+Resolved 'drivers/i2c/busses/i2c-omap.c' using previous resolution.
+Auto-merging drivers/i2c/busses/i2c-omap.c
+CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 9b25448] Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
+$ git diff -M --stat --summary HEAD^..
+Merging i2c-embedded/i2c-embedded/for-next (bbceeee i2c-eg20t: Remove write-only variables)
+$ git merge i2c-embedded/i2c-embedded/for-next
+Already up-to-date.
+Merging quilt/jdelvare-hwmon (e3a9568 hwmon: Add MCP3021 ADC driver)
+$ git merge quilt/jdelvare-hwmon
+Merge made by the 'recursive' strategy.
+Merging hwmon-staging/hwmon-next (3cd99d4 hwmon: (it87) Add support for IT8782F and IT8783E/F)
+$ git merge hwmon-staging/hwmon-next
+Merge made by the 'recursive' strategy.
+ Documentation/hwmon/it87 | 28 ++++++---
+ Documentation/hwmon/k10temp | 2 +-
+ drivers/hwmon/Kconfig | 7 ++-
+ drivers/hwmon/acpi_power_meter.c | 2 +
+ drivers/hwmon/adm1031.c | 20 +++---
+ drivers/hwmon/f75375s.c | 2 +
+ drivers/hwmon/it87.c | 125 ++++++++++++++++++++++++++++++--------
+ drivers/hwmon/k10temp.c | 4 ++
+ drivers/hwmon/max6639.c | 15 +++--
+ drivers/hwmon/w83627ehf.c | 18 +++---
+ 10 files changed, 159 insertions(+), 64 deletions(-)
+Merging quilt/kernel-doc (c16fa4f Linux 3.3)
+$ git merge quilt/kernel-doc
+Already up-to-date.
+Merging docs/docs-move (5c24d8b Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move)
+$ git merge docs/docs-move
+Already up-to-date.
+Merging v4l-dvb/master (2f6edcb Merge branch 'poll')
+$ git merge v4l-dvb/master
+Merge made by the 'recursive' strategy.
+ drivers/media/video/ivtv/ivtv-fileops.c | 6 ++--
+ drivers/media/video/pwc/pwc-if.c | 9 ++++++
+ drivers/media/video/pwc/pwc-v4l.c | 2 ++
+ drivers/media/video/videobuf-core.c | 3 +-
+ drivers/media/video/videobuf2-core.c | 48 +++++++++++++++++++++----------
+ drivers/media/video/vivi.c | 9 +-----
+ 6 files changed, 51 insertions(+), 26 deletions(-)
+Merging kbuild/for-next (51cbc3e Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
+$ git merge kbuild/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
+$ git merge kconfig/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging libata/NEXT (b8cec3c pata_cmd64x: implement sff_irq_check() method)
+$ git merge libata/NEXT
+Already up-to-date.
+Merging infiniband/for-next (5ad19b0 Merge branches 'cma', 'cxgb3', 'cxgb4', 'ehca', 'iser', 'mad', 'nes', 'qib', 'srp' and 'srpt' into for-next)
+$ git merge infiniband/for-next
+Merge made by the 'recursive' strategy.
+Merging acpi/next (d326f44 Merge branch 'tboot' into release)
+$ git merge acpi/next
+Already up-to-date.
+Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
+$ git merge cpupowerutils/master
+Already up-to-date.
+Merging ieee1394/for-next (19f8399 Merge branch 'iso-flush' into for-next)
+$ git merge ieee1394/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging ubi/linux-next (cc83146 UBI: rename MOVE_CANCEL_BITFLIPS to MOVE_TARGET_BITFLIPS)
+$ git merge ubi/linux-next
+Already up-to-date.
+Merging dlm/next (1b189b8 dlm: last element of dlm_local_addr[] never used)
+$ git merge dlm/next
+Already up-to-date.
+Merging scsi/master (6993169 [SCSI] ipr: Driver version 2.5.3)
+$ git merge scsi/master
+Already up-to-date.
+Merging target-updates/for-next (187e70a ib_srpt: Fix srpt_handle_cmd send_ioctx->ioctx_kref leak on exception)
+$ git merge target-updates/for-next
+Already up-to-date.
+Merging target-merge/for-next-merge (06de5ee tcm_qla2xxx: Add >= 24xx series fabric module for target-core)
+$ git merge target-merge/for-next-merge
+Merge made by the 'recursive' strategy.
+ drivers/scsi/qla2xxx/Kconfig | 8 +
+ drivers/scsi/qla2xxx/Makefile | 3 +-
+ drivers/scsi/qla2xxx/qla_attr.c | 5 +-
+ drivers/scsi/qla2xxx/qla_dbg.c | 5 +
+ drivers/scsi/qla2xxx/qla_dbg.h | 5 +
+ drivers/scsi/qla2xxx/qla_def.h | 69 +-
+ drivers/scsi/qla2xxx/qla_gbl.h | 7 +
+ drivers/scsi/qla2xxx/qla_gs.c | 4 +-
+ drivers/scsi/qla2xxx/qla_init.c | 82 +-
+ drivers/scsi/qla2xxx/qla_iocb.c | 102 +-
+ drivers/scsi/qla2xxx/qla_isr.c | 83 +-
+ drivers/scsi/qla2xxx/qla_mbx.c | 101 +
+ drivers/scsi/qla2xxx/qla_mid.c | 17 +-
+ drivers/scsi/qla2xxx/qla_os.c | 133 +-
+ drivers/scsi/qla2xxx/qla_target.c | 4724 ++++++++++++++++++++++++++++++++++++
+ drivers/scsi/qla2xxx/qla_target.h | 986 ++++++++
+ drivers/scsi/qla2xxx/tcm_qla2xxx.c | 1981 +++++++++++++++
+ drivers/scsi/qla2xxx/tcm_qla2xxx.h | 149 ++
+ 18 files changed, 8429 insertions(+), 35 deletions(-)
+ create mode 100644 drivers/scsi/qla2xxx/qla_target.c
+ create mode 100644 drivers/scsi/qla2xxx/qla_target.h
+ create mode 100644 drivers/scsi/qla2xxx/tcm_qla2xxx.c
+ create mode 100644 drivers/scsi/qla2xxx/tcm_qla2xxx.h
+Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
+$ git merge ibft/linux-next
+Already up-to-date.
+Merging isci/all (fbabacb Merge branches 'devel', 'rnc-devel' and 'fixes' into all)
+$ git merge isci/all
+Auto-merging lib/kobject.c
+Auto-merging fs/sysfs/dir.c
+Auto-merging drivers/scsi/sd.c
+Auto-merging drivers/scsi/scsi_lib.c
+Auto-merging drivers/scsi/mvsas/mv_sas.c
+Auto-merging drivers/scsi/isci/request.c
+Auto-merging drivers/scsi/isci/host.c
+Auto-merging drivers/scsi/ipr.c
+Auto-merging Documentation/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/kernel-parameters.txt | 3 +
+ drivers/ata/libata-core.c | 67 ++-
+ drivers/ata/libata-eh.c | 59 +-
+ drivers/ata/libata-scsi.c | 35 +-
+ drivers/ata/libata.h | 2 +-
+ drivers/scsi/ipr.c | 6 +-
+ drivers/scsi/isci/host.c | 705 ++++++++--------------
+ drivers/scsi/isci/host.h | 126 ++--
+ drivers/scsi/isci/init.c | 271 ++++++++-
+ drivers/scsi/isci/phy.c | 76 ++-
+ drivers/scsi/isci/phy.h | 9 +-
+ drivers/scsi/isci/port.c | 68 ++-
+ drivers/scsi/isci/port.h | 11 +-
+ drivers/scsi/isci/port_config.c | 18 +-
+ drivers/scsi/isci/probe_roms.c | 12 -
+ drivers/scsi/isci/probe_roms.h | 2 -
+ drivers/scsi/isci/registers.h | 8 +
+ drivers/scsi/isci/remote_device.c | 576 +++++++++++++-----
+ drivers/scsi/isci/remote_device.h | 63 +-
+ drivers/scsi/isci/remote_node_context.c | 393 ++++++++----
+ drivers/scsi/isci/remote_node_context.h | 43 +-
+ drivers/scsi/isci/request.c | 715 ++++++++++------------
+ drivers/scsi/isci/request.h | 125 +---
+ drivers/scsi/isci/scu_completion_codes.h | 2 +
+ drivers/scsi/isci/task.c | 800 +++++--------------------
+ drivers/scsi/isci/task.h | 132 +---
+ drivers/scsi/isci/unsolicited_frame_control.c | 30 +-
+ drivers/scsi/isci/unsolicited_frame_control.h | 6 +-
+ drivers/scsi/libsas/sas_ata.c | 158 ++++-
+ drivers/scsi/libsas/sas_discover.c | 153 +++--
+ drivers/scsi/libsas/sas_dump.c | 1 +
+ drivers/scsi/libsas/sas_event.c | 40 +-
+ drivers/scsi/libsas/sas_expander.c | 91 ++-
+ drivers/scsi/libsas/sas_init.c | 140 ++++-
+ drivers/scsi/libsas/sas_internal.h | 7 +-
+ drivers/scsi/libsas/sas_phy.c | 42 +-
+ drivers/scsi/libsas/sas_port.c | 67 ++-
+ drivers/scsi/libsas/sas_scsi_host.c | 195 +++++-
+ drivers/scsi/mvsas/mv_sas.c | 21 +-
+ drivers/scsi/pm8001/pm8001_sas.c | 37 +-
+ drivers/scsi/scsi.c | 4 +
+ drivers/scsi/scsi_lib.c | 10 +-
+ drivers/scsi/scsi_pm.c | 2 +-
+ drivers/scsi/scsi_priv.h | 2 +
+ drivers/scsi/scsi_transport_sas.c | 6 +-
+ drivers/scsi/sd.c | 5 +-
+ fs/sysfs/dir.c | 3 +
+ include/linux/libata.h | 19 +-
+ include/scsi/libsas.h | 90 ++-
+ include/scsi/sas.h | 1 +
+ include/scsi/sas_ata.h | 19 +-
+ lib/kobject.c | 14 +-
+ 52 files changed, 2944 insertions(+), 2546 deletions(-)
+Merging slave-dma/next (dd775ae Linux 3.4-rc1)
+$ git merge slave-dma/next
+Already up-to-date.
+Merging dmaengine/next (3d9ea9e iop-adma: Corrected array overflow in RAID6 Xscale(R) test.)
+$ git merge dmaengine/next
+Auto-merging drivers/dma/iop-adma.c
+Auto-merging drivers/dma/ioat/dma_v3.c
+Auto-merging drivers/dma/ioat/dma_v2.c
+Auto-merging drivers/dma/ioat/dma.h
+Auto-merging drivers/dma/ioat/dma.c
+Merge made by the 'recursive' strategy.
+ drivers/dma/ioat/dma.c | 16 ++++++++--------
+ drivers/dma/ioat/dma.h | 6 +++---
+ drivers/dma/ioat/dma_v2.c | 8 ++++----
+ drivers/dma/ioat/dma_v3.c | 8 ++++----
+ drivers/dma/iop-adma.c | 4 ++--
+ 5 files changed, 21 insertions(+), 21 deletions(-)
+Merging net-next/master (de8856d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
+$ git merge net-next/master
+Already up-to-date.
+Merging wireless-next/master (8a78335 usbnet: consider device busy at each recieved packet)
+$ git merge wireless-next/master
+Already up-to-date.
+Merging bluetooth/master (e027b5c Bluetooth: Send correct address type for LTK)
+$ git merge bluetooth/master
+Auto-merging net/bluetooth/l2cap_core.c
+Auto-merging net/bluetooth/hci_event.c
+Auto-merging net/bluetooth/hci_core.c
+Merge made by the 'recursive' strategy.
+ drivers/bluetooth/ath3k.c | 4 +
+ drivers/bluetooth/btusb.c | 5 +-
+ drivers/bluetooth/hci_ldisc.c | 4 +-
+ drivers/bluetooth/hci_vhci.c | 3 +-
+ include/net/bluetooth/bluetooth.h | 13 +++
+ include/net/bluetooth/hci.h | 8 ++
+ include/net/bluetooth/hci_core.h | 27 ++++--
+ include/net/bluetooth/l2cap.h | 62 +++++++++++-
+ include/net/bluetooth/mgmt.h | 11 ++-
+ include/net/bluetooth/smp.h | 2 +-
+ net/bluetooth/hci_core.c | 32 +++++-
+ net/bluetooth/hci_event.c | 56 +++++++++--
+ net/bluetooth/hci_sysfs.c | 5 +-
+ net/bluetooth/l2cap_core.c | 44 ++++-----
+ net/bluetooth/l2cap_sock.c | 10 +-
+ net/bluetooth/mgmt.c | 193 +++++++++++++++++++++++++------------
+ net/bluetooth/smp.c | 2 +-
+ 17 files changed, 358 insertions(+), 123 deletions(-)
+Merging mtd/master (7b0e67f mtd: docg3 add protection against concurrency)
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master (711ab3a sh: Use the plat_nand default partition parser)
+$ git merge l2-mtd/master
+Merge made by the 'recursive' strategy.
+ arch/arm/mach-ep93xx/snappercl15.c | 3 ---
+ arch/arm/mach-ep93xx/ts72xx.c | 3 ---
+ arch/arm/mach-ixp4xx/ixdp425-setup.c | 3 ---
+ arch/arm/mach-omap1/board-fsample.c | 3 ---
+ arch/arm/mach-omap1/board-h2.c | 3 ---
+ arch/arm/mach-omap1/board-h3.c | 3 ---
+ arch/arm/mach-omap1/board-perseus2.c | 3 ---
+ arch/arm/mach-orion5x/ts78xx-setup.c | 3 ---
+ arch/arm/mach-pxa/balloon3.c | 3 ---
+ arch/arm/mach-pxa/em-x270.c | 3 ---
+ arch/arm/mach-pxa/palmtx.c | 3 ---
+ arch/blackfin/mach-bf561/boards/acvilon.c | 3 ---
+ arch/mips/alchemy/devboards/db1200.c | 3 ---
+ arch/mips/alchemy/devboards/db1300.c | 3 ---
+ arch/mips/alchemy/devboards/db1550.c | 3 ---
+ arch/mips/pnx833x/common/platform.c | 6 ------
+ arch/sh/boards/mach-migor/setup.c | 1 -
+ drivers/mtd/nand/plat_nand.c | 8 ++++++--
+ 18 files changed, 6 insertions(+), 54 deletions(-)
+Merging crypto/master (a0ea0f6 crypto: caam - add backward compatible string sec4.0)
+$ git merge crypto/master
+Merge made by the 'recursive' strategy.
+ drivers/crypto/caam/caamalg.c | 14 ++++++++++----
+ drivers/crypto/caam/ctrl.c | 16 ++++++++++++++++
+ 2 files changed, 26 insertions(+), 4 deletions(-)
+Merging sound/for-next (c81486a Merge branch 'for-linus' into for-next)
+$ git merge sound/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging sound-asoc/for-next (5e7a266 Merge branch 'for-3.5' into asoc-next)
+$ git merge sound-asoc/for-next
+Removing sound/soc/imx/Makefile
+Removing sound/soc/imx/Kconfig
+Auto-merging sound/soc/fsl/p1022_ds.c
+Auto-merging sound/soc/fsl/mpc8610_hpcd.c
+Auto-merging sound/soc/fsl/imx-ssi.c
+Auto-merging sound/soc/fsl/imx-pcm.h
+Auto-merging sound/soc/fsl/imx-pcm-dma.c
+Auto-merging sound/soc/fsl/eukrea-tlv320.c
+Auto-merging arch/powerpc/configs/mpc85xx_smp_defconfig
+Auto-merging arch/powerpc/configs/mpc85xx_defconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/sound/imx-audio-sgtl5000.txt | 49 +
+ MAINTAINERS | 6 +
+ arch/arm/mach-tegra/board-harmony.c | 1 -
+ arch/arm/mach-tegra/board-seaboard.c | 1 -
+ arch/arm/mach-tegra/board-trimslice.c | 1 -
+ arch/arm/mach-tegra/devices.c | 5 -
+ arch/arm/mach-tegra/devices.h | 1 -
+ arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig | 1 +
+ arch/powerpc/configs/mpc85xx_defconfig | 1 +
+ arch/powerpc/configs/mpc85xx_smp_defconfig | 1 +
+ include/sound/max98095.h | 12 +
+ include/sound/soc-dai.h | 1 +
+ include/sound/soc-dapm.h | 15 +-
+ include/sound/soc.h | 8 +-
+ sound/soc/Kconfig | 1 -
+ sound/soc/Makefile | 1 -
+ sound/soc/codecs/Kconfig | 8 +
+ sound/soc/codecs/Makefile | 6 +-
+ sound/soc/codecs/ak4641.c | 110 +-
+ sound/soc/codecs/cs4270.c | 8 +-
+ sound/soc/codecs/da7210.c | 154 +-
+ sound/soc/codecs/lm49453.c | 1554 ++++++++++++++++++++
+ sound/soc/codecs/lm49453.h | 380 +++++
+ sound/soc/codecs/max98095.c | 158 +-
+ sound/soc/codecs/max98095.h | 22 +
+ sound/soc/codecs/ml26124.c | 681 +++++++++
+ sound/soc/codecs/ml26124.h | 184 +++
+ sound/soc/codecs/sgtl5000.c | 31 +-
+ sound/soc/codecs/wm5100.c | 9 +-
+ sound/soc/codecs/wm8962.c | 15 +-
+ sound/soc/codecs/wm8994.c | 81 +-
+ sound/soc/ep93xx/ep93xx-ac97.c | 74 +-
+ sound/soc/ep93xx/ep93xx-i2s.c | 49 +-
+ sound/soc/fsl/Kconfig | 124 +-
+ sound/soc/fsl/Makefile | 29 +-
+ sound/soc/{imx => fsl}/eukrea-tlv320.c | 2 +-
+ sound/soc/fsl/fsl_ssi.c | 167 ++-
+ sound/soc/fsl/fsl_utils.c | 91 ++
+ sound/soc/fsl/fsl_utils.h | 26 +
+ sound/soc/{imx => fsl}/imx-audmux.c | 0
+ sound/soc/{imx => fsl}/imx-audmux.h | 0
+ .../{imx/imx-pcm-dma-mx2.c => fsl/imx-pcm-dma.c} | 3 +-
+ sound/soc/{imx => fsl}/imx-pcm-fiq.c | 0
+ sound/soc/{imx => fsl}/imx-pcm.c | 0
+ sound/soc/{imx => fsl}/imx-pcm.h | 1 +
+ sound/soc/fsl/imx-sgtl5000.c | 190 +++
+ sound/soc/{imx => fsl}/imx-ssi.c | 2 +-
+ sound/soc/{imx => fsl}/imx-ssi.h | 0
+ sound/soc/fsl/mpc8610_hpcd.c | 166 +--
+ sound/soc/{imx => fsl}/mx27vis-aic32x4.c | 0
+ sound/soc/fsl/p1022_ds.c | 158 +-
+ sound/soc/{imx => fsl}/phycore-ac97.c | 0
+ sound/soc/{imx => fsl}/wm1133-ev1.c | 0
+ sound/soc/imx/Kconfig | 79 -
+ sound/soc/imx/Makefile | 22 -
+ sound/soc/pxa/pxa2xx-i2s.c | 5 +-
+ sound/soc/soc-core.c | 172 +--
+ sound/soc/soc-dapm.c | 252 ++--
+ sound/soc/soc-jack.c | 5 +-
+ sound/soc/soc-pcm.c | 9 +-
+ sound/soc/tegra/Kconfig | 23 +-
+ sound/soc/tegra/Makefile | 8 +-
+ sound/soc/tegra/tegra_alc5632.c | 48 +-
+ sound/soc/tegra/tegra_das.h | 2 +-
+ sound/soc/tegra/tegra_i2s.c | 37 +-
+ sound/soc/tegra/tegra_i2s.h | 1 -
+ sound/soc/tegra/tegra_pcm.c | 26 +-
+ sound/soc/tegra/tegra_pcm.h | 5 +-
+ sound/soc/tegra/tegra_spdif.c | 23 +-
+ sound/soc/tegra/tegra_spdif.h | 1 -
+ sound/soc/tegra/tegra_wm8903.c | 27 +-
+ sound/soc/tegra/trimslice.c | 5 +-
+ 72 files changed, 4313 insertions(+), 1025 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt
+ create mode 100644 sound/soc/codecs/lm49453.c
+ create mode 100644 sound/soc/codecs/lm49453.h
+ create mode 100644 sound/soc/codecs/ml26124.c
+ create mode 100644 sound/soc/codecs/ml26124.h
+ rename sound/soc/{imx => fsl}/eukrea-tlv320.c (99%)
+ create mode 100644 sound/soc/fsl/fsl_utils.c
+ create mode 100644 sound/soc/fsl/fsl_utils.h
+ rename sound/soc/{imx => fsl}/imx-audmux.c (100%)
+ rename sound/soc/{imx => fsl}/imx-audmux.h (100%)
+ rename sound/soc/{imx/imx-pcm-dma-mx2.c => fsl/imx-pcm-dma.c} (97%)
+ rename sound/soc/{imx => fsl}/imx-pcm-fiq.c (100%)
+ rename sound/soc/{imx => fsl}/imx-pcm.c (100%)
+ rename sound/soc/{imx => fsl}/imx-pcm.h (93%)
+ create mode 100644 sound/soc/fsl/imx-sgtl5000.c
+ rename sound/soc/{imx => fsl}/imx-ssi.c (99%)
+ rename sound/soc/{imx => fsl}/imx-ssi.h (100%)
+ rename sound/soc/{imx => fsl}/mx27vis-aic32x4.c (100%)
+ rename sound/soc/{imx => fsl}/phycore-ac97.c (100%)
+ rename sound/soc/{imx => fsl}/wm1133-ev1.c (100%)
+ delete mode 100644 sound/soc/imx/Kconfig
+ delete mode 100644 sound/soc/imx/Makefile
+$ git reset --hard HEAD^
+HEAD is now at 746eab9 Merge remote-tracking branch 'sound/for-next'
+Merging refs/next/20120330/sound-asoc
+$ git merge refs/next/20120330/sound-asoc
+Merge made by the 'recursive' strategy.
+ sound/soc/codecs/sgtl5000.c | 25 +++++++++++++------------
+ 1 file changed, 13 insertions(+), 12 deletions(-)
+Merging cpufreq/next (a7b422c provide disable_cpufreq() function to disable the API.)
+$ git merge cpufreq/next
+Already up-to-date.
+Merging quilt/rr (2a22b63 cpumask: remove old cpu_*_map.)
+$ git merge quilt/rr
+Resolved 'arch/arm/kernel/kprobes.c' using previous resolution.
+Resolved 'drivers/virtio/virtio_balloon.c' using previous resolution.
+Auto-merging drivers/virtio/virtio_balloon.c
+CONFLICT (content): Merge conflict in drivers/virtio/virtio_balloon.c
+Auto-merging arch/arm/kernel/kprobes.c
+CONFLICT (content): Merge conflict in arch/arm/kernel/kprobes.c
+Auto-merging Documentation/virtual/virtio-spec.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master e8067a4] Merge branch 'quilt/rr'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/virtual/virtio-spec.txt | 1000 ++++++++++++++++++++++++++++++---
+ 1 file changed, 927 insertions(+), 73 deletions(-)
+Merging input/next (131c713 Input: tegra-kbc - allocate pdata before using it)
+$ git merge input/next
+Already up-to-date.
+Merging input-mt/for-next (7491f3d bcm5974: Add pointer and buttonpad properties)
+$ git merge input-mt/for-next
+Already up-to-date.
+Merging cgroup/for-next (48ddbe1 cgroup: make css->refcnt clearing on cgroup removal optional)
+$ git merge cgroup/for-next
+Auto-merging kernel/cpuset.c
+Merge made by the 'recursive' strategy.
+ Documentation/feature-removal-schedule.txt | 9 +
+ block/blk-cgroup.c | 45 +--
+ include/linux/cgroup.h | 80 ++--
+ kernel/cgroup.c | 550 +++++++++++++++++++++-------
+ kernel/cgroup_freezer.c | 11 +-
+ kernel/cpuset.c | 31 +-
+ kernel/sched/core.c | 16 +-
+ mm/memcontrol.c | 78 ++--
+ net/core/netprio_cgroup.c | 30 +-
+ net/ipv4/tcp_memcontrol.c | 71 ++--
+ net/sched/cls_cgroup.c | 31 +-
+ security/device_cgroup.c | 10 +-
+ 12 files changed, 605 insertions(+), 357 deletions(-)
+Merging block/for-next (f52b69f Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh)
+$ git merge block/for-next
+Already up-to-date.
+Merging quilt/device-mapper (4b63eba This device-mapper target creates a read-only device that transparently validates the data on one underlying device against a pre-generated tree of cryptographic checksums stored on a second device.)
+$ git merge quilt/device-mapper
+Merge made by the 'recursive' strategy.
+Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
+$ git merge embedded/master
+Already up-to-date.
+Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
+$ git merge firmware/master
+Already up-to-date.
+Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
+$ git merge pcmcia/master
+Already up-to-date.
+Merging mmc/mmc-next (0460e47 mmc: omap_hsmmc: fix module re-insertion)
+$ git merge mmc/mmc-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mmc/samsung-sdhci.txt | 70 +++++
+ drivers/mmc/card/block.c | 27 +-
+ drivers/mmc/core/bus.c | 17 +-
+ drivers/mmc/core/sdio_bus.c | 12 +-
+ drivers/mmc/host/atmel-mci-regs.h | 1 +
+ drivers/mmc/host/atmel-mci.c | 55 ++--
+ drivers/mmc/host/omap_hsmmc.c | 181 ++++++------
+ drivers/mmc/host/sdhci-pci.c | 4 +-
+ drivers/mmc/host/sdhci-s3c.c | 297 +++++++++++++++++---
+ drivers/mmc/host/sh_mmcif.c | 13 +-
+ include/linux/mmc/sdhci.h | 2 +
+ 11 files changed, 482 insertions(+), 197 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mmc/samsung-sdhci.txt
+Merging kgdb/kgdb-next (3751d3e x86,kgdb: Fix DEBUG_RODATA limitation using text_poke())
+$ git merge kgdb/kgdb-next
+Auto-merging kernel/debug/debug_core.c
+Auto-merging arch/x86/kernel/kgdb.c
+Merge made by the 'recursive' strategy.
+ arch/x86/kernel/kgdb.c | 60 +++++++++++++++++
+ drivers/misc/kgdbts.c | 160 ++++++++++++++++++++++++++++++++-------------
+ include/linux/kgdb.h | 7 +-
+ kernel/debug/debug_core.c | 53 +++++++--------
+ kernel/debug/kdb/kdb_io.c | 2 +-
+ 5 files changed, 204 insertions(+), 78 deletions(-)
+Merging slab/for-next (b80b6c0 Merge branch 'slab/next' into for-next)
+$ git merge slab/for-next
+Auto-merging mm/slub.c
+Auto-merging include/linux/slub_def.h
+Merge made by the 'recursive' strategy.
+ include/linux/slub_def.h | 1 -
+ mm/slub.c | 166 +++++++++++++++++++++++++---------------------
+ 2 files changed, 89 insertions(+), 78 deletions(-)
+Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next (9d49d24 md/raid1,raid10: don't compare excess byte during consistency check.)
+$ git merge md/for-next
+Merge made by the 'recursive' strategy.
+ drivers/md/linear.c | 9 +++++++-
+ drivers/md/raid0.c | 27 +++++++++++++++++++++--
+ drivers/md/raid1.c | 13 ++++++++----
+ drivers/md/raid10.c | 2 +-
+ drivers/md/raid5.c | 59 ++++++++++++++++++++++++++++-----------------------
+ 5 files changed, 75 insertions(+), 35 deletions(-)
+Merging mfd/for-next (b8589e2 gpio/twl: Add DT support to gpio-twl4030 driver)
+$ git merge mfd/for-next
+Already up-to-date.
+Merging battery/master (5cdd4d7 max17042_battery: Clean up interrupt handling)
+$ git merge battery/master
+Already up-to-date.
+Merging drm/drm-next (5466c7b drm/i915: use DDC_ADDR instead of hard-coding it)
+$ git merge drm/drm-next
+Already up-to-date.
+Merging fbdev/fbdev-next (6bff98b Revert "video:uvesafb: Fix oops that uvesafb try to execute NX-protected page")
+$ git merge fbdev/fbdev-next
+Already up-to-date.
+Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
+$ git merge viafb/viafb-next
+Already up-to-date.
+Merging omap_dss2/for-next (df01d53 OMAPDSS: APPLY: fix clearing shadow dirty flag with manual update)
+$ git merge omap_dss2/for-next
+Already up-to-date.
+Merging regulator/for-next (7602609 Merge branches 'regulator-linus' and 'regulator-drivers' into regulator-next)
+$ git merge regulator/for-next
+Merge made by the 'recursive' strategy.
+ .../bindings/regulator/anatop-regulator.txt | 29 ++
+ drivers/regulator/88pm8607.c | 99 +++----
+ drivers/regulator/Kconfig | 11 +-
+ drivers/regulator/Makefile | 1 +
+ drivers/regulator/ab3100.c | 18 +-
+ drivers/regulator/ab8500.c | 35 +--
+ drivers/regulator/ad5398.c | 9 +-
+ drivers/regulator/anatop-regulator.c | 11 +-
+ drivers/regulator/core.c | 4 +-
+ drivers/regulator/da9052-regulator.c | 302 ++++++--------------
+ drivers/regulator/fixed-helper.c | 3 +-
+ drivers/regulator/fixed.c | 55 ++--
+ drivers/regulator/gpio-regulator.c | 8 +-
+ drivers/regulator/lp3971.c | 58 +---
+ drivers/regulator/lp3972.c | 63 ++--
+ drivers/regulator/max8925-regulator.c | 17 +-
+ drivers/regulator/max8952.c | 36 +--
+ drivers/regulator/max8997.c | 148 ++++------
+ drivers/regulator/mc13892-regulator.c | 27 +-
+ drivers/regulator/mc13xxx-regulator-core.c | 54 +---
+ drivers/regulator/mc13xxx.h | 2 -
+ drivers/regulator/pcap-regulator.c | 44 +--
+ drivers/regulator/pcf50633-regulator.c | 78 ++---
+ drivers/regulator/s5m8767.c | 85 ++++--
+ drivers/regulator/tps62360-regulator.c | 34 ++-
+ drivers/regulator/tps65023-regulator.c | 109 ++-----
+ drivers/regulator/tps65090-regulator.c | 197 +++++++++++++
+ drivers/regulator/tps6524x-regulator.c | 24 +-
+ drivers/regulator/tps6586x-regulator.c | 104 +++----
+ drivers/regulator/tps65912-regulator.c | 44 +--
+ drivers/regulator/wm831x-dcdc.c | 18 +-
+ drivers/regulator/wm831x-isink.c | 2 +-
+ drivers/regulator/wm831x-ldo.c | 11 +-
+ drivers/regulator/wm8350-regulator.c | 34 +--
+ include/linux/mfd/s5m87xx/s5m-core.h | 1 +
+ include/linux/mfd/s5m87xx/s5m-pmic.h | 29 ++
+ include/linux/regulator/fixed.h | 7 +
+ include/linux/regulator/machine.h | 8 +-
+ include/linux/regulator/tps65090-regulator.h | 50 ++++
+ 39 files changed, 844 insertions(+), 1025 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/regulator/anatop-regulator.txt
+ create mode 100644 drivers/regulator/tps65090-regulator.c
+ create mode 100644 include/linux/regulator/tps65090-regulator.h
+Merging security/next (09f61cd Merge branch 'for-security' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor into next)
+$ git merge security/next
+Already up-to-date.
+Merging selinux/master (ecf093d SELinux: add default_type statements)
+$ git merge selinux/master
+Auto-merging security/selinux/selinuxfs.c
+Auto-merging net/xfrm/xfrm_policy.c
+Merge made by the 'recursive' strategy.
+ net/xfrm/xfrm_policy.c | 1 +
+ security/selinux/include/security.h | 4 +++-
+ security/selinux/selinuxfs.c | 3 ++-
+ security/selinux/ss/context.h | 20 ++++++++++++++++
+ security/selinux/ss/mls.c | 24 +++++++++++++++++++
+ security/selinux/ss/policydb.c | 44 +++++++++++++++++++++++++++++++++++
+ security/selinux/ss/policydb.h | 14 +++++++++++
+ security/selinux/ss/services.c | 42 ++++++++++++++++++++++++++-------
+ 8 files changed, 141 insertions(+), 11 deletions(-)
+Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
+$ git merge lblnet/master
+Already up-to-date.
+Merging watchdog/master (dd775ae Linux 3.4-rc1)
+$ git merge watchdog/master
+Already up-to-date.
+Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging iommu/next (7de4730 Merge branches 'iommu/fixes', 'arm/tegra' and 'x86/amd' into next)
+$ git merge iommu/next
+Already up-to-date.
+Merging osd/linux-next (72749a2 exofs: Cap on the memcpy() size)
+$ git merge osd/linux-next
+Already up-to-date.
+Merging jc_docs/docs-next (5c050fb docs: update the development process document)
+$ git merge jc_docs/docs-next
+Already up-to-date.
+Merging trivial/for-next (409a3e9 Email/web address change)
+$ git merge trivial/for-next
+Resolved 'drivers/net/ethernet/realtek/r8169.c' using previous resolution.
+Auto-merging sound/pci/hda/patch_realtek.c
+Auto-merging drivers/net/ethernet/realtek/r8169.c
+CONFLICT (content): Merge conflict in drivers/net/ethernet/realtek/r8169.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 478611d] Merge remote-tracking branch 'trivial/for-next'
+$ git diff -M --stat --summary HEAD^..
+ CREDITS | 4 ++--
+ Documentation/sound/oss/ALS | 4 ++--
+ MAINTAINERS | 2 +-
+ drivers/net/ethernet/realtek/r8169.c | 2 +-
+ drivers/platform/x86/fujitsu-laptop.c | 2 +-
+ drivers/usb/storage/unusual_devs.h | 2 +-
+ sound/isa/als100.c | 2 +-
+ sound/pci/hda/patch_realtek.c | 2 +-
+ 8 files changed, 10 insertions(+), 10 deletions(-)
+Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
+$ git merge audit/for-next
+Already up-to-date.
+Merging pm/linux-next (c4772d1 PM / QoS: add pm_qos_update_request_timeout() API)
+$ git merge pm/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/base/firmware_class.c | 208 +++++++++++++++++++++--------------------
+ drivers/base/power/runtime.c | 3 +-
+ include/linux/kmod.h | 27 +++++-
+ include/linux/pm_qos.h | 4 +
+ kernel/kmod.c | 117 +++++++++++++++++------
+ kernel/power/hibernate.c | 18 +---
+ kernel/power/process.c | 8 ++
+ kernel/power/qos.c | 50 ++++++++++
+ kernel/power/suspend.c | 7 --
+ kernel/power/user.c | 10 +-
+ 10 files changed, 284 insertions(+), 168 deletions(-)
+Merging apm/for-next (b4a133d Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
+$ git merge apm/for-next
+Already up-to-date.
+Merging fsnotify/for-next (ef9bf3b fanotify: only destroy a mark if both its mask and its ignored_mask are cleared)
+$ git merge fsnotify/for-next
+Auto-merging include/linux/fsnotify_backend.h
+Auto-merging fs/notify/mark.c
+Auto-merging fs/notify/group.c
+Auto-merging fs/notify/fanotify/fanotify_user.c
+Auto-merging fs/nfsd/vfs.c
+Auto-merging fs/cachefiles/namei.c
+Merge made by the 'recursive' strategy.
+ fs/cachefiles/namei.c | 1 -
+ fs/cachefiles/xattr.c | 1 -
+ fs/nfsd/vfs.c | 3 --
+ fs/notify/dnotify/dnotify.c | 15 +++---
+ fs/notify/fanotify/fanotify.c | 24 +++++----
+ fs/notify/fanotify/fanotify_user.c | 101 +++++++++++++++++++++++++-----------
+ fs/notify/group.c | 1 +
+ fs/notify/mark.c | 36 +++++--------
+ include/linux/fanotify.h | 5 +-
+ include/linux/fsnotify_backend.h | 14 ++++-
+ 10 files changed, 121 insertions(+), 80 deletions(-)
+Merging edac/linux_next (a4b4be3 edac: rename channel_info to rank_info)
+$ git merge edac/linux_next
+Already up-to-date.
+Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
+$ git merge edac-amd/for-next
+Merge made by the 'recursive' strategy.
+Merging devicetree/devicetree/next (0f22dd3 of: Only compile OF_DYNAMIC on PowerPC pseries and iseries)
+$ git merge devicetree/devicetree/next
+Already up-to-date.
+Merging spi/spi/next (3d414f3 Merge branch 'spi' of git://gitorious.org/linus-tree/linus-tree into spi/next)
+$ git merge spi/spi/next
+Merge made by the 'recursive' strategy.
+ drivers/spi/spi-omap2-mcspi.c | 46 ++++++++---------------------------------
+ 1 file changed, 9 insertions(+), 37 deletions(-)
+Merging tip/auto-latest (1a7ac88 Merge branch 'linus')
+$ git merge tip/auto-latest
+Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution.
+Auto-merging MAINTAINERS
+Auto-merging Documentation/feature-removal-schedule.txt
+CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 4cf208f] Merge remote-tracking branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/feature-removal-schedule.txt | 16 +-
+ MAINTAINERS | 8 +
+ Makefile | 10 +
+ arch/Kconfig | 17 +
+ arch/x86/Kconfig | 36 +-
+ arch/x86/Makefile | 1 +
+ arch/x86/boot/compressed/eboot.c | 14 +-
+ arch/x86/boot/header.S | 26 +-
+ arch/x86/boot/tools/build.c | 24 +-
+ arch/x86/include/asm/e820.h | 7 +
+ arch/x86/include/asm/efi.h | 5 -
+ arch/x86/include/asm/msr-index.h | 5 +
+ arch/x86/include/asm/perf_event.h | 2 +
+ arch/x86/include/asm/processor.h | 10 -
+ arch/x86/include/asm/spinlock.h | 2 -
+ arch/x86/include/asm/thread_info.h | 2 +
+ arch/x86/include/asm/uprobes.h | 57 +
+ arch/x86/kernel/Makefile | 1 +
+ arch/x86/kernel/cpu/perf_event_amd_ibs.c | 438 ++++++-
+ arch/x86/kernel/e820.c | 3 +-
+ arch/x86/kernel/irq.c | 7 +-
+ arch/x86/kernel/process.c | 24 -
+ arch/x86/kernel/reboot.c | 277 ++---
+ arch/x86/kernel/setup.c | 21 +-
+ arch/x86/kernel/signal.c | 6 +
+ arch/x86/kernel/uprobes.c | 674 +++++++++++
+ arch/x86/mm/init.c | 21 +-
+ arch/x86/mm/tlb.c | 8 +-
+ arch/x86/platform/efi/efi.c | 37 +-
+ arch/x86/platform/efi/efi_64.c | 17 -
+ drivers/block/floppy.c | 36 -
+ fs/exec.c | 7 +-
+ fs/proc/stat.c | 34 +-
+ include/linux/mm_types.h | 2 +
+ include/linux/sched.h | 4 +
+ include/linux/uprobes.h | 164 +++
+ include/trace/events/sched.h | 2 +-
+ kernel/events/Makefile | 3 +
+ kernel/events/uprobes.c | 1662 ++++++++++++++++++++++++++
+ kernel/fork.c | 9 +
+ kernel/itimer.c | 5 +-
+ kernel/signal.c | 4 +
+ lib/Kconfig.debug | 9 +
+ mm/mmap.c | 33 +-
+ scripts/kconfig/Makefile | 7 +-
+ tools/kvm/.gitignore | 12 +
+ tools/kvm/CREDITS-Git | 30 +
+ tools/kvm/Documentation/kernel-debugging.txt | 15 +
+ tools/kvm/Documentation/kvm-balloon.txt | 24 +
+ tools/kvm/Documentation/kvm-debug.txt | 16 +
+ tools/kvm/Documentation/kvm-list.txt | 16 +
+ tools/kvm/Documentation/kvm-pause.txt | 16 +
+ tools/kvm/Documentation/kvm-resume.txt | 16 +
+ tools/kvm/Documentation/kvm-run.txt | 62 +
+ tools/kvm/Documentation/kvm-sandbox.txt | 16 +
+ tools/kvm/Documentation/kvm-setup.txt | 15 +
+ tools/kvm/Documentation/kvm-stat.txt | 19 +
+ tools/kvm/Documentation/kvm-stop.txt | 16 +
+ tools/kvm/Documentation/kvm-version.txt | 21 +
+ tools/kvm/Documentation/virtio-console.txt | 41 +
+ tools/kvm/Makefile | 427 +++++++
+ tools/kvm/README | 109 ++
+ tools/kvm/builtin-balloon.c | 80 ++
+ tools/kvm/builtin-debug.c | 103 ++
+ tools/kvm/builtin-help.c | 63 +
+ tools/kvm/builtin-list.c | 149 +++
+ tools/kvm/builtin-pause.c | 88 ++
+ tools/kvm/builtin-resume.c | 88 ++
+ tools/kvm/builtin-run.c | 1378 +++++++++++++++++++++
+ tools/kvm/builtin-sandbox.c | 9 +
+ tools/kvm/builtin-setup.c | 232 ++++
+ tools/kvm/builtin-stat.c | 127 ++
+ tools/kvm/builtin-stop.c | 70 ++
+ tools/kvm/builtin-version.c | 15 +
+ tools/kvm/code16gcc.h | 15 +
+ tools/kvm/command-list.txt | 15 +
+ tools/kvm/config/feature-tests.mak | 168 +++
+ tools/kvm/config/utilities.mak | 188 +++
+ tools/kvm/disk/blk.c | 42 +
+ tools/kvm/disk/core.c | 260 ++++
+ tools/kvm/disk/qcow.c | 1529 +++++++++++++++++++++++
+ tools/kvm/disk/raw.c | 141 +++
+ tools/kvm/framebuffer.c | 75 ++
+ tools/kvm/guest/init.c | 38 +
+ tools/kvm/guest/init_stage2.c | 55 +
+ tools/kvm/guest/passwd | 1 +
+ tools/kvm/guest_compat.c | 99 ++
+ tools/kvm/hw/i8042.c | 348 ++++++
+ tools/kvm/hw/pci-shmem.c | 268 +++++
+ tools/kvm/hw/rtc.c | 137 +++
+ tools/kvm/hw/serial.c | 447 +++++++
+ tools/kvm/hw/vesa.c | 85 ++
+ tools/kvm/include/asm/hweight.h | 8 +
+ tools/kvm/include/bios/memcpy.h | 9 +
+ tools/kvm/include/kvm/8250-serial.h | 11 +
+ tools/kvm/include/kvm/apic.h | 17 +
+ tools/kvm/include/kvm/brlock.h | 41 +
+ tools/kvm/include/kvm/builtin-balloon.h | 9 +
+ tools/kvm/include/kvm/builtin-debug.h | 18 +
+ tools/kvm/include/kvm/builtin-help.h | 6 +
+ tools/kvm/include/kvm/builtin-list.h | 10 +
+ tools/kvm/include/kvm/builtin-pause.h | 9 +
+ tools/kvm/include/kvm/builtin-resume.h | 9 +
+ tools/kvm/include/kvm/builtin-run.h | 11 +
+ tools/kvm/include/kvm/builtin-sandbox.h | 6 +
+ tools/kvm/include/kvm/builtin-setup.h | 11 +
+ tools/kvm/include/kvm/builtin-stat.h | 9 +
+ tools/kvm/include/kvm/builtin-stop.h | 9 +
+ tools/kvm/include/kvm/builtin-version.h | 6 +
+ tools/kvm/include/kvm/compiler.h | 10 +
+ tools/kvm/include/kvm/disk-image.h | 81 ++
+ tools/kvm/include/kvm/e820.h | 13 +
+ tools/kvm/include/kvm/framebuffer.h | 35 +
+ tools/kvm/include/kvm/guest_compat.h | 9 +
+ tools/kvm/include/kvm/i8042.h | 12 +
+ tools/kvm/include/kvm/ioeventfd.h | 27 +
+ tools/kvm/include/kvm/ioport.h | 69 ++
+ tools/kvm/include/kvm/irq.h | 33 +
+ tools/kvm/include/kvm/kvm-cmd.h | 17 +
+ tools/kvm/include/kvm/kvm-cpu.h | 24 +
+ tools/kvm/include/kvm/kvm-ipc.h | 24 +
+ tools/kvm/include/kvm/kvm.h | 93 ++
+ tools/kvm/include/kvm/msi.h | 10 +
+ tools/kvm/include/kvm/mutex.h | 33 +
+ tools/kvm/include/kvm/parse-options.h | 214 ++++
+ tools/kvm/include/kvm/pci-shmem.h | 28 +
+ tools/kvm/include/kvm/pci.h | 95 ++
+ tools/kvm/include/kvm/qcow.h | 133 +++
+ tools/kvm/include/kvm/rbtree-interval.h | 28 +
+ tools/kvm/include/kvm/read-write.h | 43 +
+ tools/kvm/include/kvm/rtc.h | 9 +
+ tools/kvm/include/kvm/rwsem.h | 39 +
+ tools/kvm/include/kvm/sdl.h | 22 +
+ tools/kvm/include/kvm/segment.h | 21 +
+ tools/kvm/include/kvm/strbuf.h | 19 +
+ tools/kvm/include/kvm/symbol.h | 30 +
+ tools/kvm/include/kvm/term.h | 20 +
+ tools/kvm/include/kvm/threadpool.h | 37 +
+ tools/kvm/include/kvm/types.h | 7 +
+ tools/kvm/include/kvm/uip.h | 358 ++++++
+ tools/kvm/include/kvm/util.h | 95 ++
+ tools/kvm/include/kvm/vesa.h | 18 +
+ tools/kvm/include/kvm/virtio-9p.h | 74 ++
+ tools/kvm/include/kvm/virtio-balloon.h | 8 +
+ tools/kvm/include/kvm/virtio-blk.h | 12 +
+ tools/kvm/include/kvm/virtio-console.h | 9 +
+ tools/kvm/include/kvm/virtio-net.h | 23 +
+ tools/kvm/include/kvm/virtio-pci-dev.h | 37 +
+ tools/kvm/include/kvm/virtio-pci.h | 49 +
+ tools/kvm/include/kvm/virtio-rng.h | 9 +
+ tools/kvm/include/kvm/virtio-trans.h | 44 +
+ tools/kvm/include/kvm/virtio.h | 67 ++
+ tools/kvm/include/kvm/vnc.h | 20 +
+ tools/kvm/include/linux/bitops.h | 33 +
+ tools/kvm/include/linux/byteorder.h | 7 +
+ tools/kvm/include/linux/compiler.h | 19 +
+ tools/kvm/include/linux/kernel.h | 39 +
+ tools/kvm/include/linux/module.h | 6 +
+ tools/kvm/include/linux/prefetch.h | 6 +
+ tools/kvm/include/linux/types.h | 51 +
+ tools/kvm/ioeventfd.c | 209 ++++
+ tools/kvm/ioport.c | 195 +++
+ tools/kvm/kvm-cmd.c | 91 ++
+ tools/kvm/kvm-cpu.c | 175 +++
+ tools/kvm/kvm-ipc.c | 231 ++++
+ tools/kvm/kvm.c | 587 +++++++++
+ tools/kvm/main.c | 19 +
+ tools/kvm/mmio.c | 137 +++
+ tools/kvm/net/uip/arp.c | 30 +
+ tools/kvm/net/uip/buf.c | 114 ++
+ tools/kvm/net/uip/core.c | 190 +++
+ tools/kvm/net/uip/csum.c | 92 ++
+ tools/kvm/net/uip/dhcp.c | 203 ++++
+ tools/kvm/net/uip/icmp.c | 29 +
+ tools/kvm/net/uip/ipv4.c | 29 +
+ tools/kvm/net/uip/tcp.c | 317 +++++
+ tools/kvm/net/uip/udp.c | 236 ++++
+ tools/kvm/pci.c | 213 ++++
+ tools/kvm/powerpc/boot.c | 8 +
+ tools/kvm/powerpc/cpu_info.c | 83 ++
+ tools/kvm/powerpc/cpu_info.h | 43 +
+ tools/kvm/powerpc/include/kvm/barrier.h | 6 +
+ tools/kvm/powerpc/include/kvm/kvm-arch.h | 88 ++
+ tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h | 76 ++
+ tools/kvm/powerpc/ioport.c | 18 +
+ tools/kvm/powerpc/irq.c | 75 ++
+ tools/kvm/powerpc/kvm-cpu.c | 291 +++++
+ tools/kvm/powerpc/kvm.c | 460 +++++++
+ tools/kvm/powerpc/spapr.h | 93 ++
+ tools/kvm/powerpc/spapr_hcall.c | 134 +++
+ tools/kvm/powerpc/spapr_hvcons.c | 102 ++
+ tools/kvm/powerpc/spapr_hvcons.h | 19 +
+ tools/kvm/powerpc/spapr_pci.c | 423 +++++++
+ tools/kvm/powerpc/spapr_pci.h | 57 +
+ tools/kvm/powerpc/spapr_rtas.c | 229 ++++
+ tools/kvm/powerpc/xics.c | 514 ++++++++
+ tools/kvm/powerpc/xics.h | 23 +
+ tools/kvm/symbol.c | 131 ++
+ tools/kvm/term.c | 166 +++
+ tools/kvm/tests/Makefile | 19 +
+ tools/kvm/tests/boot/Makefile | 13 +
+ tools/kvm/tests/boot/init.c | 11 +
+ tools/kvm/tests/kernel/.gitignore | 2 +
+ tools/kvm/tests/kernel/Makefile | 20 +
+ tools/kvm/tests/kernel/README | 16 +
+ tools/kvm/tests/kernel/kernel.S | 8 +
+ tools/kvm/tests/pit/.gitignore | 2 +
+ tools/kvm/tests/pit/Makefile | 20 +
+ tools/kvm/tests/pit/README | 16 +
+ tools/kvm/tests/pit/tick.S | 109 ++
+ tools/kvm/ui/sdl.c | 303 +++++
+ tools/kvm/ui/vnc.c | 230 ++++
+ tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 +
+ tools/kvm/util/generate-cmdlist.sh | 23 +
+ tools/kvm/util/kvm-ifup-vbr0 | 6 +
+ tools/kvm/util/parse-options.c | 577 +++++++++
+ tools/kvm/util/rbtree-interval.c | 89 ++
+ tools/kvm/util/read-write.c | 344 ++++++
+ tools/kvm/util/set_private_br.sh | 51 +
+ tools/kvm/util/strbuf.c | 39 +
+ tools/kvm/util/threadpool.c | 145 +++
+ tools/kvm/util/util.c | 115 ++
+ tools/kvm/virtio/9p-pdu.c | 287 +++++
+ tools/kvm/virtio/9p.c | 1326 ++++++++++++++++++++
+ tools/kvm/virtio/balloon.c | 275 +++++
+ tools/kvm/virtio/blk.c | 290 +++++
+ tools/kvm/virtio/console.c | 203 ++++
+ tools/kvm/virtio/core.c | 158 +++
+ tools/kvm/virtio/net.c | 547 +++++++++
+ tools/kvm/virtio/pci.c | 380 ++++++
+ tools/kvm/virtio/rng.c | 203 ++++
+ tools/kvm/virtio/trans.c | 24 +
+ tools/kvm/x86/bios.c | 174 +++
+ tools/kvm/x86/bios/.gitignore | 3 +
+ tools/kvm/x86/bios/bios-rom.S | 12 +
+ tools/kvm/x86/bios/e820.c | 72 ++
+ tools/kvm/x86/bios/entry.S | 92 ++
+ tools/kvm/x86/bios/gen-offsets.sh | 14 +
+ tools/kvm/x86/bios/int10.c | 110 ++
+ tools/kvm/x86/bios/int15.c | 18 +
+ tools/kvm/x86/bios/local.S | 7 +
+ tools/kvm/x86/bios/macro.S | 25 +
+ tools/kvm/x86/bios/memcpy.c | 23 +
+ tools/kvm/x86/bios/rom.ld.S | 16 +
+ tools/kvm/x86/boot.c | 41 +
+ tools/kvm/x86/cpuid.c | 55 +
+ tools/kvm/x86/include/kvm/assembly.h | 24 +
+ tools/kvm/x86/include/kvm/barrier.h | 16 +
+ tools/kvm/x86/include/kvm/bios-export.h | 13 +
+ tools/kvm/x86/include/kvm/bios.h | 93 ++
+ tools/kvm/x86/include/kvm/boot-protocol.h | 16 +
+ tools/kvm/x86/include/kvm/cpufeature.h | 41 +
+ tools/kvm/x86/include/kvm/interrupt.h | 26 +
+ tools/kvm/x86/include/kvm/kvm-arch.h | 65 +
+ tools/kvm/x86/include/kvm/kvm-cpu-arch.h | 49 +
+ tools/kvm/x86/include/kvm/mptable.h | 9 +
+ tools/kvm/x86/interrupt.c | 28 +
+ tools/kvm/x86/ioport.c | 77 ++
+ tools/kvm/x86/irq.c | 229 ++++
+ tools/kvm/x86/kvm-cpu.c | 425 +++++++
+ tools/kvm/x86/kvm.c | 385 ++++++
+ tools/kvm/x86/mptable.c | 287 +++++
+ 262 files changed, 27519 insertions(+), 312 deletions(-)
+ create mode 100644 arch/x86/include/asm/uprobes.h
+ create mode 100644 arch/x86/kernel/uprobes.c
+ create mode 100644 include/linux/uprobes.h
+ create mode 100644 kernel/events/uprobes.c
+ create mode 100644 tools/kvm/.gitignore
+ create mode 100644 tools/kvm/CREDITS-Git
+ create mode 100644 tools/kvm/Documentation/kernel-debugging.txt
+ create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
+ create mode 100644 tools/kvm/Documentation/kvm-debug.txt
+ create mode 100644 tools/kvm/Documentation/kvm-list.txt
+ create mode 100644 tools/kvm/Documentation/kvm-pause.txt
+ create mode 100644 tools/kvm/Documentation/kvm-resume.txt
+ create mode 100644 tools/kvm/Documentation/kvm-run.txt
+ create mode 100644 tools/kvm/Documentation/kvm-sandbox.txt
+ create mode 100644 tools/kvm/Documentation/kvm-setup.txt
+ create mode 100644 tools/kvm/Documentation/kvm-stat.txt
+ create mode 100644 tools/kvm/Documentation/kvm-stop.txt
+ create mode 100644 tools/kvm/Documentation/kvm-version.txt
+ create mode 100644 tools/kvm/Documentation/virtio-console.txt
+ create mode 100644 tools/kvm/Makefile
+ create mode 100644 tools/kvm/README
+ create mode 100644 tools/kvm/builtin-balloon.c
+ create mode 100644 tools/kvm/builtin-debug.c
+ create mode 100644 tools/kvm/builtin-help.c
+ create mode 100644 tools/kvm/builtin-list.c
+ create mode 100644 tools/kvm/builtin-pause.c
+ create mode 100644 tools/kvm/builtin-resume.c
+ create mode 100644 tools/kvm/builtin-run.c
+ create mode 100644 tools/kvm/builtin-sandbox.c
+ create mode 100644 tools/kvm/builtin-setup.c
+ create mode 100644 tools/kvm/builtin-stat.c
+ create mode 100644 tools/kvm/builtin-stop.c
+ create mode 100644 tools/kvm/builtin-version.c
+ create mode 100644 tools/kvm/code16gcc.h
+ create mode 100644 tools/kvm/command-list.txt
+ create mode 100644 tools/kvm/config/feature-tests.mak
+ create mode 100644 tools/kvm/config/utilities.mak
+ create mode 100644 tools/kvm/disk/blk.c
+ create mode 100644 tools/kvm/disk/core.c
+ create mode 100644 tools/kvm/disk/qcow.c
+ create mode 100644 tools/kvm/disk/raw.c
+ create mode 100644 tools/kvm/framebuffer.c
+ create mode 100644 tools/kvm/guest/init.c
+ create mode 100644 tools/kvm/guest/init_stage2.c
+ create mode 100644 tools/kvm/guest/passwd
+ create mode 100644 tools/kvm/guest_compat.c
+ create mode 100644 tools/kvm/hw/i8042.c
+ create mode 100644 tools/kvm/hw/pci-shmem.c
+ create mode 100644 tools/kvm/hw/rtc.c
+ create mode 100644 tools/kvm/hw/serial.c
+ create mode 100644 tools/kvm/hw/vesa.c
+ create mode 100644 tools/kvm/include/asm/hweight.h
+ create mode 100644 tools/kvm/include/bios/memcpy.h
+ create mode 100644 tools/kvm/include/kvm/8250-serial.h
+ create mode 100644 tools/kvm/include/kvm/apic.h
+ create mode 100644 tools/kvm/include/kvm/brlock.h
+ create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
+ create mode 100644 tools/kvm/include/kvm/builtin-debug.h
+ create mode 100644 tools/kvm/include/kvm/builtin-help.h
+ create mode 100644 tools/kvm/include/kvm/builtin-list.h
+ create mode 100644 tools/kvm/include/kvm/builtin-pause.h
+ create mode 100644 tools/kvm/include/kvm/builtin-resume.h
+ create mode 100644 tools/kvm/include/kvm/builtin-run.h
+ create mode 100644 tools/kvm/include/kvm/builtin-sandbox.h
+ create mode 100644 tools/kvm/include/kvm/builtin-setup.h
+ create mode 100644 tools/kvm/include/kvm/builtin-stat.h
+ create mode 100644 tools/kvm/include/kvm/builtin-stop.h
+ create mode 100644 tools/kvm/include/kvm/builtin-version.h
+ create mode 100644 tools/kvm/include/kvm/compiler.h
+ create mode 100644 tools/kvm/include/kvm/disk-image.h
+ create mode 100644 tools/kvm/include/kvm/e820.h
+ create mode 100644 tools/kvm/include/kvm/framebuffer.h
+ create mode 100644 tools/kvm/include/kvm/guest_compat.h
+ create mode 100644 tools/kvm/include/kvm/i8042.h
+ create mode 100644 tools/kvm/include/kvm/ioeventfd.h
+ create mode 100644 tools/kvm/include/kvm/ioport.h
+ create mode 100644 tools/kvm/include/kvm/irq.h
+ create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
+ create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
+ create mode 100644 tools/kvm/include/kvm/kvm-ipc.h
+ create mode 100644 tools/kvm/include/kvm/kvm.h
+ create mode 100644 tools/kvm/include/kvm/msi.h
+ create mode 100644 tools/kvm/include/kvm/mutex.h
+ create mode 100644 tools/kvm/include/kvm/parse-options.h
+ create mode 100644 tools/kvm/include/kvm/pci-shmem.h
+ create mode 100644 tools/kvm/include/kvm/pci.h
+ create mode 100644 tools/kvm/include/kvm/qcow.h
+ create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
+ create mode 100644 tools/kvm/include/kvm/read-write.h
+ create mode 100644 tools/kvm/include/kvm/rtc.h
+ create mode 100644 tools/kvm/include/kvm/rwsem.h
+ create mode 100644 tools/kvm/include/kvm/sdl.h
+ create mode 100644 tools/kvm/include/kvm/segment.h
+ create mode 100644 tools/kvm/include/kvm/strbuf.h
+ create mode 100644 tools/kvm/include/kvm/symbol.h
+ create mode 100644 tools/kvm/include/kvm/term.h
+ create mode 100644 tools/kvm/include/kvm/threadpool.h
+ create mode 100644 tools/kvm/include/kvm/types.h
+ create mode 100644 tools/kvm/include/kvm/uip.h
+ create mode 100644 tools/kvm/include/kvm/util.h
+ create mode 100644 tools/kvm/include/kvm/vesa.h
+ create mode 100644 tools/kvm/include/kvm/virtio-9p.h
+ create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
+ create mode 100644 tools/kvm/include/kvm/virtio-blk.h
+ create mode 100644 tools/kvm/include/kvm/virtio-console.h
+ create mode 100644 tools/kvm/include/kvm/virtio-net.h
+ create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
+ create mode 100644 tools/kvm/include/kvm/virtio-pci.h
+ create mode 100644 tools/kvm/include/kvm/virtio-rng.h
+ create mode 100644 tools/kvm/include/kvm/virtio-trans.h
+ create mode 100644 tools/kvm/include/kvm/virtio.h
+ create mode 100644 tools/kvm/include/kvm/vnc.h
+ create mode 100644 tools/kvm/include/linux/bitops.h
+ create mode 100644 tools/kvm/include/linux/byteorder.h
+ create mode 100644 tools/kvm/include/linux/compiler.h
+ create mode 100644 tools/kvm/include/linux/kernel.h
+ create mode 100644 tools/kvm/include/linux/module.h
+ create mode 100644 tools/kvm/include/linux/prefetch.h
+ create mode 100644 tools/kvm/include/linux/types.h
+ create mode 100644 tools/kvm/ioeventfd.c
+ create mode 100644 tools/kvm/ioport.c
+ create mode 100644 tools/kvm/kvm-cmd.c
+ create mode 100644 tools/kvm/kvm-cpu.c
+ create mode 100644 tools/kvm/kvm-ipc.c
+ create mode 100644 tools/kvm/kvm.c
+ create mode 100644 tools/kvm/main.c
+ create mode 100644 tools/kvm/mmio.c
+ create mode 100644 tools/kvm/net/uip/arp.c
+ create mode 100644 tools/kvm/net/uip/buf.c
+ create mode 100644 tools/kvm/net/uip/core.c
+ create mode 100644 tools/kvm/net/uip/csum.c
+ create mode 100644 tools/kvm/net/uip/dhcp.c
+ create mode 100644 tools/kvm/net/uip/icmp.c
+ create mode 100644 tools/kvm/net/uip/ipv4.c
+ create mode 100644 tools/kvm/net/uip/tcp.c
+ create mode 100644 tools/kvm/net/uip/udp.c
+ create mode 100644 tools/kvm/pci.c
+ create mode 100644 tools/kvm/powerpc/boot.c
+ create mode 100644 tools/kvm/powerpc/cpu_info.c
+ create mode 100644 tools/kvm/powerpc/cpu_info.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/barrier.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/kvm-arch.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h
+ create mode 100644 tools/kvm/powerpc/ioport.c
+ create mode 100644 tools/kvm/powerpc/irq.c
+ create mode 100644 tools/kvm/powerpc/kvm-cpu.c
+ create mode 100644 tools/kvm/powerpc/kvm.c
+ create mode 100644 tools/kvm/powerpc/spapr.h
+ create mode 100644 tools/kvm/powerpc/spapr_hcall.c
+ create mode 100644 tools/kvm/powerpc/spapr_hvcons.c
+ create mode 100644 tools/kvm/powerpc/spapr_hvcons.h
+ create mode 100644 tools/kvm/powerpc/spapr_pci.c
+ create mode 100644 tools/kvm/powerpc/spapr_pci.h
+ create mode 100644 tools/kvm/powerpc/spapr_rtas.c
+ create mode 100644 tools/kvm/powerpc/xics.c
+ create mode 100644 tools/kvm/powerpc/xics.h
+ create mode 100644 tools/kvm/symbol.c
+ create mode 100644 tools/kvm/term.c
+ create mode 100644 tools/kvm/tests/Makefile
+ create mode 100644 tools/kvm/tests/boot/Makefile
+ create mode 100644 tools/kvm/tests/boot/init.c
+ create mode 100644 tools/kvm/tests/kernel/.gitignore
+ create mode 100644 tools/kvm/tests/kernel/Makefile
+ create mode 100644 tools/kvm/tests/kernel/README
+ create mode 100644 tools/kvm/tests/kernel/kernel.S
+ create mode 100644 tools/kvm/tests/pit/.gitignore
+ create mode 100644 tools/kvm/tests/pit/Makefile
+ create mode 100644 tools/kvm/tests/pit/README
+ create mode 100644 tools/kvm/tests/pit/tick.S
+ create mode 100644 tools/kvm/ui/sdl.c
+ create mode 100644 tools/kvm/ui/vnc.c
+ create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
+ create mode 100755 tools/kvm/util/generate-cmdlist.sh
+ create mode 100755 tools/kvm/util/kvm-ifup-vbr0
+ create mode 100644 tools/kvm/util/parse-options.c
+ create mode 100644 tools/kvm/util/rbtree-interval.c
+ create mode 100644 tools/kvm/util/read-write.c
+ create mode 100755 tools/kvm/util/set_private_br.sh
+ create mode 100644 tools/kvm/util/strbuf.c
+ create mode 100644 tools/kvm/util/threadpool.c
+ create mode 100644 tools/kvm/util/util.c
+ create mode 100644 tools/kvm/virtio/9p-pdu.c
+ create mode 100644 tools/kvm/virtio/9p.c
+ create mode 100644 tools/kvm/virtio/balloon.c
+ create mode 100644 tools/kvm/virtio/blk.c
+ create mode 100644 tools/kvm/virtio/console.c
+ create mode 100644 tools/kvm/virtio/core.c
+ create mode 100644 tools/kvm/virtio/net.c
+ create mode 100644 tools/kvm/virtio/pci.c
+ create mode 100644 tools/kvm/virtio/rng.c
+ create mode 100644 tools/kvm/virtio/trans.c
+ create mode 100644 tools/kvm/x86/bios.c
+ create mode 100644 tools/kvm/x86/bios/.gitignore
+ create mode 100644 tools/kvm/x86/bios/bios-rom.S
+ create mode 100644 tools/kvm/x86/bios/e820.c
+ create mode 100644 tools/kvm/x86/bios/entry.S
+ create mode 100644 tools/kvm/x86/bios/gen-offsets.sh
+ create mode 100644 tools/kvm/x86/bios/int10.c
+ create mode 100644 tools/kvm/x86/bios/int15.c
+ create mode 100644 tools/kvm/x86/bios/local.S
+ create mode 100644 tools/kvm/x86/bios/macro.S
+ create mode 100644 tools/kvm/x86/bios/memcpy.c
+ create mode 100644 tools/kvm/x86/bios/rom.ld.S
+ create mode 100644 tools/kvm/x86/boot.c
+ create mode 100644 tools/kvm/x86/cpuid.c
+ create mode 100644 tools/kvm/x86/include/kvm/assembly.h
+ create mode 100644 tools/kvm/x86/include/kvm/barrier.h
+ create mode 100644 tools/kvm/x86/include/kvm/bios-export.h
+ create mode 100644 tools/kvm/x86/include/kvm/bios.h
+ create mode 100644 tools/kvm/x86/include/kvm/boot-protocol.h
+ create mode 100644 tools/kvm/x86/include/kvm/cpufeature.h
+ create mode 100644 tools/kvm/x86/include/kvm/interrupt.h
+ create mode 100644 tools/kvm/x86/include/kvm/kvm-arch.h
+ create mode 100644 tools/kvm/x86/include/kvm/kvm-cpu-arch.h
+ create mode 100644 tools/kvm/x86/include/kvm/mptable.h
+ create mode 100644 tools/kvm/x86/interrupt.c
+ create mode 100644 tools/kvm/x86/ioport.c
+ create mode 100644 tools/kvm/x86/irq.c
+ create mode 100644 tools/kvm/x86/kvm-cpu.c
+ create mode 100644 tools/kvm/x86/kvm.c
+ create mode 100644 tools/kvm/x86/mptable.c
+Merging rcu/rcu/next (1cc8596 rcu: Stop spurious warnings from synchronize_sched_expedited)
+$ git merge rcu/rcu/next
+Already up-to-date.
+Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
+$ git merge cputime/cputime
+Already up-to-date.
+Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
+$ git merge uprobes/for-next
+Already up-to-date.
+Merging kmemleak/kmemleak (d65b4e9 Linux 3.3-rc3)
+$ git merge kmemleak/kmemleak
+Already up-to-date.
+Merging kvm/linux-next (cf9eeac KVM: Convert intx_mask_lock to spin lock)
+$ git merge kvm/linux-next
+Already up-to-date.
+Merging oprofile/for-next (c16fa4f Linux 3.3)
+$ git merge oprofile/for-next
+Already up-to-date.
+Merging xen/upstream/xen (59e9a6b Merge branch 'upstream/ticketlock-cleanup' into upstream/xen)
+$ git merge xen/upstream/xen
+Resolved 'arch/x86/include/asm/cmpxchg.h' using previous resolution.
+Auto-merging arch/x86/include/asm/cmpxchg.h
+CONFLICT (content): Merge conflict in arch/x86/include/asm/cmpxchg.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 0bbab52] Merge remote-tracking branch 'xen/upstream/xen'
+$ git diff -M --stat --summary HEAD^..
+Merging xen-two/linux-next (2faaa4d Merge branch 'stable/for-linus-3.4' into linux-next)
+$ git merge xen-two/linux-next
+Resolved 'arch/x86/include/asm/io_apic.h' using previous resolution.
+Resolved 'arch/x86/kernel/apic/io_apic.c' using previous resolution.
+Auto-merging arch/x86/kernel/apic/io_apic.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/apic/io_apic.c
+Auto-merging arch/x86/include/asm/io_apic.h
+CONFLICT (content): Merge conflict in arch/x86/include/asm/io_apic.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master da3394f] Merge remote-tracking branch 'xen-two/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/xen/cpu_hotplug.c | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
+$ git merge xen-pvhvm/linux-next
+Already up-to-date.
+Merging percpu/for-next (adb7950 percpu: fix __this_cpu_{sub,inc,dec}_return() definition)
+$ git merge percpu/for-next
+Already up-to-date.
+Merging workqueues/for-next (e06ffa1 workqueue: use percpu allocator for cwq on UP)
+$ git merge workqueues/for-next
+Already up-to-date.
+Merging drivers-x86/linux-next (86924de acer-wmi: add quirk table for video backlight vendor mode)
+$ git merge drivers-x86/linux-next
+Already up-to-date.
+Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
+$ git merge hwpoison/hwpoison
+Already up-to-date.
+Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
+$ git merge sysctl/master
+Already up-to-date.
+Merging regmap/for-next (315ea62 Merge tag 'regmap-3.4' into regmap-next)
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/internal.h | 7 +++--
+ drivers/base/regmap/regcache-rbtree.c | 2 +-
+ drivers/base/regmap/regmap.c | 48 +++++++++++++++++++++++++--------
+ 3 files changed, 43 insertions(+), 14 deletions(-)
+Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
+$ git merge hsi/for-next
+Already up-to-date.
+Merging driver-core/driver-core-next (dd775ae Linux 3.4-rc1)
+$ git merge driver-core/driver-core-next
+Already up-to-date.
+Merging tty/tty-next (dd775ae Linux 3.4-rc1)
+$ git merge tty/tty-next
+Already up-to-date.
+Merging usb/usb-next (dd775ae Linux 3.4-rc1)
+$ git merge usb/usb-next
+Already up-to-date.
+Merging staging/staging-next (dd775ae Linux 3.4-rc1)
+$ git merge staging/staging-next
+Already up-to-date.
+Merging char-misc/char-misc-next (dd775ae Linux 3.4-rc1)
+$ git merge char-misc/char-misc-next
+Already up-to-date.
+Merging tmem/linux-next (9c9fc31 Merge commit 'e22057c8599373e5caef0bc42bdb95d2a361ab0d' into linux-next)
+$ git merge tmem/linux-next
+Auto-merging mm/swapfile.c
+Auto-merging include/linux/swap.h
+Merge made by the 'recursive' strategy.
+ Documentation/vm/frontswap.txt | 210 +++++++++++++++++++++++++++++++
+ include/linux/frontswap.h | 126 +++++++++++++++++++
+ include/linux/swap.h | 4 +
+ include/linux/swapfile.h | 13 ++
+ mm/Kconfig | 17 +++
+ mm/Makefile | 1 +
+ mm/frontswap.c | 273 ++++++++++++++++++++++++++++++++++++++++
+ mm/page_io.c | 12 ++
+ mm/swapfile.c | 54 ++++++--
+ 9 files changed, 697 insertions(+), 13 deletions(-)
+ create mode 100644 Documentation/vm/frontswap.txt
+ create mode 100644 include/linux/frontswap.h
+ create mode 100644 include/linux/swapfile.h
+ create mode 100644 mm/frontswap.c
+Merging writeback/writeback-for-next (697e6fe writeback: Remove outdated comment)
+$ git merge writeback/writeback-for-next
+Already up-to-date.
+Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
+$ git merge arm-dt/devicetree/arm-next
+Already up-to-date.
+Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
+$ git merge hwspinlock/linux-next
+Already up-to-date.
+Merging pinctrl/for-next (51dddfe ARM: u300: configure some pins as an example)
+$ git merge pinctrl/for-next
+Already up-to-date.
+Merging moduleh/for-sfr (55ed7fb Merge branch 'system.h-fixes' into for-sfr)
+$ git merge moduleh/for-sfr
+Merge made by the 'recursive' strategy.
+ arch/alpha/include/asm/atomic.h | 68 +---------------
+ arch/alpha/include/asm/cmpxchg.h | 71 ++++++++++++++++
+ arch/alpha/include/asm/xchg.h | 4 +-
+ arch/arm/mach-msm/include/mach/uncompress.h | 1 +
+ arch/avr32/include/asm/mmu_context.h | 1 +
+ arch/avr32/mach-at32ap/include/mach/board.h | 2 +-
+ arch/blackfin/include/asm/cmpxchg.h | 3 +-
+ arch/frv/mb93090-mb00/pci-dma.c | 1 +
+ arch/parisc/include/asm/atomic.h | 107 +-----------------------
+ arch/parisc/include/asm/cmpxchg.h | 116 +++++++++++++++++++++++++++
+ include/asm-generic/cmpxchg.h | 1 +
+ include/linux/firewire.h | 3 +-
+ include/linux/platform_data/atmel.h | 6 +-
+ kernel/irq_work.c | 1 +
+ 14 files changed, 203 insertions(+), 182 deletions(-)
+ create mode 100644 arch/alpha/include/asm/cmpxchg.h
+ create mode 100644 arch/parisc/include/asm/cmpxchg.h
+Merging vhost/linux-next (437578b virtio-pci: switch to PM ops macro to initialise PM functions)
+$ git merge vhost/linux-next
+Merge made by the 'recursive' strategy.
+Merging kmap_atomic/kmap_atomic (317b6e1 feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal)
+$ git merge kmap_atomic/kmap_atomic
+Already up-to-date.
+Merging modem-shm/for-next (3cff1cc caif_shm: Add CAIF driver for Shared memory for M7400)
+$ git merge modem-shm/for-next
+Auto-merging include/linux/Kbuild
+Auto-merging drivers/Makefile
+Auto-merging drivers/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/Kconfig | 2 +
+ drivers/Makefile | 1 +
+ drivers/modem_shm/Kconfig | 62 ++
+ drivers/modem_shm/Makefile | 5 +
+ drivers/modem_shm/dummy_c2c_genio.c | 76 ++
+ drivers/modem_shm/shm_boot.c | 1208 ++++++++++++++++++++++++++
+ drivers/modem_shm/shm_bus.c | 113 +++
+ drivers/modem_shm/shm_chr.c | 1242 +++++++++++++++++++++++++++
+ drivers/modem_shm/shm_dev.c | 527 ++++++++++++
+ drivers/modem_shm/shm_ipctoc.h | 154 ++++
+ drivers/net/caif/Kconfig | 12 +-
+ drivers/net/caif/Makefile | 3 +-
+ drivers/net/caif/caif_shm.c | 900 +++++++++++++++++++
+ include/linux/Kbuild | 1 +
+ include/linux/c2c_genio.h | 195 +++++
+ include/linux/modem_shm/Kbuild | 1 +
+ include/linux/modem_shm/modem_shm_netlink.h | 95 ++
+ include/linux/modem_shm/shm_dev.h | 245 ++++++
+ 18 files changed, 4840 insertions(+), 2 deletions(-)
+ create mode 100644 drivers/modem_shm/Kconfig
+ create mode 100644 drivers/modem_shm/Makefile
+ create mode 100644 drivers/modem_shm/dummy_c2c_genio.c
+ create mode 100644 drivers/modem_shm/shm_boot.c
+ create mode 100644 drivers/modem_shm/shm_bus.c
+ create mode 100644 drivers/modem_shm/shm_chr.c
+ create mode 100644 drivers/modem_shm/shm_dev.c
+ create mode 100644 drivers/modem_shm/shm_ipctoc.h
+ create mode 100644 drivers/net/caif/caif_shm.c
+ create mode 100644 include/linux/c2c_genio.h
+ create mode 100644 include/linux/modem_shm/Kbuild
+ create mode 100644 include/linux/modem_shm/modem_shm_netlink.h
+ create mode 100644 include/linux/modem_shm/shm_dev.h
+Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
+$ git merge memblock/memblock-kill-early_node_map
+Already up-to-date.
+Merging remoteproc/for-next (e12bc14 remoteproc: s/big switch/lookup table/)
+$ git merge remoteproc/for-next
+Already up-to-date.
+Merging irqdomain/irqdomain/next (409a6f6 Merge branch 'irqdomain-for-grant' of git://sources.calxeda.com/kernel/linux into irqdomain/next)
+$ git merge irqdomain/irqdomain/next
+Resolved 'arch/arm/Kconfig' using previous resolution.
+Auto-merging drivers/gpio/gpio-pl061.c
+Auto-merging arch/arm/common/Kconfig
+Auto-merging arch/arm/Kconfig
+CONFLICT (content): Merge conflict in arch/arm/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 6d2d0d1] Merge remote-tracking branch 'irqdomain/irqdomain/next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/gpio/pl061-gpio.txt | 15 ++
+ arch/arm/Kconfig | 2 +-
+ arch/arm/common/Kconfig | 2 -
+ drivers/gpio/gpio-pl061.c | 48 ++++---
+ include/linux/irq.h | 15 ++
+ kernel/irq/generic-chip.c | 152 +++++++++++++++++---
+ 6 files changed, 186 insertions(+), 48 deletions(-)
+Merging gpio/gpio/next (c77c8a6 gpio/ep93xx: Remove unused inline function and useless pr_err message)
+$ git merge gpio/gpio/next
+Already up-to-date.
+Merging arm-soc/for-next (8bcb15a Merge branch 'fixes' into for-next)
+$ git merge arm-soc/for-next
+Auto-merging drivers/mmc/host/atmel-mci.c
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/Kconfig | 4 +-
+ arch/arm/arm-soc-for-next-contents.txt | 169 ++++++++++++++++++++++++++++++++
+ arch/arm/boot/dts/omap3-beagle.dts | 49 +++++++++
+ arch/arm/boot/dts/omap3.dtsi | 102 +++++++++++++++++++
+ arch/arm/boot/dts/omap4-panda.dts | 56 +++++++++++
+ arch/arm/boot/dts/omap4-sdp.dts | 97 ++++++++++++++++++
+ arch/arm/boot/dts/omap4.dtsi | 117 ++++++++++++++++++++++
+ arch/arm/boot/dts/twl4030.dtsi | 39 ++++++++
+ arch/arm/boot/dts/twl6030.dtsi | 86 ++++++++++++++++
+ arch/arm/mach-at91/Kconfig | 21 +++-
+ arch/arm/mach-omap2/board-generic.c | 37 +------
+ arch/arm/mach-omap2/devices.c | 4 +-
+ arch/arm/mach-omap2/gpio.c | 8 +-
+ drivers/char/hw_random/Kconfig | 2 +-
+ drivers/dma/Kconfig | 5 +-
+ drivers/input/touchscreen/Kconfig | 4 +-
+ drivers/mmc/host/Kconfig | 23 +----
+ drivers/mmc/host/atmel-mci.c | 2 -
+ drivers/rtc/Kconfig | 2 +-
+ 19 files changed, 752 insertions(+), 75 deletions(-)
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ create mode 100644 arch/arm/boot/dts/twl4030.dtsi
+ create mode 100644 arch/arm/boot/dts/twl6030.dtsi
+Merging kvmtool/master (dcf1396 tools/kvm: Fix compilation fallout from system.h split-up)
+$ git merge kvmtool/master
+Merge made by the 'recursive' strategy.
+ tools/kvm/x86/include/kvm/barrier.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging dma-mapping/dma-mapping-next (64d70fe common: DMA-mapping: add NON-CONSISTENT attribute)
+$ git merge dma-mapping/dma-mapping-next
+Auto-merging include/linux/dma-mapping.h
+Auto-merging drivers/iommu/intel-iommu.c
+Auto-merging drivers/iommu/amd_iommu.c
+Auto-merging arch/x86/kernel/pci-dma.c
+Auto-merging arch/x86/kernel/pci-calgary_64.c
+Auto-merging arch/powerpc/kernel/vio.c
+Auto-merging arch/powerpc/kernel/ibmebus.c
+Auto-merging arch/ia64/hp/common/sba_iommu.c
+Auto-merging arch/hexagon/kernel/dma.c
+Merge made by the 'recursive' strategy.
+ Documentation/DMA-attributes.txt | 18 ++++++++++++++++++
+ arch/alpha/include/asm/dma-mapping.h | 18 ++++++++++++------
+ arch/alpha/kernel/pci-noop.c | 10 ++++++----
+ arch/alpha/kernel/pci_iommu.c | 10 ++++++----
+ arch/hexagon/include/asm/dma-mapping.h | 18 ++++++++++++------
+ arch/hexagon/kernel/dma.c | 9 +++++----
+ arch/ia64/hp/common/sba_iommu.c | 11 ++++++-----
+ arch/ia64/include/asm/dma-mapping.h | 18 ++++++++++++------
+ arch/ia64/kernel/pci-swiotlb.c | 14 +++++++++++---
+ arch/ia64/sn/pci/pci_dma.c | 9 +++++----
+ arch/microblaze/include/asm/dma-mapping.h | 18 ++++++++++++------
+ arch/microblaze/kernel/dma.c | 10 ++++++----
+ arch/mips/cavium-octeon/dma-octeon.c | 12 ++++++------
+ arch/mips/include/asm/dma-mapping.h | 18 ++++++++++++------
+ arch/mips/mm/dma-default.c | 8 ++++----
+ arch/powerpc/include/asm/dma-mapping.h | 24 ++++++++++++++++--------
+ arch/powerpc/kernel/dma-iommu.c | 10 ++++++----
+ arch/powerpc/kernel/dma-swiotlb.c | 4 ++--
+ arch/powerpc/kernel/dma.c | 10 ++++++----
+ arch/powerpc/kernel/ibmebus.c | 10 ++++++----
+ arch/powerpc/kernel/vio.c | 14 ++++++++------
+ arch/powerpc/platforms/cell/iommu.c | 16 +++++++++-------
+ arch/powerpc/platforms/ps3/system-bus.c | 13 +++++++------
+ arch/sh/include/asm/dma-mapping.h | 28 ++++++++++++++++++----------
+ arch/sh/kernel/dma-nommu.c | 4 ++--
+ arch/sh/mm/consistent.c | 6 ++++--
+ arch/sparc/include/asm/dma-mapping.h | 18 ++++++++++++------
+ arch/sparc/kernel/iommu.c | 10 ++++++----
+ arch/sparc/kernel/ioport.c | 18 ++++++++++--------
+ arch/sparc/kernel/pci_sun4v.c | 9 +++++----
+ arch/unicore32/include/asm/dma-mapping.h | 18 ++++++++++++------
+ arch/unicore32/mm/dma-swiotlb.c | 18 ++++++++++++++++--
+ arch/x86/include/asm/dma-mapping.h | 26 ++++++++++++++++----------
+ arch/x86/kernel/amd_gart_64.c | 11 ++++++-----
+ arch/x86/kernel/pci-calgary_64.c | 9 +++++----
+ arch/x86/kernel/pci-dma.c | 3 ++-
+ arch/x86/kernel/pci-nommu.c | 6 +++---
+ arch/x86/kernel/pci-swiotlb.c | 17 +++++++++++++----
+ arch/x86/xen/pci-swiotlb-xen.c | 4 ++--
+ drivers/iommu/amd_iommu.c | 10 ++++++----
+ drivers/iommu/intel-iommu.c | 9 +++++----
+ drivers/xen/swiotlb-xen.c | 5 +++--
+ include/linux/dma-attrs.h | 2 ++
+ include/linux/dma-mapping.h | 13 +++++++++----
+ include/xen/swiotlb-xen.h | 6 ++++--
+ 45 files changed, 354 insertions(+), 198 deletions(-)
+Merging dma-buf/for-next (9f28056 dma-buf: Correct dummy function declarations.)
+$ git merge dma-buf/for-next
+Resolved 'include/linux/dma-buf.h' using previous resolution.
+Auto-merging include/linux/dma-buf.h
+CONFLICT (content): Merge conflict in include/linux/dma-buf.h
+Auto-merging drivers/base/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master af290a9] Merge remote-tracking branch 'dma-buf/for-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/base/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS)
+$ git merge ktest/for-next
+Already up-to-date.
+Merging cpuidle-cons/cpuidle_consol_pull (203b52e SH: shmobile: Consolidate time keeping and irq enable)
+$ git merge cpuidle-cons/cpuidle_consol_pull
+Resolved 'arch/arm/mach-at91/cpuidle.c' using previous resolution.
+Resolved 'arch/arm/mach-davinci/cpuidle.c' using previous resolution.
+Resolved 'arch/arm/mach-shmobile/cpuidle.c' using previous resolution.
+Resolved 'drivers/cpuidle/cpuidle.c' using previous resolution.
+Resolved 'include/linux/cpuidle.h' using previous resolution.
+Auto-merging include/linux/cpuidle.h
+CONFLICT (content): Merge conflict in include/linux/cpuidle.h
+Auto-merging drivers/cpuidle/cpuidle.c
+CONFLICT (content): Merge conflict in drivers/cpuidle/cpuidle.c
+Auto-merging arch/arm/mach-shmobile/cpuidle.c
+CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/cpuidle.c
+Auto-merging arch/arm/mach-davinci/cpuidle.c
+CONFLICT (content): Merge conflict in arch/arm/mach-davinci/cpuidle.c
+Auto-merging arch/arm/mach-at91/cpuidle.c
+CONFLICT (content): Merge conflict in arch/arm/mach-at91/cpuidle.c
+Auto-merging arch/arm/include/asm/cpuidle.h
+CONFLICT (add/add): Merge conflict in arch/arm/include/asm/cpuidle.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/arm/include/asm/cpuidle.h'.
+[master 8b3e615] Merge remote-tracking branch 'cpuidle-cons/cpuidle_consol_pull'
+$ git diff -M --stat --summary HEAD^..
+Merging scsi-post-merge/merge-base:master ()
+$ git clone -s -l -n -q . ../rebase-tmp
+$ cd ../rebase-tmp
+$ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm
+From ../next
+ * [new branch] quilt/akpm -> akpm
+$ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base
+From ../next
+ * [new branch] quilt/akpm-base -> akpm-base
+$ git checkout akpm
+Switched to branch 'akpm'
+$ git rebase --onto master akpm-base
+First, rewinding head to replay your work on top of it...
+Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
+Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
+Applying: acerhdf: add support for new hardware
+Applying: acerhdf: lowered default temp fanon/fanoff values
+Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
+Applying: intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND
+Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
+Applying: avr32: don't mask signals in the error path
+Applying: avr32: use set_current_blocked() in handle_signal/sys_rt_sigreturn
+Applying: avr32: use block_sigmask()
+Applying: x86: use this_cpu_xxx to replace percpu_xxx funcs
+Applying: x86: change percpu_read_stable() to this_cpu_read_stable()
+Applying: net: use this_cpu_xxx replace percpu_xxx funcs
+Applying: percpu: remove percpu_xxx() functions
+Applying: percpu-remove-percpu_xxx-functions-fix
+Applying: ia64: use set_current_blocked() and block_sigmask()
+Applying: microblaze: don't reimplement force_sigsegv()
+Applying: microblaze: no need to reset handler if SA_ONESHOT
+Applying: microblaze: fix signal masking
+Applying: microblaze: use set_current_blocked() and block_sigmask()
+Applying: MIPS: use set_current_blocked() and block_sigmask()
+Applying: score: don't mask signals if we fail to setup signal stack
+Applying: score: use set_current_blocked() and block_sigmask()
+Applying: unicore32: use block_sigmask()
+Applying: blackfin: use set_current_blocked() and block_sigmask()
+Applying: ocfs2: use find_last_bit()
+Applying: ocfs2: use bitmap_weight()
+Applying: parisc: use set_current_blocked() and block_sigmask()
+Applying: vfs: increment iversion when a file is truncated
+Applying: brlocks/lglocks: cleanups
+Applying: vfs: fix dup_mnt_ns
+Applying: hugetlbfs: lockdep annotate root inode properly
+Applying: libfs: add simple_open()
+Applying: scripts/coccinelle/api/simple_open.cocci: semantic patch for simple_open()
+Applying: simple_open: automatically convert to simple_open()
+Applying: simple_open-automatically-convert-to-simple_open-checkpatch-fixes
+Applying: fs: symlink restrictions on sticky directories
+Applying: fs-symlink-restrictions-on-sticky-directories-fix-2
+Applying: fs: hardlink creation restrictions
+Applying: fs-hardlink-creation-restrictions-fix
+Applying: fs: hardlink creation restriction cleanup
+Applying: mm: fix page-faults detection in swap-token logic
+Applying: mm: add extra free kbytes tunable
+Applying: mm-add-extra-free-kbytes-tunable-update
+Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
+Applying: frv: use set_current_blocked() and block_sigmask()
+Applying: h8300: use set_current_blocked() and block_sigmask()
+Applying: alpha: use set_current_blocked() and block_sigmask()
+Applying: m32r: use set_current_blocked() and block_sigmask()
+Applying: m68k: use set_current_blocked() and block_sigmask()
+Applying: mn10300: use set_current_blocked() and block_sigmask()
+Applying: C6X: use set_current_blocked() and block_sigmask()
+Applying: cris: use set_current_blocked() and block_sigmask()
+Applying: cris: select GENERIC_ATOMIC64
+Applying: um/kernel/trap.c: port OOM changes to handle_page_fault()
+Applying: ceph, cifs, nfs, fuse: boolean and / or confusion
+Applying: MAINTAINERS: fix REMOTEPROC F: typo
+Applying: checkpatch: suggest pr_<level> over printk(KERN_<LEVEL>
+Applying: init/do_mounts.c: create /root if it does not exist
+Applying: kmod: avoid deadlock from recursive kmod call
+Applying: kmod-avoid-deadlock-by-recursive-kmod-call-fix
+Applying: proc: clean up /proc/<pid>/environ handling
+Applying: ipc/sem.c: alternatives to preempt_disable()
+Applying: sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE
+Applying: fs, proc: introduce /proc/<pid>/task/<tid>/children entry
+Applying: syscalls, x86: add __NR_kcmp syscall
+Applying: syscalls-x86-add-__nr_kcmp-syscall-v8-fix
+Applying: syscalls-x86-add-__nr_kcmp-syscall-v8-fix-2
+Applying: c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat
+Applying: c/r: prctl: extend PR_SET_MM to set up more mm_struct entries
+Applying: c/r: prctl: add ability to set new mm_struct::exe_file
+Applying: c-r-prctl-add-ability-to-set-new-mm_struct-exe_file-v2
+Applying: c/r: prctl: add ability to get clear_tid_address
+Applying: c-r-prctl-add-ability-to-get-clear_tid_address-fix
+Applying: ramoops: use pstore interface
+Applying: ramoops: fix printk format warnings
+Applying: notify_change(): check that i_mutex is held
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm
+From ../rebase-tmp
+ + 91e597f...b488801 akpm -> akpm (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm (b488801 notify_change(): check that i_mutex is held)
+$ git merge --no-ff akpm
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/proc.txt | 23 +++
+ Documentation/ramoops.txt | 8 +-
+ Documentation/sysctl/fs.txt | 42 ++++
+ Documentation/sysctl/vm.txt | 16 ++
+ MAINTAINERS | 2 +-
+ arch/alpha/kernel/signal.c | 31 +--
+ arch/arm/mach-msm/smd_debug.c | 8 +-
+ arch/arm/mach-ux500/mbox-db5500.c | 2 +-
+ arch/avr32/kernel/signal.c | 26 +--
+ arch/blackfin/kernel/signal.c | 17 +-
+ arch/c6x/kernel/signal.c | 16 +-
+ arch/cris/Kconfig | 1 +
+ arch/cris/arch-v10/kernel/signal.c | 34 ++-
+ arch/cris/arch-v32/kernel/signal.c | 37 +---
+ arch/frv/kernel/signal.c | 32 +--
+ arch/h8300/kernel/signal.c | 33 +--
+ arch/ia64/kernel/signal.c | 15 +-
+ arch/m32r/kernel/signal.c | 12 +-
+ arch/m68k/kernel/signal_mm.c | 22 +-
+ arch/m68k/kernel/signal_no.c | 28 +--
+ arch/microblaze/kernel/signal.c | 42 ++--
+ arch/mips/kernel/signal.c | 27 +--
+ arch/mips/kernel/signal32.c | 20 +-
+ arch/mips/kernel/signal_n32.c | 10 +-
+ arch/mn10300/kernel/signal.c | 32 +--
+ arch/parisc/kernel/signal.c | 12 +-
+ arch/score/kernel/signal.c | 13 +-
+ arch/um/kernel/trap.c | 24 ++-
+ arch/unicore32/kernel/signal.c | 5 +-
+ arch/x86/include/asm/compat.h | 2 +-
+ arch/x86/include/asm/current.h | 2 +-
+ arch/x86/include/asm/desc.h | 1 +
+ arch/x86/include/asm/fpu-internal.h | 6 +-
+ arch/x86/include/asm/hardirq.h | 9 +-
+ arch/x86/include/asm/irq_regs.h | 4 +-
+ arch/x86/include/asm/mmu_context.h | 12 +-
+ arch/x86/include/asm/percpu.h | 24 +--
+ arch/x86/include/asm/smp.h | 4 +-
+ arch/x86/include/asm/stackprotector.h | 4 +-
+ arch/x86/include/asm/thread_info.h | 2 +-
+ arch/x86/include/asm/tlbflush.h | 4 +-
+ arch/x86/kernel/cpu/common.c | 2 +-
+ arch/x86/kernel/cpu/mcheck/mce.c | 4 +-
+ arch/x86/kernel/i387.c | 2 +-
+ arch/x86/kernel/kdebugfs.c | 9 +-
+ arch/x86/kernel/nmi_selftest.c | 1 +
+ arch/x86/kernel/paravirt.c | 12 +-
+ arch/x86/kernel/process.c | 2 +-
+ arch/x86/kernel/process_32.c | 2 +-
+ arch/x86/kernel/process_64.c | 10 +-
+ arch/x86/mm/tlb.c | 10 +-
+ arch/x86/platform/iris/iris.c | 67 +++++-
+ arch/x86/syscalls/syscall_32.tbl | 1 +
+ arch/x86/syscalls/syscall_64.tbl | 1 +
+ drivers/acpi/ec_sys.c | 8 +-
+ drivers/base/regmap/regmap-debugfs.c | 12 +-
+ drivers/bluetooth/btmrvl_debugfs.c | 26 +--
+ drivers/char/Kconfig | 1 +
+ drivers/char/ramoops.c | 204 +++++++++++++-----
+ drivers/char/virtio_console.c | 8 +-
+ drivers/dma/coh901318.c | 9 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 14 +-
+ drivers/hid/hid-picolcd.c | 16 +-
+ drivers/hid/hid-wiimote-debug.c | 8 +-
+ drivers/idle/i7300_idle.c | 8 +-
+ drivers/iommu/omap-iommu-debug.c | 10 +-
+ drivers/mfd/aat2870-core.c | 9 +-
+ drivers/mfd/ab3100-core.c | 8 +-
+ drivers/misc/ibmasm/ibmasmfs.c | 8 +-
+ drivers/mtd/ubi/debug.c | 10 +-
+ drivers/net/caif/caif_spi.c | 10 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 9 +-
+ drivers/net/wimax/i2400m/debugfs.c | 15 +-
+ drivers/net/wireless/ath/ath5k/debug.c | 23 +--
+ drivers/net/wireless/ath/ath6kl/debug.c | 42 ++--
+ drivers/net/wireless/ath/ath9k/debug.c | 37 ++--
+ drivers/net/wireless/ath/ath9k/dfs_debug.c | 9 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 26 +--
+ drivers/net/wireless/ath/ath9k/rc.c | 8 +-
+ drivers/net/wireless/ath/carl9170/debug.c | 7 +-
+ drivers/net/wireless/b43/debugfs.c | 8 +-
+ drivers/net/wireless/b43legacy/debugfs.c | 8 +-
+ drivers/net/wireless/iwlegacy/3945-rs.c | 8 +-
+ drivers/net/wireless/iwlegacy/4965-rs.c | 12 +-
+ drivers/net/wireless/iwlegacy/debug.c | 12 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 11 +-
+ drivers/net/wireless/iwlwifi/iwl-debugfs.c | 12 +-
+ drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 12 +-
+ drivers/net/wireless/iwmc3200wifi/debugfs.c | 14 +-
+ drivers/net/wireless/iwmc3200wifi/sdio.c | 9 +-
+ drivers/net/wireless/libertas/debugfs.c | 10 +-
+ drivers/net/wireless/mwifiex/debugfs.c | 18 +-
+ drivers/net/wireless/wl1251/debugfs.c | 14 +-
+ drivers/net/wireless/wl12xx/debugfs.c | 38 ++--
+ drivers/oprofile/oprofilefs.c | 14 +-
+ drivers/platform/x86/acerhdf.c | 67 ++++--
+ drivers/platform/x86/intel_mid_powerbtn.c | 2 +-
+ drivers/remoteproc/remoteproc_debugfs.c | 13 +-
+ drivers/scsi/lpfc/lpfc_debugfs.c | 9 +-
+ drivers/spi/spi-dw.c | 8 +-
+ drivers/tty/serial/mfd.c | 9 +-
+ drivers/tty/serial/pch_uart.c | 8 +-
+ drivers/usb/core/inode.c | 10 +-
+ drivers/usb/host/ehci-dbg.c | 9 +-
+ drivers/uwb/uwb-debug.c | 9 +-
+ fs/Kconfig | 60 ++++++
+ fs/attr.c | 8 +-
+ fs/cifs/cifsfs.c | 2 +-
+ fs/dcache.c | 4 +-
+ fs/debugfs/file.c | 14 +-
+ fs/dlm/debug_fs.c | 9 +-
+ fs/file_table.c | 17 +-
+ fs/hugetlbfs/inode.c | 1 +
+ fs/internal.h | 3 +-
+ fs/libfs.c | 8 +
+ fs/namei.c | 193 +++++++++++++++--
+ fs/namespace.c | 139 ++++++-------
+ fs/ocfs2/cluster/heartbeat.c | 40 +---
+ fs/pnode.c | 4 +-
+ fs/proc/array.c | 143 ++++++++++++-
+ fs/proc/base.c | 58 ++++--
+ fs/proc/internal.h | 1 +
+ fs/proc_namespace.c | 4 +-
+ fs/pstore/inode.c | 8 +-
+ include/linux/fs.h | 3 +
+ include/linux/kcmp.h | 17 ++
+ include/linux/lglock.h | 187 +++--------------
+ include/linux/mm_types.h | 1 +
+ include/linux/mmzone.h | 2 +-
+ include/linux/percpu.h | 54 -----
+ include/linux/prctl.h | 8 +
+ include/linux/swap.h | 36 ++++
+ include/linux/syscalls.h | 2 +
+ include/linux/topology.h | 4 +-
+ init/do_mounts.c | 3 +
+ ipc/sem.c | 250 ++++++++++++++++-------
+ kernel/Makefile | 5 +-
+ kernel/fork.c | 1 +
+ kernel/kcmp.c | 187 +++++++++++++++++
+ kernel/kmod.c | 31 ++-
+ kernel/lglock.c | 136 ++++++++++++
+ kernel/pid_namespace.c | 6 +-
+ kernel/sys.c | 182 ++++++++++++++---
+ kernel/sys_ni.c | 3 +
+ kernel/sysctl.c | 31 ++-
+ kernel/trace/blktrace.c | 18 +-
+ mm/memory.c | 13 ++
+ mm/page_alloc.c | 37 +++-
+ mm/rmap.c | 3 +-
+ net/mac80211/debugfs.c | 12 +-
+ net/mac80211/debugfs.h | 1 -
+ net/mac80211/debugfs_key.c | 4 +-
+ net/mac80211/debugfs_netdev.c | 2 +-
+ net/mac80211/debugfs_sta.c | 4 +-
+ net/mac80211/rate.c | 2 +-
+ net/netfilter/nf_conntrack_netlink.c | 5 +
+ net/netfilter/xt_TEE.c | 12 +-
+ net/socket.c | 4 +-
+ net/wireless/debugfs.c | 10 +-
+ scripts/checkpatch.pl | 13 ++
+ scripts/coccinelle/api/simple_open.cocci | 70 +++++++
+ sound/soc/imx/imx-audmux.c | 8 +-
+ sound/soc/soc-core.c | 8 +-
+ sound/soc/soc-dapm.c | 16 +-
+ tools/testing/selftests/Makefile | 2 +-
+ tools/testing/selftests/kcmp/Makefile | 29 +++
+ tools/testing/selftests/kcmp/kcmp_test.c | 94 +++++++++
+ 167 files changed, 2347 insertions(+), 1561 deletions(-)
+ create mode 100644 include/linux/kcmp.h
+ create mode 100644 kernel/kcmp.c
+ create mode 100644 kernel/lglock.c
+ create mode 100644 scripts/coccinelle/api/simple_open.cocci
+ create mode 100644 tools/testing/selftests/kcmp/Makefile
+ create mode 100644 tools/testing/selftests/kcmp/kcmp_test.c
projects / karo-tx-linux.git / commitdiff