--- /dev/null
+$ date
+Thursday 19 September 10:09:03 EST 2013
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at de0bc3d Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
+Merging origin/master (9baa505 Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux)
+$ git merge origin/master
+Updating de0bc3d..9baa505
+Fast-forward
+ Documentation/scheduler/sched-design-CFS.txt | 4 +-
+ arch/x86/Kconfig | 5 +-
+ arch/x86/kernel/cpu/perf_event_intel.c | 4 +-
+ arch/x86/kernel/cpu/perf_event_intel_ds.c | 1 +
+ arch/x86/kernel/entry_64.S | 15 ------
+ arch/x86/kernel/smpboot.c | 3 +-
+ arch/x86/kvm/emulate.c | 14 +++++-
+ arch/x86/kvm/paging_tmpl.h | 20 +++++++-
+ arch/x86/kvm/vmx.c | 13 +++++
+ drivers/hid/hid-core.c | 74 ++++++++++++++++++++++++----
+ drivers/hid/hid-input.c | 11 ++++-
+ drivers/hid/hid-lenovo-tpkbd.c | 25 +++++++---
+ drivers/hid/hid-lg2ff.c | 19 ++-----
+ drivers/hid/hid-lg3ff.c | 29 +++--------
+ drivers/hid/hid-lg4ff.c | 20 +-------
+ drivers/hid/hid-lgff.c | 17 +------
+ drivers/hid/hid-logitech-dj.c | 10 +++-
+ drivers/hid/hid-multitouch.c | 26 +++++-----
+ drivers/hid/hid-sony.c | 4 ++
+ drivers/hid/hid-steelseries.c | 5 ++
+ drivers/hid/hid-zpff.c | 18 ++-----
+ drivers/tty/tty_io.c | 3 +-
+ fs/pstore/platform.c | 29 ++++++++---
+ include/linux/hid.h | 4 ++
+ include/linux/kvm_host.h | 1 +
+ include/linux/timex.h | 1 +
+ include/uapi/linux/perf_event.h | 2 +-
+ kernel/sched/debug.c | 6 +--
+ kernel/sched/fair.c | 14 ++++--
+ kernel/sched/stats.h | 5 +-
+ kernel/time/ntp.c | 6 +--
+ kernel/time/timekeeping.c | 2 +
+ virt/kvm/async_pf.c | 5 +-
+ virt/kvm/kvm_main.c | 14 ++++--
+ 34 files changed, 260 insertions(+), 169 deletions(-)
+Merging fixes/master (fa8218d Merge tag 'regmap-v3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap)
+$ git merge fixes/master
+Already up-to-date.
+Merging kbuild-current/rc-fixes (ad81f05 Linux 3.11-rc1)
+$ git merge kbuild-current/rc-fixes
+Already up-to-date.
+Merging arc-current/for-curr (272b98c Linux 3.12-rc1)
+$ git merge arc-current/for-curr
+Already up-to-date.
+Merging arm-current/fixes (c89efa7 ARM: 7836/1: add __get_user_unaligned/__put_user_unaligned)
+$ git merge arm-current/fixes
+Merge made by the 'recursive' strategy.
+ arch/arm/include/asm/uaccess.h | 7 +++++++
+ 1 file changed, 7 insertions(+)
+Merging m68k-current/for-linus (21e884b m68k/m68knommu: Implement __get_user_unaligned/__put_user_unaligned())
+$ git merge m68k-current/for-linus
+Merge made by the 'recursive' strategy.
+ arch/m68k/include/asm/uaccess.h | 7 +++++++
+ 1 file changed, 7 insertions(+)
+Merging metag-fixes/fixes (3b2f64d Linux 3.11-rc2)
+$ git merge metag-fixes/fixes
+Already up-to-date.
+Merging powerpc-merge/merge (363edbe powerpc: Default arch idle could cede processor on pseries)
+$ git merge powerpc-merge/merge
+Already up-to-date.
+Merging sparc/master (4de9ad9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile)
+$ git merge sparc/master
+Already up-to-date.
+Merging net/master (bd784a1 net:dccp: do not report ICMP redirects to user space)
+$ git merge net/master
+Merge made by the 'recursive' strategy.
+ Documentation/networking/bonding.txt | 6 ++
+ drivers/atm/he.c | 13 +--
+ drivers/atm/nicstar.c | 2 +-
+ drivers/bcma/scan.c | 12 ++-
+ drivers/isdn/hardware/mISDN/hfcpci.c | 4 +-
+ drivers/isdn/hisax/amd7930_fn.c | 4 +-
+ drivers/isdn/hisax/avm_pci.c | 4 +-
+ drivers/isdn/hisax/config.c | 2 +-
+ drivers/isdn/hisax/diva.c | 4 +-
+ drivers/isdn/hisax/elsa.c | 2 +-
+ drivers/isdn/hisax/elsa_ser.c | 2 +-
+ drivers/isdn/hisax/hfc_pci.c | 2 +-
+ drivers/isdn/hisax/hfc_sx.c | 2 +-
+ drivers/isdn/hisax/hscx_irq.c | 4 +-
+ drivers/isdn/hisax/icc.c | 4 +-
+ drivers/isdn/hisax/ipacx.c | 8 +-
+ drivers/isdn/hisax/isac.c | 4 +-
+ drivers/isdn/hisax/isar.c | 6 +-
+ drivers/isdn/hisax/jade.c | 18 +---
+ drivers/isdn/hisax/jade_irq.c | 4 +-
+ drivers/isdn/hisax/l3_1tr6.c | 50 ++++-----
+ drivers/isdn/hisax/netjet.c | 2 +-
+ drivers/isdn/hisax/q931.c | 6 +-
+ drivers/isdn/hisax/w6692.c | 8 +-
+ drivers/net/bonding/bond_alb.c | 2 +-
+ drivers/net/bonding/bond_alb.h | 9 +-
+ drivers/net/bonding/bond_main.c | 1 +
+ drivers/net/bonding/bond_sysfs.c | 39 +++++++
+ drivers/net/bonding/bonding.h | 1 +
+ drivers/net/ethernet/adi/bfin_mac.c | 4 +-
+ drivers/net/ethernet/amd/sun3lance.c | 2 +-
+ drivers/net/ethernet/atheros/alx/main.c | 9 +-
+ drivers/net/ethernet/broadcom/bgmac.c | 44 +++++---
+ drivers/net/ethernet/broadcom/bgmac.h | 4 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 37 ++++++-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 8 +-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 4 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 14 ++-
+ drivers/net/ethernet/broadcom/cnic.c | 6 +-
+ drivers/net/ethernet/broadcom/tg3.c | 6 +-
+ drivers/net/ethernet/broadcom/tg3.h | 1 -
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 4 +-
+ drivers/net/ethernet/dec/tulip/de4x5.c | 2 +-
+ drivers/net/ethernet/emulex/benet/be_main.c | 2 +-
+ drivers/net/ethernet/freescale/fec_main.c | 2 +-
+ drivers/net/ethernet/hp/hp100.c | 2 +-
+ drivers/net/ethernet/ibm/ehea/ehea_main.c | 21 +++-
+ drivers/net/ethernet/intel/e1000e/ethtool.c | 8 ++
+ drivers/net/ethernet/intel/e1000e/ich8lan.c | 13 ++-
+ drivers/net/ethernet/intel/e1000e/ich8lan.h | 2 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 2 +-
+ drivers/net/ethernet/intel/igb/e1000_82575.c | 4 +
+ drivers/net/ethernet/intel/igb/e1000_mac.c | 10 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 25 +++++
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 19 +++-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 +
+ drivers/net/ethernet/lantiq_etop.c | 6 +-
+ drivers/net/ethernet/marvell/pxa168_eth.c | 3 +-
+ drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 16 +--
+ drivers/net/ethernet/micrel/ks8851_mll.c | 2 +-
+ drivers/net/ethernet/natsemi/jazzsonic.c | 3 +-
+ drivers/net/ethernet/natsemi/xtsonic.c | 3 +-
+ drivers/net/ethernet/pasemi/pasemi_mac.c | 4 +-
+ .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 1 +
+ drivers/net/ethernet/realtek/r8169.c | 1 +
+ drivers/net/ethernet/sfc/Kconfig | 2 +-
+ drivers/net/ethernet/sfc/ef10.c | 58 +++++++----
+ drivers/net/ethernet/sfc/mcdi_port.c | 2 +
+ drivers/net/ethernet/sfc/nic.h | 3 +
+ drivers/net/ethernet/smsc/smc91x.h | 2 +-
+ drivers/net/ethernet/smsc/smsc9420.c | 3 +-
+ drivers/net/ethernet/toshiba/ps3_gelic_net.c | 2 +-
+ drivers/net/irda/mcs7780.c | 40 ++++---
+ drivers/net/loopback.c | 1 +
+ drivers/net/phy/cicada.c | 4 +-
+ drivers/net/tun.c | 11 +-
+ drivers/net/usb/cdc_ether.c | 115 ++++++++-------------
+ drivers/net/vxlan.c | 40 +++----
+ drivers/net/wireless/brcm80211/Kconfig | 4 +-
+ drivers/net/wireless/cw1200/cw1200_spi.c | 28 ++++-
+ drivers/net/wireless/cw1200/fwio.c | 2 +-
+ drivers/net/wireless/cw1200/hwbus.h | 1 +
+ drivers/net/wireless/cw1200/hwio.c | 15 +++
+ drivers/net/wireless/rt2x00/rt2800lib.c | 11 +-
+ drivers/net/wireless/rtl818x/rtl8187/dev.c | 15 ++-
+ drivers/net/xen-netback/interface.c | 2 +-
+ drivers/net/xen-netback/netback.c | 94 +++++++++++------
+ drivers/scsi/bnx2fc/bnx2fc.h | 2 +-
+ drivers/scsi/bnx2fc/bnx2fc_hwi.c | 3 +-
+ drivers/scsi/bnx2i/bnx2i.h | 2 +-
+ drivers/scsi/bnx2i/bnx2i_hwi.c | 3 +-
+ include/linux/netdevice.h | 8 +-
+ include/linux/netfilter/ipset/ip_set.h | 6 +-
+ include/net/netfilter/nf_conntrack_extend.h | 2 +-
+ net/batman-adv/soft-interface.c | 2 +
+ net/bridge/br_netlink.c | 4 +-
+ net/bridge/br_private.h | 8 +-
+ net/bridge/br_stp.c | 23 +++--
+ net/bridge/br_stp_if.c | 12 ++-
+ net/core/netpoll.c | 2 +-
+ net/dccp/ipv6.c | 1 +
+ net/ipv4/tcp_metrics.c | 4 +-
+ net/ipv6/ip6_tunnel.c | 4 +-
+ net/ipv6/netfilter/nf_nat_proto_icmpv6.c | 4 +-
+ net/netfilter/ipset/ip_set_core.c | 5 +-
+ net/netfilter/ipset/ip_set_getport.c | 4 +-
+ net/netfilter/ipset/ip_set_hash_gen.h | 28 ++---
+ net/netfilter/ipset/ip_set_hash_ipportnet.c | 4 +-
+ net/netfilter/ipset/ip_set_hash_net.c | 4 +-
+ net/netfilter/ipset/ip_set_hash_netiface.c | 4 +-
+ net/netfilter/ipset/ip_set_hash_netport.c | 4 +-
+ net/netfilter/nfnetlink_queue_core.c | 2 +-
+ net/sctp/input.c | 3 +-
+ net/sctp/ipv6.c | 44 +++-----
+ 114 files changed, 699 insertions(+), 468 deletions(-)
+Merging ipsec/master (33fce60 xfrm: Guard IPsec anti replay window against replay bitmap)
+$ git merge ipsec/master
+Merge made by the 'recursive' strategy.
+ net/ipv4/xfrm4_policy.c | 1 +
+ net/ipv6/ah6.c | 3 +--
+ net/ipv6/esp6.c | 3 +--
+ net/ipv6/ipcomp6.c | 3 +--
+ net/ipv6/xfrm6_policy.c | 1 +
+ net/key/af_key.c | 3 ++-
+ net/xfrm/xfrm_replay.c | 3 +--
+ net/xfrm/xfrm_user.c | 5 +++--
+ 8 files changed, 11 insertions(+), 11 deletions(-)
+Merging sound-current/for-linus (3d0049e Merge tag 'asoc-v3.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
+$ git merge sound-current/for-linus
+Already up-to-date.
+Merging pci-current/for-linus (a923874 Merge tag 'pci-v3.12-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
+$ git merge pci-current/for-linus
+Already up-to-date.
+Merging wireless/master (f4e1a4d rt2800: change initialization sequence to fix system freeze)
+$ git merge wireless/master
+Already up-to-date.
+Merging driver-core.current/driver-core-linus (272b98c Linux 3.12-rc1)
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus (93a8d41 n_tty: Fix EOF push index when termios changes)
+$ git merge tty.current/tty-linus
+Merge made by the 'recursive' strategy.
+ drivers/tty/n_tty.c | 3 +--
+ drivers/tty/serial/pch_uart.c | 13 +++----------
+ drivers/tty/serial/serial-tegra.c | 4 +++-
+ 3 files changed, 7 insertions(+), 13 deletions(-)
+Merging usb.current/usb-linus (42f4891 Merge tag 'fixes-for-v3.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus)
+$ git merge usb.current/usb-linus
+Merge made by the 'recursive' strategy.
+ drivers/usb/dwc3/Kconfig | 1 -
+ drivers/usb/dwc3/dwc3-pci.c | 2 ++
+ drivers/usb/dwc3/gadget.c | 6 ++----
+ drivers/usb/gadget/cdc2.c | 19 +---------------
+ drivers/usb/gadget/dummy_hcd.c | 7 +++---
+ drivers/usb/gadget/f_ecm.c | 2 +-
+ drivers/usb/gadget/f_eem.c | 2 +-
+ drivers/usb/gadget/f_mass_storage.c | 2 ++
+ drivers/usb/gadget/fotg210-udc.c | 2 +-
+ drivers/usb/gadget/fusb300_udc.c | 2 +-
+ drivers/usb/gadget/multi.c | 8 +++----
+ drivers/usb/gadget/mv_u3d_core.c | 3 +++
+ drivers/usb/gadget/s3c-hsotg.c | 13 ++++-------
+ drivers/usb/host/ehci-fsl.c | 2 +-
+ drivers/usb/host/ehci-grlib.c | 2 +-
+ drivers/usb/host/ehci-hcd.c | 2 +-
+ drivers/usb/host/ehci-mv.c | 2 +-
+ drivers/usb/host/ehci-octeon.c | 2 +-
+ drivers/usb/host/ehci-pmcmsp.c | 2 +-
+ drivers/usb/host/ehci-ppc-of.c | 2 +-
+ drivers/usb/host/ehci-ps3.c | 2 +-
+ drivers/usb/host/ehci-q.c | 5 +++++
+ drivers/usb/host/ehci-sead3.c | 2 +-
+ drivers/usb/host/ehci-sh.c | 2 +-
+ drivers/usb/host/ehci-tilegx.c | 2 +-
+ drivers/usb/host/ehci-w90x900.c | 2 +-
+ drivers/usb/host/ehci-xilinx-of.c | 2 +-
+ drivers/usb/host/fsl-mph-dr-of.c | 6 +++---
+ drivers/usb/phy/phy-omap-usb3.c | 2 +-
+ drivers/usb/serial/Kconfig | 2 +-
+ drivers/usb/serial/pl2303.c | 43 +++++++++++++++++++++++++++----------
+ 31 files changed, 81 insertions(+), 72 deletions(-)
+Merging staging.current/staging-linus (c3cb718 staging: line6: add bounds check in snd_toneport_source_put())
+$ git merge staging.current/staging-linus
+Merge made by the 'recursive' strategy.
+ drivers/staging/comedi/Kconfig | 33 +++++++++++-----------
+ drivers/staging/dgap/dgap_driver.c | 17 ++++++-----
+ drivers/staging/dgnc/dgnc_driver.c | 4 +--
+ drivers/staging/line6/toneport.c | 10 +++++--
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 2 +-
+ .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 2 +-
+ drivers/staging/lustre/lustre/Kconfig | 4 +--
+ drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 4 +--
+ drivers/staging/lustre/lustre/libcfs/workitem.c | 2 +-
+ drivers/staging/lustre/lustre/ptlrpc/pinger.c | 4 +--
+ drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 8 +++---
+ drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 4 +--
+ drivers/staging/lustre/lustre/ptlrpc/service.c | 6 ++--
+ drivers/staging/octeon/ethernet-mem.c | 7 +----
+ drivers/staging/octeon/ethernet-rgmii.c | 4 +--
+ drivers/staging/octeon/ethernet-rx.c | 5 +---
+ drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 14 ++++-----
+ drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 2 +-
+ drivers/staging/rtl8188eu/include/odm.h | 2 +-
+ drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 2 +-
+ drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 1 +
+ drivers/staging/vt6656/card.c | 4 +--
+ drivers/staging/xillybus/xillybus_core.c | 2 +-
+ drivers/staging/zram/zram_drv.c | 1 -
+ 25 files changed, 72 insertions(+), 74 deletions(-)
+Merging char-misc.current/char-misc-linus (272b98c Linux 3.12-rc1)
+$ git merge char-misc.current/char-misc-linus
+Already up-to-date.
+Merging input-current/for-linus (2f0d260 Input: i8042 - i8042_flush fix for a full 8042 buffer)
+$ git merge input-current/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/input/keyboard/pxa27x_keypad.c | 11 +++++++++--
+ drivers/input/serio/i8042.c | 23 ++++++++++++++---------
+ 2 files changed, 23 insertions(+), 11 deletions(-)
+Merging md-current/for-linus (f94c0b6 md/raid5: fix interaction of 'replace' and 'recovery'.)
+$ 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 (26052f9 crypto: crct10dif - Add fallback for broken initrds)
+$ git merge crypto-current/master
+Already up-to-date.
+Merging ide/master (64110c1 ide: sgiioc4: Staticize ioc4_ide_attach_one())
+$ git merge ide/master
+Already up-to-date.
+Merging dwmw2/master (5950f08 pcmcia: remove RPX board stuff)
+$ git merge dwmw2/master
+Already up-to-date.
+Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
+$ git merge sh-current/sh-fixes-for-linus
+Already up-to-date.
+Merging devicetree-current/devicetree/merge (cf9e236 of/irq: init struct resource to 0 in of_irq_to_resource())
+$ git merge devicetree-current/devicetree/merge
+Already up-to-date.
+Merging rr-fixes/fixes (6c2580c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32)
+$ git merge rr-fixes/fixes
+Already up-to-date.
+Merging mfd-fixes/master (5649d8f mfd: ab8500-sysctrl: Let sysctrl driver work without pdata)
+$ git merge mfd-fixes/master
+Already up-to-date.
+Merging vfio-fixes/for-linus (d24cdbf vfio-pci: Avoid deadlock on remove)
+$ git merge vfio-fixes/for-linus
+Already up-to-date.
+Merging drm-intel-fixes/for-linux-next-fixes (571c608 drm/i915: kill set_need_resched)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/i915_gem.c | 11 +++---
+ drivers/gpu/drm/i915/i915_irq.c | 68 ++++++++++++++++++++++++++++--------
+ drivers/gpu/drm/i915/intel_ddi.c | 2 +-
+ drivers/gpu/drm/i915/intel_display.c | 27 ++++++++------
+ drivers/gpu/drm/i915/intel_drv.h | 1 +
+ drivers/gpu/drm/i915/intel_dvo.c | 2 ++
+ drivers/gpu/drm/i915/intel_panel.c | 1 +
+ drivers/gpu/drm/i915/intel_pm.c | 6 ++--
+ drivers/gpu/drm/i915/intel_sdvo.c | 63 +++++++++++++++++++--------------
+ 9 files changed, 118 insertions(+), 63 deletions(-)
+Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu)
+$ git merge asm-generic/master
+Already up-to-date.
+Merging arc/for-next (d8dfad3 Linux 3.11-rc7)
+$ git merge arc/for-next
+Already up-to-date.
+Merging arm/for-next (e2639ea Merge branches 'devel-stable' and 'fixes' into for-next)
+$ git merge arm/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/Kconfig | 26 ++
+ arch/arm/common/Makefile | 2 +
+ arch/arm/common/bL_switcher.c | 606 +++++++++++++++++++++++++++++++++
+ arch/arm/common/bL_switcher_dummy_if.c | 71 ++++
+ arch/arm/include/asm/bL_switcher.h | 17 +
+ arch/arm/kernel/sleep.S | 26 +-
+ arch/arm/kernel/suspend.c | 8 +-
+ drivers/irqchip/irq-gic.c | 108 +++++-
+ include/linux/irqchip/arm-gic.h | 5 +
+ 9 files changed, 848 insertions(+), 21 deletions(-)
+ create mode 100644 arch/arm/common/bL_switcher.c
+ create mode 100644 arch/arm/common/bL_switcher_dummy_if.c
+ create mode 100644 arch/arm/include/asm/bL_switcher.h
+Merging arm-perf/for-next/perf (e65c630 Merge branch 'for-arm-soc/cci-pmu-v2' into for-next/perf)
+$ git merge arm-perf/for-next/perf
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/cci.txt | 60 ++-
+ arch/arm/Kconfig | 2 +
+ arch/arm/include/uapi/asm/Kbuild | 1 +
+ arch/arm/include/uapi/asm/perf_regs.h | 23 +
+ arch/arm/kernel/Makefile | 1 +
+ arch/arm/kernel/perf_regs.c | 30 ++
+ drivers/bus/arm-cci.c | 636 +++++++++++++++++++++++++-
+ tools/perf/arch/arm/Makefile | 3 +
+ tools/perf/arch/arm/include/perf_regs.h | 54 +++
+ tools/perf/arch/arm/util/unwind.c | 48 ++
+ tools/perf/config/Makefile | 7 +-
+ 11 files changed, 855 insertions(+), 10 deletions(-)
+ create mode 100644 arch/arm/include/uapi/asm/perf_regs.h
+ create mode 100644 arch/arm/kernel/perf_regs.c
+ create mode 100644 tools/perf/arch/arm/include/perf_regs.h
+ create mode 100644 tools/perf/arch/arm/util/unwind.c
+Merging arm64/upstream (4d5e0b1 Documentation/arm64: clarify requirements for DTB placement)
+$ git merge arm64/upstream
+Already up-to-date.
+Merging blackfin/for-linus (08b67fa blackfin: Ignore generated uImages)
+$ git merge blackfin/for-linus
+Already up-to-date.
+Merging c6x/for-linux-next (1a81b94 c6x: remove unused parameter in Kconfig)
+$ git merge c6x/for-linux-next
+Merge made by the 'recursive' strategy.
+ arch/c6x/Kconfig | 4 ----
+ 1 file changed, 4 deletions(-)
+Merging cris/for-next (be8cb7f CRIS: drop unused Kconfig symbols)
+$ git merge cris/for-next
+Already up-to-date.
+Merging h8300-remove/h8300-remove (e9783b0 Revert "drivers: parport: Kconfig: exclude h8300 for PARPORT_PC")
+$ git merge h8300-remove/h8300-remove
+Removing drivers/net/ethernet/8390/ne-h8300.c
+Removing drivers/ide/ide-h8300.c
+Removing arch/h8300/platform/h8s/ptrace_h8s.c
+Removing arch/h8300/platform/h8s/irq.c
+Removing arch/h8300/platform/h8s/generic/crt0_rom.S
+Removing arch/h8300/platform/h8s/generic/crt0_ram.S
+Removing arch/h8300/platform/h8s/generic/Makefile
+Removing arch/h8300/platform/h8s/edosk2674/crt0_rom.S
+Removing arch/h8300/platform/h8s/edosk2674/crt0_ram.S
+Removing arch/h8300/platform/h8s/edosk2674/Makefile
+Removing arch/h8300/platform/h8s/Makefile
+Removing arch/h8300/platform/h8300h/ptrace_h8300h.c
+Removing arch/h8300/platform/h8300h/irq.c
+Removing arch/h8300/platform/h8300h/h8max/crt0_ram.S
+Removing arch/h8300/platform/h8300h/h8max/Makefile
+Removing arch/h8300/platform/h8300h/generic/crt0_rom.S
+Removing arch/h8300/platform/h8300h/generic/crt0_ram.S
+Removing arch/h8300/platform/h8300h/generic/Makefile
+Removing arch/h8300/platform/h8300h/aki3068net/crt0_ram.S
+Removing arch/h8300/platform/h8300h/aki3068net/Makefile
+Removing arch/h8300/platform/h8300h/Makefile
+Removing arch/h8300/mm/memory.c
+Removing arch/h8300/mm/kmap.c
+Removing arch/h8300/mm/init.c
+Removing arch/h8300/mm/fault.c
+Removing arch/h8300/mm/Makefile
+Removing arch/h8300/lib/romfs.S
+Removing arch/h8300/lib/memset.S
+Removing arch/h8300/lib/memcpy.S
+Removing arch/h8300/lib/checksum.c
+Removing arch/h8300/lib/ashrdi3.c
+Removing arch/h8300/lib/abs.S
+Removing arch/h8300/lib/Makefile
+Removing arch/h8300/kernel/vmlinux.lds.S
+Removing arch/h8300/kernel/traps.c
+Removing arch/h8300/kernel/timer/tpu.c
+Removing arch/h8300/kernel/timer/timer8.c
+Removing arch/h8300/kernel/timer/timer16.c
+Removing arch/h8300/kernel/timer/itu.c
+Removing arch/h8300/kernel/timer/Makefile
+Removing arch/h8300/kernel/time.c
+Removing arch/h8300/kernel/syscalls.S
+Removing arch/h8300/kernel/sys_h8300.c
+Removing arch/h8300/kernel/signal.c
+Removing arch/h8300/kernel/setup.c
+Removing arch/h8300/kernel/ptrace.c
+Removing arch/h8300/kernel/process.c
+Removing arch/h8300/kernel/module.c
+Removing arch/h8300/kernel/irq.c
+Removing arch/h8300/kernel/h8300_ksyms.c
+Removing arch/h8300/kernel/gpio.c
+Removing arch/h8300/kernel/entry.S
+Removing arch/h8300/kernel/asm-offsets.c
+Removing arch/h8300/kernel/Makefile
+Removing arch/h8300/include/uapi/asm/unistd.h
+Removing arch/h8300/include/uapi/asm/types.h
+Removing arch/h8300/include/uapi/asm/termios.h
+Removing arch/h8300/include/uapi/asm/termbits.h
+Removing arch/h8300/include/uapi/asm/swab.h
+Removing arch/h8300/include/uapi/asm/statfs.h
+Removing arch/h8300/include/uapi/asm/stat.h
+Removing arch/h8300/include/uapi/asm/sockios.h
+Removing arch/h8300/include/uapi/asm/socket.h
+Removing arch/h8300/include/uapi/asm/signal.h
+Removing arch/h8300/include/uapi/asm/siginfo.h
+Removing arch/h8300/include/uapi/asm/sigcontext.h
+Removing arch/h8300/include/uapi/asm/shmbuf.h
+Removing arch/h8300/include/uapi/asm/setup.h
+Removing arch/h8300/include/uapi/asm/sembuf.h
+Removing arch/h8300/include/uapi/asm/resource.h
+Removing arch/h8300/include/uapi/asm/ptrace.h
+Removing arch/h8300/include/uapi/asm/posix_types.h
+Removing arch/h8300/include/uapi/asm/poll.h
+Removing arch/h8300/include/uapi/asm/param.h
+Removing arch/h8300/include/uapi/asm/msgbuf.h
+Removing arch/h8300/include/uapi/asm/mman.h
+Removing arch/h8300/include/uapi/asm/kvm_para.h
+Removing arch/h8300/include/uapi/asm/ipcbuf.h
+Removing arch/h8300/include/uapi/asm/ioctls.h
+Removing arch/h8300/include/uapi/asm/ioctl.h
+Removing arch/h8300/include/uapi/asm/fcntl.h
+Removing arch/h8300/include/uapi/asm/errno.h
+Removing arch/h8300/include/uapi/asm/byteorder.h
+Removing arch/h8300/include/uapi/asm/bitsperlong.h
+Removing arch/h8300/include/uapi/asm/auxvec.h
+Removing arch/h8300/include/uapi/asm/Kbuild
+Removing arch/h8300/include/asm/virtconvert.h
+Removing arch/h8300/include/asm/user.h
+Removing arch/h8300/include/asm/unistd.h
+Removing arch/h8300/include/asm/unaligned.h
+Removing arch/h8300/include/asm/ucontext.h
+Removing arch/h8300/include/asm/uaccess.h
+Removing arch/h8300/include/asm/types.h
+Removing arch/h8300/include/asm/traps.h
+Removing arch/h8300/include/asm/topology.h
+Removing arch/h8300/include/asm/tlbflush.h
+Removing arch/h8300/include/asm/tlb.h
+Removing arch/h8300/include/asm/timex.h
+Removing arch/h8300/include/asm/timer.h
+Removing arch/h8300/include/asm/thread_info.h
+Removing arch/h8300/include/asm/termios.h
+Removing arch/h8300/include/asm/target_time.h
+Removing arch/h8300/include/asm/switch_to.h
+Removing arch/h8300/include/asm/string.h
+Removing arch/h8300/include/asm/spinlock.h
+Removing arch/h8300/include/asm/smp.h
+Removing arch/h8300/include/asm/signal.h
+Removing arch/h8300/include/asm/shmparam.h
+Removing arch/h8300/include/asm/shm.h
+Removing arch/h8300/include/asm/sh_bios.h
+Removing arch/h8300/include/asm/segment.h
+Removing arch/h8300/include/asm/sections.h
+Removing arch/h8300/include/asm/scatterlist.h
+Removing arch/h8300/include/asm/regs306x.h
+Removing arch/h8300/include/asm/regs267x.h
+Removing arch/h8300/include/asm/ptrace.h
+Removing arch/h8300/include/asm/processor.h
+Removing arch/h8300/include/asm/pgtable.h
+Removing arch/h8300/include/asm/pgalloc.h
+Removing arch/h8300/include/asm/percpu.h
+Removing arch/h8300/include/asm/pci.h
+Removing arch/h8300/include/asm/param.h
+Removing arch/h8300/include/asm/page_offset.h
+Removing arch/h8300/include/asm/page.h
+Removing arch/h8300/include/asm/mutex.h
+Removing arch/h8300/include/asm/mmu_context.h
+Removing arch/h8300/include/asm/mc146818rtc.h
+Removing arch/h8300/include/asm/local64.h
+Removing arch/h8300/include/asm/local.h
+Removing arch/h8300/include/asm/kmap_types.h
+Removing arch/h8300/include/asm/kdebug.h
+Removing arch/h8300/include/asm/irqflags.h
+Removing arch/h8300/include/asm/irq_regs.h
+Removing arch/h8300/include/asm/irq.h
+Removing arch/h8300/include/asm/io.h
+Removing arch/h8300/include/asm/hw_irq.h
+Removing arch/h8300/include/asm/hardirq.h
+Removing arch/h8300/include/asm/gpio-internal.h
+Removing arch/h8300/include/asm/futex.h
+Removing arch/h8300/include/asm/ftrace.h
+Removing arch/h8300/include/asm/fpu.h
+Removing arch/h8300/include/asm/flat.h
+Removing arch/h8300/include/asm/fb.h
+Removing arch/h8300/include/asm/emergency-restart.h
+Removing arch/h8300/include/asm/elf.h
+Removing arch/h8300/include/asm/dma.h
+Removing arch/h8300/include/asm/div64.h
+Removing arch/h8300/include/asm/device.h
+Removing arch/h8300/include/asm/delay.h
+Removing arch/h8300/include/asm/dbg.h
+Removing arch/h8300/include/asm/current.h
+Removing arch/h8300/include/asm/cputime.h
+Removing arch/h8300/include/asm/cmpxchg.h
+Removing arch/h8300/include/asm/checksum.h
+Removing arch/h8300/include/asm/cacheflush.h
+Removing arch/h8300/include/asm/cachectl.h
+Removing arch/h8300/include/asm/cache.h
+Removing arch/h8300/include/asm/bugs.h
+Removing arch/h8300/include/asm/bug.h
+Removing arch/h8300/include/asm/bootinfo.h
+Removing arch/h8300/include/asm/bitops.h
+Removing arch/h8300/include/asm/barrier.h
+Removing arch/h8300/include/asm/atomic.h
+Removing arch/h8300/include/asm/asm-offsets.h
+Removing arch/h8300/include/asm/Kbuild
+Removing arch/h8300/defconfig
+Removing arch/h8300/boot/compressed/vmlinux.scr
+Removing arch/h8300/boot/compressed/vmlinux.lds
+Removing arch/h8300/boot/compressed/misc.c
+Removing arch/h8300/boot/compressed/head.S
+Removing arch/h8300/boot/compressed/Makefile
+Removing arch/h8300/boot/Makefile
+Removing arch/h8300/README
+Removing arch/h8300/Makefile
+Removing arch/h8300/Kconfig.ide
+Removing arch/h8300/Kconfig.debug
+Removing arch/h8300/Kconfig.cpu
+Removing arch/h8300/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/scheduler/sched-arch.txt | 5 -
+ MAINTAINERS | 8 -
+ arch/h8300/Kconfig | 108 ----
+ arch/h8300/Kconfig.cpu | 171 ------
+ arch/h8300/Kconfig.debug | 68 ---
+ arch/h8300/Kconfig.ide | 44 --
+ arch/h8300/Makefile | 71 ---
+ arch/h8300/README | 38 --
+ arch/h8300/boot/Makefile | 22 -
+ arch/h8300/boot/compressed/Makefile | 37 --
+ arch/h8300/boot/compressed/head.S | 47 --
+ arch/h8300/boot/compressed/misc.c | 180 ------
+ arch/h8300/boot/compressed/vmlinux.lds | 32 --
+ arch/h8300/boot/compressed/vmlinux.scr | 9 -
+ arch/h8300/defconfig | 42 --
+ arch/h8300/include/asm/Kbuild | 8 -
+ arch/h8300/include/asm/asm-offsets.h | 1 -
+ arch/h8300/include/asm/atomic.h | 146 -----
+ arch/h8300/include/asm/barrier.h | 29 -
+ arch/h8300/include/asm/bitops.h | 211 -------
+ arch/h8300/include/asm/bootinfo.h | 2 -
+ arch/h8300/include/asm/bug.h | 12 -
+ arch/h8300/include/asm/bugs.h | 16 -
+ arch/h8300/include/asm/cache.h | 13 -
+ arch/h8300/include/asm/cachectl.h | 14 -
+ arch/h8300/include/asm/cacheflush.h | 40 --
+ arch/h8300/include/asm/checksum.h | 102 ----
+ arch/h8300/include/asm/cmpxchg.h | 60 --
+ arch/h8300/include/asm/cputime.h | 6 -
+ arch/h8300/include/asm/current.h | 25 -
+ arch/h8300/include/asm/dbg.h | 2 -
+ arch/h8300/include/asm/delay.h | 38 --
+ arch/h8300/include/asm/device.h | 7 -
+ arch/h8300/include/asm/div64.h | 1 -
+ arch/h8300/include/asm/dma.h | 15 -
+ arch/h8300/include/asm/elf.h | 101 ----
+ arch/h8300/include/asm/emergency-restart.h | 6 -
+ arch/h8300/include/asm/fb.h | 12 -
+ arch/h8300/include/asm/flat.h | 26 -
+ arch/h8300/include/asm/fpu.h | 1 -
+ arch/h8300/include/asm/ftrace.h | 1 -
+ arch/h8300/include/asm/futex.h | 6 -
+ arch/h8300/include/asm/gpio-internal.h | 52 --
+ arch/h8300/include/asm/hardirq.h | 19 -
+ arch/h8300/include/asm/hw_irq.h | 1 -
+ arch/h8300/include/asm/io.h | 358 ------------
+ arch/h8300/include/asm/irq.h | 49 --
+ arch/h8300/include/asm/irq_regs.h | 1 -
+ arch/h8300/include/asm/irqflags.h | 43 --
+ arch/h8300/include/asm/kdebug.h | 1 -
+ arch/h8300/include/asm/kmap_types.h | 6 -
+ arch/h8300/include/asm/local.h | 6 -
+ arch/h8300/include/asm/local64.h | 1 -
+ arch/h8300/include/asm/mc146818rtc.h | 9 -
+ arch/h8300/include/asm/mmu_context.h | 32 --
+ arch/h8300/include/asm/mutex.h | 9 -
+ arch/h8300/include/asm/page.h | 78 ---
+ arch/h8300/include/asm/page_offset.h | 3 -
+ arch/h8300/include/asm/param.h | 9 -
+ arch/h8300/include/asm/pci.h | 19 -
+ arch/h8300/include/asm/percpu.h | 6 -
+ arch/h8300/include/asm/pgalloc.h | 8 -
+ arch/h8300/include/asm/pgtable.h | 73 ---
+ arch/h8300/include/asm/processor.h | 139 -----
+ arch/h8300/include/asm/ptrace.h | 33 --
+ arch/h8300/include/asm/regs267x.h | 336 -----------
+ arch/h8300/include/asm/regs306x.h | 212 -------
+ arch/h8300/include/asm/scatterlist.h | 6 -
+ arch/h8300/include/asm/sections.h | 6 -
+ arch/h8300/include/asm/segment.h | 49 --
+ arch/h8300/include/asm/sh_bios.h | 29 -
+ arch/h8300/include/asm/shm.h | 31 -
+ arch/h8300/include/asm/shmparam.h | 6 -
+ arch/h8300/include/asm/signal.h | 24 -
+ arch/h8300/include/asm/smp.h | 1 -
+ arch/h8300/include/asm/spinlock.h | 6 -
+ arch/h8300/include/asm/string.h | 44 --
+ arch/h8300/include/asm/switch_to.h | 50 --
+ arch/h8300/include/asm/target_time.h | 4 -
+ arch/h8300/include/asm/termios.h | 50 --
+ arch/h8300/include/asm/thread_info.h | 103 ----
+ arch/h8300/include/asm/timer.h | 25 -
+ arch/h8300/include/asm/timex.h | 19 -
+ arch/h8300/include/asm/tlb.h | 8 -
+ arch/h8300/include/asm/tlbflush.h | 55 --
+ arch/h8300/include/asm/topology.h | 6 -
+ arch/h8300/include/asm/traps.h | 37 --
+ arch/h8300/include/asm/types.h | 9 -
+ arch/h8300/include/asm/uaccess.h | 163 ------
+ arch/h8300/include/asm/ucontext.h | 12 -
+ arch/h8300/include/asm/unaligned.h | 11 -
+ arch/h8300/include/asm/unistd.h | 36 --
+ arch/h8300/include/asm/user.h | 75 ---
+ arch/h8300/include/asm/virtconvert.h | 20 -
+ arch/h8300/include/uapi/asm/Kbuild | 34 --
+ arch/h8300/include/uapi/asm/auxvec.h | 4 -
+ arch/h8300/include/uapi/asm/bitsperlong.h | 1 -
+ arch/h8300/include/uapi/asm/byteorder.h | 6 -
+ arch/h8300/include/uapi/asm/errno.h | 6 -
+ arch/h8300/include/uapi/asm/fcntl.h | 11 -
+ arch/h8300/include/uapi/asm/ioctl.h | 1 -
+ arch/h8300/include/uapi/asm/ioctls.h | 8 -
+ arch/h8300/include/uapi/asm/ipcbuf.h | 1 -
+ arch/h8300/include/uapi/asm/kvm_para.h | 1 -
+ arch/h8300/include/uapi/asm/mman.h | 1 -
+ arch/h8300/include/uapi/asm/msgbuf.h | 31 -
+ arch/h8300/include/uapi/asm/param.h | 16 -
+ arch/h8300/include/uapi/asm/poll.h | 11 -
+ arch/h8300/include/uapi/asm/posix_types.h | 26 -
+ arch/h8300/include/uapi/asm/ptrace.h | 44 --
+ arch/h8300/include/uapi/asm/resource.h | 6 -
+ arch/h8300/include/uapi/asm/sembuf.h | 25 -
+ arch/h8300/include/uapi/asm/setup.h | 6 -
+ arch/h8300/include/uapi/asm/shmbuf.h | 42 --
+ arch/h8300/include/uapi/asm/sigcontext.h | 18 -
+ arch/h8300/include/uapi/asm/siginfo.h | 6 -
+ arch/h8300/include/uapi/asm/signal.h | 115 ----
+ arch/h8300/include/uapi/asm/socket.h | 79 ---
+ arch/h8300/include/uapi/asm/sockios.h | 13 -
+ arch/h8300/include/uapi/asm/stat.h | 78 ---
+ arch/h8300/include/uapi/asm/statfs.h | 6 -
+ arch/h8300/include/uapi/asm/swab.h | 10 -
+ arch/h8300/include/uapi/asm/termbits.h | 201 -------
+ arch/h8300/include/uapi/asm/termios.h | 44 --
+ arch/h8300/include/uapi/asm/types.h | 1 -
+ arch/h8300/include/uapi/asm/unistd.h | 330 -----------
+ arch/h8300/kernel/Makefile | 12 -
+ arch/h8300/kernel/asm-offsets.c | 60 --
+ arch/h8300/kernel/entry.S | 402 -------------
+ arch/h8300/kernel/gpio.c | 178 ------
+ arch/h8300/kernel/h8300_ksyms.c | 100 ----
+ arch/h8300/kernel/irq.c | 165 ------
+ arch/h8300/kernel/module.c | 75 ---
+ arch/h8300/kernel/process.c | 154 -----
+ arch/h8300/kernel/ptrace.c | 168 ------
+ arch/h8300/kernel/setup.c | 242 --------
+ arch/h8300/kernel/signal.c | 444 ---------------
+ arch/h8300/kernel/sys_h8300.c | 48 --
+ arch/h8300/kernel/syscalls.S | 338 -----------
+ arch/h8300/kernel/time.c | 66 ---
+ arch/h8300/kernel/timer/Makefile | 6 -
+ arch/h8300/kernel/timer/itu.c | 82 ---
+ arch/h8300/kernel/timer/timer16.c | 77 ---
+ arch/h8300/kernel/timer/timer8.c | 102 ----
+ arch/h8300/kernel/timer/tpu.c | 100 ----
+ arch/h8300/kernel/traps.c | 166 ------
+ arch/h8300/kernel/vmlinux.lds.S | 157 ------
+ arch/h8300/lib/Makefile | 5 -
+ arch/h8300/lib/abs.S | 21 -
+ arch/h8300/lib/ashrdi3.c | 63 ---
+ arch/h8300/lib/checksum.c | 164 ------
+ arch/h8300/lib/memcpy.S | 84 ---
+ arch/h8300/lib/memset.S | 61 --
+ arch/h8300/lib/romfs.S | 57 --
+ arch/h8300/mm/Makefile | 5 -
+ arch/h8300/mm/fault.c | 56 --
+ arch/h8300/mm/init.c | 155 -----
+ arch/h8300/mm/kmap.c | 58 --
+ arch/h8300/mm/memory.c | 54 --
+ arch/h8300/platform/h8300h/Makefile | 7 -
+ arch/h8300/platform/h8300h/aki3068net/Makefile | 5 -
+ arch/h8300/platform/h8300h/aki3068net/crt0_ram.S | 110 ----
+ arch/h8300/platform/h8300h/generic/Makefile | 5 -
+ arch/h8300/platform/h8300h/generic/crt0_ram.S | 107 ----
+ arch/h8300/platform/h8300h/generic/crt0_rom.S | 122 ----
+ arch/h8300/platform/h8300h/h8max/Makefile | 5 -
+ arch/h8300/platform/h8300h/h8max/crt0_ram.S | 110 ----
+ arch/h8300/platform/h8300h/irq.c | 82 ---
+ arch/h8300/platform/h8300h/ptrace_h8300h.c | 284 ----------
+ arch/h8300/platform/h8s/Makefile | 7 -
+ arch/h8300/platform/h8s/edosk2674/Makefile | 5 -
+ arch/h8300/platform/h8s/edosk2674/crt0_ram.S | 130 -----
+ arch/h8300/platform/h8s/edosk2674/crt0_rom.S | 186 ------
+ arch/h8300/platform/h8s/generic/Makefile | 5 -
+ arch/h8300/platform/h8s/generic/crt0_ram.S | 127 -----
+ arch/h8300/platform/h8s/generic/crt0_rom.S | 128 -----
+ arch/h8300/platform/h8s/irq.c | 104 ----
+ arch/h8300/platform/h8s/ptrace_h8s.c | 84 ---
+ drivers/ide/Kconfig | 7 -
+ drivers/ide/Makefile | 2 -
+ drivers/ide/ide-h8300.c | 109 ----
+ drivers/net/Space.c | 3 +-
+ drivers/net/ethernet/8390/Kconfig | 7 -
+ drivers/net/ethernet/8390/Makefile | 1 -
+ drivers/net/ethernet/8390/ne-h8300.c | 684 -----------------------
+ drivers/net/ethernet/smsc/smc9194.c | 24 -
+ drivers/parport/Kconfig | 2 +-
+ drivers/watchdog/Kconfig | 2 -
+ drivers/watchdog/Makefile | 2 -
+ fs/minix/Kconfig | 2 +-
+ include/linux/serial_sci.h | 2 +-
+ include/uapi/linux/audit.h | 1 -
+ include/uapi/linux/elf-em.h | 1 -
+ tools/testing/ktest/examples/crosstests.conf | 6 -
+ 194 files changed, 4 insertions(+), 11742 deletions(-)
+ delete mode 100644 arch/h8300/Kconfig
+ delete mode 100644 arch/h8300/Kconfig.cpu
+ delete mode 100644 arch/h8300/Kconfig.debug
+ delete mode 100644 arch/h8300/Kconfig.ide
+ delete mode 100644 arch/h8300/Makefile
+ delete mode 100644 arch/h8300/README
+ delete mode 100644 arch/h8300/boot/Makefile
+ delete mode 100644 arch/h8300/boot/compressed/Makefile
+ delete mode 100644 arch/h8300/boot/compressed/head.S
+ delete mode 100644 arch/h8300/boot/compressed/misc.c
+ delete mode 100644 arch/h8300/boot/compressed/vmlinux.lds
+ delete mode 100644 arch/h8300/boot/compressed/vmlinux.scr
+ delete mode 100644 arch/h8300/defconfig
+ delete mode 100644 arch/h8300/include/asm/Kbuild
+ delete mode 100644 arch/h8300/include/asm/asm-offsets.h
+ delete mode 100644 arch/h8300/include/asm/atomic.h
+ delete mode 100644 arch/h8300/include/asm/barrier.h
+ delete mode 100644 arch/h8300/include/asm/bitops.h
+ delete mode 100644 arch/h8300/include/asm/bootinfo.h
+ delete mode 100644 arch/h8300/include/asm/bug.h
+ delete mode 100644 arch/h8300/include/asm/bugs.h
+ delete mode 100644 arch/h8300/include/asm/cache.h
+ delete mode 100644 arch/h8300/include/asm/cachectl.h
+ delete mode 100644 arch/h8300/include/asm/cacheflush.h
+ delete mode 100644 arch/h8300/include/asm/checksum.h
+ delete mode 100644 arch/h8300/include/asm/cmpxchg.h
+ delete mode 100644 arch/h8300/include/asm/cputime.h
+ delete mode 100644 arch/h8300/include/asm/current.h
+ delete mode 100644 arch/h8300/include/asm/dbg.h
+ delete mode 100644 arch/h8300/include/asm/delay.h
+ delete mode 100644 arch/h8300/include/asm/device.h
+ delete mode 100644 arch/h8300/include/asm/div64.h
+ delete mode 100644 arch/h8300/include/asm/dma.h
+ delete mode 100644 arch/h8300/include/asm/elf.h
+ delete mode 100644 arch/h8300/include/asm/emergency-restart.h
+ delete mode 100644 arch/h8300/include/asm/fb.h
+ delete mode 100644 arch/h8300/include/asm/flat.h
+ delete mode 100644 arch/h8300/include/asm/fpu.h
+ delete mode 100644 arch/h8300/include/asm/ftrace.h
+ delete mode 100644 arch/h8300/include/asm/futex.h
+ delete mode 100644 arch/h8300/include/asm/gpio-internal.h
+ delete mode 100644 arch/h8300/include/asm/hardirq.h
+ delete mode 100644 arch/h8300/include/asm/hw_irq.h
+ delete mode 100644 arch/h8300/include/asm/io.h
+ delete mode 100644 arch/h8300/include/asm/irq.h
+ delete mode 100644 arch/h8300/include/asm/irq_regs.h
+ delete mode 100644 arch/h8300/include/asm/irqflags.h
+ delete mode 100644 arch/h8300/include/asm/kdebug.h
+ delete mode 100644 arch/h8300/include/asm/kmap_types.h
+ delete mode 100644 arch/h8300/include/asm/local.h
+ delete mode 100644 arch/h8300/include/asm/local64.h
+ delete mode 100644 arch/h8300/include/asm/mc146818rtc.h
+ delete mode 100644 arch/h8300/include/asm/mmu_context.h
+ delete mode 100644 arch/h8300/include/asm/mutex.h
+ delete mode 100644 arch/h8300/include/asm/page.h
+ delete mode 100644 arch/h8300/include/asm/page_offset.h
+ delete mode 100644 arch/h8300/include/asm/param.h
+ delete mode 100644 arch/h8300/include/asm/pci.h
+ delete mode 100644 arch/h8300/include/asm/percpu.h
+ delete mode 100644 arch/h8300/include/asm/pgalloc.h
+ delete mode 100644 arch/h8300/include/asm/pgtable.h
+ delete mode 100644 arch/h8300/include/asm/processor.h
+ delete mode 100644 arch/h8300/include/asm/ptrace.h
+ delete mode 100644 arch/h8300/include/asm/regs267x.h
+ delete mode 100644 arch/h8300/include/asm/regs306x.h
+ delete mode 100644 arch/h8300/include/asm/scatterlist.h
+ delete mode 100644 arch/h8300/include/asm/sections.h
+ delete mode 100644 arch/h8300/include/asm/segment.h
+ delete mode 100644 arch/h8300/include/asm/sh_bios.h
+ delete mode 100644 arch/h8300/include/asm/shm.h
+ delete mode 100644 arch/h8300/include/asm/shmparam.h
+ delete mode 100644 arch/h8300/include/asm/signal.h
+ delete mode 100644 arch/h8300/include/asm/smp.h
+ delete mode 100644 arch/h8300/include/asm/spinlock.h
+ delete mode 100644 arch/h8300/include/asm/string.h
+ delete mode 100644 arch/h8300/include/asm/switch_to.h
+ delete mode 100644 arch/h8300/include/asm/target_time.h
+ delete mode 100644 arch/h8300/include/asm/termios.h
+ delete mode 100644 arch/h8300/include/asm/thread_info.h
+ delete mode 100644 arch/h8300/include/asm/timer.h
+ delete mode 100644 arch/h8300/include/asm/timex.h
+ delete mode 100644 arch/h8300/include/asm/tlb.h
+ delete mode 100644 arch/h8300/include/asm/tlbflush.h
+ delete mode 100644 arch/h8300/include/asm/topology.h
+ delete mode 100644 arch/h8300/include/asm/traps.h
+ delete mode 100644 arch/h8300/include/asm/types.h
+ delete mode 100644 arch/h8300/include/asm/uaccess.h
+ delete mode 100644 arch/h8300/include/asm/ucontext.h
+ delete mode 100644 arch/h8300/include/asm/unaligned.h
+ delete mode 100644 arch/h8300/include/asm/unistd.h
+ delete mode 100644 arch/h8300/include/asm/user.h
+ delete mode 100644 arch/h8300/include/asm/virtconvert.h
+ delete mode 100644 arch/h8300/include/uapi/asm/Kbuild
+ delete mode 100644 arch/h8300/include/uapi/asm/auxvec.h
+ delete mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h
+ delete mode 100644 arch/h8300/include/uapi/asm/byteorder.h
+ delete mode 100644 arch/h8300/include/uapi/asm/errno.h
+ delete mode 100644 arch/h8300/include/uapi/asm/fcntl.h
+ delete mode 100644 arch/h8300/include/uapi/asm/ioctl.h
+ delete mode 100644 arch/h8300/include/uapi/asm/ioctls.h
+ delete mode 100644 arch/h8300/include/uapi/asm/ipcbuf.h
+ delete mode 100644 arch/h8300/include/uapi/asm/kvm_para.h
+ delete mode 100644 arch/h8300/include/uapi/asm/mman.h
+ delete mode 100644 arch/h8300/include/uapi/asm/msgbuf.h
+ delete mode 100644 arch/h8300/include/uapi/asm/param.h
+ delete mode 100644 arch/h8300/include/uapi/asm/poll.h
+ delete mode 100644 arch/h8300/include/uapi/asm/posix_types.h
+ delete mode 100644 arch/h8300/include/uapi/asm/ptrace.h
+ delete mode 100644 arch/h8300/include/uapi/asm/resource.h
+ delete mode 100644 arch/h8300/include/uapi/asm/sembuf.h
+ delete mode 100644 arch/h8300/include/uapi/asm/setup.h
+ delete mode 100644 arch/h8300/include/uapi/asm/shmbuf.h
+ delete mode 100644 arch/h8300/include/uapi/asm/sigcontext.h
+ delete mode 100644 arch/h8300/include/uapi/asm/siginfo.h
+ delete mode 100644 arch/h8300/include/uapi/asm/signal.h
+ delete mode 100644 arch/h8300/include/uapi/asm/socket.h
+ delete mode 100644 arch/h8300/include/uapi/asm/sockios.h
+ delete mode 100644 arch/h8300/include/uapi/asm/stat.h
+ delete mode 100644 arch/h8300/include/uapi/asm/statfs.h
+ delete mode 100644 arch/h8300/include/uapi/asm/swab.h
+ delete mode 100644 arch/h8300/include/uapi/asm/termbits.h
+ delete mode 100644 arch/h8300/include/uapi/asm/termios.h
+ delete mode 100644 arch/h8300/include/uapi/asm/types.h
+ delete mode 100644 arch/h8300/include/uapi/asm/unistd.h
+ delete mode 100644 arch/h8300/kernel/Makefile
+ delete mode 100644 arch/h8300/kernel/asm-offsets.c
+ delete mode 100644 arch/h8300/kernel/entry.S
+ delete mode 100644 arch/h8300/kernel/gpio.c
+ delete mode 100644 arch/h8300/kernel/h8300_ksyms.c
+ delete mode 100644 arch/h8300/kernel/irq.c
+ delete mode 100644 arch/h8300/kernel/module.c
+ delete mode 100644 arch/h8300/kernel/process.c
+ delete mode 100644 arch/h8300/kernel/ptrace.c
+ delete mode 100644 arch/h8300/kernel/setup.c
+ delete mode 100644 arch/h8300/kernel/signal.c
+ delete mode 100644 arch/h8300/kernel/sys_h8300.c
+ delete mode 100644 arch/h8300/kernel/syscalls.S
+ delete mode 100644 arch/h8300/kernel/time.c
+ delete mode 100644 arch/h8300/kernel/timer/Makefile
+ delete mode 100644 arch/h8300/kernel/timer/itu.c
+ delete mode 100644 arch/h8300/kernel/timer/timer16.c
+ delete mode 100644 arch/h8300/kernel/timer/timer8.c
+ delete mode 100644 arch/h8300/kernel/timer/tpu.c
+ delete mode 100644 arch/h8300/kernel/traps.c
+ delete mode 100644 arch/h8300/kernel/vmlinux.lds.S
+ delete mode 100644 arch/h8300/lib/Makefile
+ delete mode 100644 arch/h8300/lib/abs.S
+ delete mode 100644 arch/h8300/lib/ashrdi3.c
+ delete mode 100644 arch/h8300/lib/checksum.c
+ delete mode 100644 arch/h8300/lib/memcpy.S
+ delete mode 100644 arch/h8300/lib/memset.S
+ delete mode 100644 arch/h8300/lib/romfs.S
+ delete mode 100644 arch/h8300/mm/Makefile
+ delete mode 100644 arch/h8300/mm/fault.c
+ delete mode 100644 arch/h8300/mm/init.c
+ delete mode 100644 arch/h8300/mm/kmap.c
+ delete mode 100644 arch/h8300/mm/memory.c
+ delete mode 100644 arch/h8300/platform/h8300h/Makefile
+ delete mode 100644 arch/h8300/platform/h8300h/aki3068net/Makefile
+ delete mode 100644 arch/h8300/platform/h8300h/aki3068net/crt0_ram.S
+ delete mode 100644 arch/h8300/platform/h8300h/generic/Makefile
+ delete mode 100644 arch/h8300/platform/h8300h/generic/crt0_ram.S
+ delete mode 100644 arch/h8300/platform/h8300h/generic/crt0_rom.S
+ delete mode 100644 arch/h8300/platform/h8300h/h8max/Makefile
+ delete mode 100644 arch/h8300/platform/h8300h/h8max/crt0_ram.S
+ delete mode 100644 arch/h8300/platform/h8300h/irq.c
+ delete mode 100644 arch/h8300/platform/h8300h/ptrace_h8300h.c
+ delete mode 100644 arch/h8300/platform/h8s/Makefile
+ delete mode 100644 arch/h8300/platform/h8s/edosk2674/Makefile
+ delete mode 100644 arch/h8300/platform/h8s/edosk2674/crt0_ram.S
+ delete mode 100644 arch/h8300/platform/h8s/edosk2674/crt0_rom.S
+ delete mode 100644 arch/h8300/platform/h8s/generic/Makefile
+ delete mode 100644 arch/h8300/platform/h8s/generic/crt0_ram.S
+ delete mode 100644 arch/h8300/platform/h8s/generic/crt0_rom.S
+ delete mode 100644 arch/h8300/platform/h8s/irq.c
+ delete mode 100644 arch/h8300/platform/h8s/ptrace_h8s.c
+ delete mode 100644 drivers/ide/ide-h8300.c
+ delete mode 100644 drivers/net/ethernet/8390/ne-h8300.c
+Merging hexagon/linux-next (de44443 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD)
+$ git merge hexagon/linux-next
+Already up-to-date.
+Merging ia64/next (d37bbb3 Merge branch 'pstore' into next)
+$ git merge ia64/next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging m68k/for-next (21e884b m68k/m68knommu: Implement __get_user_unaligned/__put_user_unaligned())
+$ git merge m68k/for-next
+Already up-to-date.
+Merging m68knommu/for-next (c065edd m68k: remove 16 unused boards in Kconfig.machine)
+$ git merge m68knommu/for-next
+Already up-to-date.
+Merging metag/for-next (b6ef916 irq-imgpdc: add ImgTec PDC irqchip driver)
+$ git merge metag/for-next
+Already up-to-date.
+Merging microblaze/next (d5d04bb Bye, bye, WfW flag)
+$ git merge microblaze/next
+Already up-to-date.
+Merging mips/mips-for-linux-next (0a50633 Merge branch '3.12-fixes' into mips-for-linux-next)
+$ git merge mips/mips-for-linux-next
+Removing arch/mips/include/asm/mach-ath79/ar933x_uart_platform.h
+Merge made by the 'recursive' strategy.
+ arch/mips/Kconfig | 1 +
+ arch/mips/Makefile | 11 +-
+ arch/mips/alchemy/common/usb.c | 3 +-
+ arch/mips/alchemy/devboards/db1235.c | 2 +-
+ arch/mips/ath79/dev-common.c | 6 -
+ arch/mips/bcm47xx/Makefile | 1 +
+ arch/mips/bcm47xx/board.c | 309 +++++++++++++++++++++
+ arch/mips/bcm47xx/nvram.c | 20 ++
+ arch/mips/bcm47xx/prom.c | 27 +-
+ arch/mips/bcm47xx/setup.c | 2 +
+ arch/mips/bcm47xx/time.c | 23 ++
+ arch/mips/bcm63xx/cpu.c | 4 +-
+ arch/mips/cavium-octeon/csrc-octeon.c | 1 +
+ arch/mips/cavium-octeon/setup.c | 4 +-
+ arch/mips/dec/prom/init.c | 1 +
+ arch/mips/include/asm/cpu-features.h | 6 -
+ arch/mips/include/asm/cpu-info.h | 1 +
+ arch/mips/include/asm/cpu-type.h | 203 ++++++++++++++
+ arch/mips/include/asm/cpu.h | 38 ++-
+ .../include/asm/mach-ath79/ar933x_uart_platform.h | 18 --
+ arch/mips/include/asm/mach-au1x00/au1000.h | 4 +-
+ arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 110 ++++++++
+ arch/mips/include/asm/mach-bcm47xx/bcm47xx_nvram.h | 2 +
+ .../include/asm/mach-ip22/cpu-feature-overrides.h | 2 +
+ .../include/asm/mach-ip27/cpu-feature-overrides.h | 2 +
+ .../include/asm/mach-ip28/cpu-feature-overrides.h | 2 +
+ arch/mips/include/asm/mmu_context.h | 22 +-
+ arch/mips/include/asm/pci.h | 12 +
+ arch/mips/include/asm/stackframe.h | 24 +-
+ arch/mips/include/asm/thread_info.h | 33 ++-
+ arch/mips/include/asm/timex.h | 33 ++-
+ arch/mips/include/asm/vga.h | 3 +-
+ arch/mips/kernel/cpu-probe.c | 45 +--
+ arch/mips/kernel/idle.c | 3 +-
+ arch/mips/kernel/irq_cpu.c | 2 +-
+ arch/mips/kernel/module.c | 3 +-
+ arch/mips/kernel/setup.c | 11 +-
+ arch/mips/kernel/smp-bmips.c | 4 +-
+ arch/mips/kernel/smp.c | 1 -
+ arch/mips/kernel/time.c | 1 +
+ arch/mips/kernel/traps.c | 3 +-
+ arch/mips/lantiq/irq.c | 2 +-
+ arch/mips/lantiq/xway/sysctrl.c | 2 +-
+ arch/mips/mm/c-octeon.c | 6 +-
+ arch/mips/mm/c-r4k.c | 48 ++--
+ arch/mips/mm/dma-default.c | 1 +
+ arch/mips/mm/page.c | 1 +
+ arch/mips/mm/sc-mips.c | 3 +-
+ arch/mips/mm/tlb-funcs.S | 2 -
+ arch/mips/mm/tlb-r4k.c | 1 +
+ arch/mips/mm/tlbex.c | 137 ++++-----
+ arch/mips/mti-malta/malta-time.c | 5 +-
+ arch/mips/mti-sead3/sead3-time.c | 3 +-
+ arch/mips/netlogic/common/smp.c | 2 +-
+ arch/mips/netlogic/xlr/fmn-config.c | 3 +-
+ arch/mips/oprofile/common.c | 1 +
+ arch/mips/pci/pci-ar71xx.c | 3 -
+ arch/mips/pci/pci-ar724x.c | 9 -
+ arch/mips/pci/pci.c | 50 ++--
+ arch/mips/ralink/clk.c | 2 +-
+ arch/mips/ralink/mt7620.c | 2 +-
+ arch/mips/ralink/of.c | 2 +-
+ arch/mips/ralink/rt305x.c | 2 +-
+ arch/mips/sibyte/bcm1480/setup.c | 3 +-
+ arch/mips/sibyte/sb1250/setup.c | 3 +-
+ arch/mips/sni/setup.c | 3 +-
+ 66 files changed, 1021 insertions(+), 278 deletions(-)
+ create mode 100644 arch/mips/bcm47xx/board.c
+ create mode 100644 arch/mips/include/asm/cpu-type.h
+ delete mode 100644 arch/mips/include/asm/mach-ath79/ar933x_uart_platform.h
+ create mode 100644 arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
+Merging openrisc/for-upstream (6af6095 openrisc: remove HAVE_VIRT_TO_BUS)
+$ git merge openrisc/for-upstream
+Already up-to-date.
+Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
+$ git merge parisc/for-next
+Already up-to-date.
+Merging parisc-hd/for-next (9f0f4fb parisc: add generic 32- and 64-bit defconfigs)
+$ git merge parisc-hd/for-next
+Merge made by the 'recursive' strategy.
+ arch/parisc/configs/generic-32bit_defconfig | 340 +++++++++++++++++++++++++++
+ arch/parisc/configs/generic-64bit_defconfig | 350 ++++++++++++++++++++++++++++
+ 2 files changed, 690 insertions(+)
+ create mode 100644 arch/parisc/configs/generic-32bit_defconfig
+ create mode 100644 arch/parisc/configs/generic-64bit_defconfig
+Merging powerpc/next (8d7551e Merge tag 'cris-for-3.12' of git://jni.nu/cris)
+$ git merge powerpc/next
+Already up-to-date.
+Merging mpc5xxx/next (f2110cb dts: mpc512x: prepare for preprocessor support)
+$ git merge mpc5xxx/next
+Already up-to-date.
+Merging galak/next (9e2ecdb powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4)
+$ git merge galak/next
+Already up-to-date.
+Merging s390/features (044aa01 s390/krobes: allow kprobes only on known instructions)
+$ git merge s390/features
+Merge made by the 'recursive' strategy.
+ arch/s390/Makefile | 14 +++---
+ arch/s390/include/asm/atomic.h | 100 +++++++++++++++++++++++++-------------
+ arch/s390/include/asm/bitops.h | 66 ++++++++++++++++++-------
+ arch/s390/include/asm/dis.h | 52 ++++++++++++++++++++
+ arch/s390/include/asm/processor.h | 5 --
+ arch/s390/kernel/dis.c | 81 ++++++++++--------------------
+ arch/s390/kernel/dumpstack.c | 1 +
+ arch/s390/kernel/kprobes.c | 19 +++++---
+ arch/s390/kvm/trace.h | 1 +
+ arch/s390/net/bpf_jit_comp.c | 2 +-
+ drivers/s390/char/tty3270.c | 2 +-
+ 11 files changed, 219 insertions(+), 124 deletions(-)
+ create mode 100644 arch/s390/include/asm/dis.h
+Merging sh/sh-latest (37284bd Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest)
+$ git merge sh/sh-latest
+Resolved 'arch/sh/kernel/cpu/sh2a/Makefile' using previous resolution.
+Resolved 'drivers/tty/serial/sh-sci.c' using previous resolution.
+Resolved 'include/linux/serial_sci.h' using previous resolution.
+Auto-merging include/linux/serial_sci.h
+CONFLICT (content): Merge conflict in include/linux/serial_sci.h
+Auto-merging drivers/tty/serial/sh-sci.c
+CONFLICT (content): Merge conflict in drivers/tty/serial/sh-sci.c
+Auto-merging arch/sh/kernel/cpu/sh2a/Makefile
+CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master e9cb4a7] Merge remote-tracking branch 'sh/sh-latest'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/tty/serial/renesas,sci-serial.txt | 53 +++++++
+ arch/sh/include/asm/hw_breakpoint.h | 12 +-
+ arch/sh/include/cpu-common/cpu/ubc.h | 17 +++
+ arch/sh/include/cpu-sh2a/cpu/ubc.h | 14 ++
+ arch/sh/kernel/cpu/sh2a/Makefile | 1 +
+ arch/sh/kernel/cpu/sh2a/ubc.c | 154 +++++++++++++++++++++
+ arch/sh/kernel/hw_breakpoint.c | 8 ++
+ drivers/tty/serial/sh-sci.c | 127 ++++++++++++++++-
+ include/linux/serial_sci.h | 4 +
+ 9 files changed, 375 insertions(+), 15 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/tty/serial/renesas,sci-serial.txt
+ create mode 100644 arch/sh/include/cpu-common/cpu/ubc.h
+ create mode 100644 arch/sh/include/cpu-sh2a/cpu/ubc.h
+ create mode 100644 arch/sh/kernel/cpu/sh2a/ubc.c
+Merging sparc-next/master (f8ce1fa Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux)
+$ git merge sparc-next/master
+Already up-to-date.
+Merging tile/master (e823acc tile: remove stray blank space)
+$ git merge tile/master
+Already up-to-date.
+Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL)
+$ git merge unicore32/unicore32
+Already up-to-date.
+Merging xtensa/for_next (8872366 xtensa: Fix broken allmodconfig build)
+$ git merge xtensa/for_next
+Already up-to-date.
+Merging aio-direct/for-next (85f8fb7 tmpfs: add support for read_iter and write_iter)
+$ git merge aio-direct/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/Locking | 6 +-
+ Documentation/filesystems/vfs.txt | 12 +-
+ drivers/block/loop.c | 148 ++++++++----
+ drivers/char/raw.c | 4 +-
+ drivers/mtd/nand/nandsim.c | 4 +-
+ drivers/usb/gadget/storage_common.c | 4 +-
+ fs/9p/vfs_addr.c | 12 +-
+ fs/9p/vfs_file.c | 8 +-
+ fs/Makefile | 2 +-
+ fs/adfs/file.c | 4 +-
+ fs/affs/file.c | 4 +-
+ fs/afs/file.c | 4 +-
+ fs/afs/internal.h | 3 +-
+ fs/afs/write.c | 9 +-
+ fs/aio.c | 136 ++++++++++-
+ fs/bad_inode.c | 14 ++
+ fs/bfs/file.c | 4 +-
+ fs/block_dev.c | 27 ++-
+ fs/btrfs/file.c | 42 ++--
+ fs/btrfs/inode.c | 63 +++---
+ fs/ceph/addr.c | 3 +-
+ fs/cifs/file.c | 4 +-
+ fs/direct-io.c | 223 +++++++++++++------
+ fs/ecryptfs/file.c | 15 +-
+ fs/exofs/file.c | 4 +-
+ fs/ext2/file.c | 4 +-
+ fs/ext2/inode.c | 8 +-
+ fs/ext3/file.c | 4 +-
+ fs/ext3/inode.c | 15 +-
+ fs/ext4/ext4.h | 3 +-
+ fs/ext4/file.c | 34 +--
+ fs/ext4/indirect.c | 16 +-
+ fs/ext4/inode.c | 23 +-
+ fs/f2fs/data.c | 4 +-
+ fs/f2fs/file.c | 4 +-
+ fs/fat/file.c | 4 +-
+ fs/fat/inode.c | 10 +-
+ fs/fuse/cuse.c | 10 +-
+ fs/fuse/file.c | 90 ++++----
+ fs/fuse/fuse_i.h | 5 +-
+ fs/gfs2/aops.c | 7 +-
+ fs/gfs2/file.c | 21 +-
+ fs/hfs/inode.c | 11 +-
+ fs/hfsplus/inode.c | 10 +-
+ fs/hostfs/hostfs_kern.c | 4 +-
+ fs/hpfs/file.c | 4 +-
+ fs/internal.h | 4 +
+ fs/iov-iter.c | 411 ++++++++++++++++++++++++++++++++++
+ fs/jffs2/file.c | 8 +-
+ fs/jfs/file.c | 4 +-
+ fs/jfs/inode.c | 7 +-
+ fs/logfs/file.c | 4 +-
+ fs/minix/file.c | 4 +-
+ fs/nfs/direct.c | 301 ++++++++++++++++---------
+ fs/nfs/file.c | 33 ++-
+ fs/nfs/internal.h | 4 +-
+ fs/nfs/nfs4file.c | 4 +-
+ fs/nilfs2/file.c | 4 +-
+ fs/nilfs2/inode.c | 8 +-
+ fs/ocfs2/aops.c | 8 +-
+ fs/ocfs2/aops.h | 2 +-
+ fs/ocfs2/file.c | 55 ++---
+ fs/ocfs2/ocfs2_trace.h | 6 +-
+ fs/omfs/file.c | 4 +-
+ fs/ramfs/file-mmu.c | 4 +-
+ fs/ramfs/file-nommu.c | 4 +-
+ fs/read_write.c | 78 +++++--
+ fs/reiserfs/file.c | 4 +-
+ fs/reiserfs/inode.c | 7 +-
+ fs/romfs/mmap-nommu.c | 2 +-
+ fs/sysv/file.c | 4 +-
+ fs/ubifs/file.c | 12 +-
+ fs/udf/file.c | 13 +-
+ fs/udf/inode.c | 10 +-
+ fs/ufs/file.c | 4 +-
+ fs/xfs/xfs_aops.c | 13 +-
+ fs/xfs/xfs_file.c | 51 ++---
+ include/linux/aio.h | 17 +-
+ include/linux/bio.h | 8 +
+ include/linux/blk_types.h | 2 -
+ include/linux/fs.h | 165 ++++++++++++--
+ include/linux/nfs_fs.h | 13 +-
+ include/uapi/linux/aio_abi.h | 2 +
+ include/uapi/linux/loop.h | 1 +
+ mm/filemap.c | 433 ++++++++++++++----------------------
+ mm/page_io.c | 15 +-
+ mm/shmem.c | 61 ++---
+ 87 files changed, 1841 insertions(+), 1003 deletions(-)
+ create mode 100644 fs/iov-iter.c
+Merging btrfs/next (d7396f0 Btrfs: optimize key searches in btrfs_search_slot)
+$ git merge btrfs/next
+Already up-to-date.
+Merging ceph/master (9c89d62 fscache: check consistency does not decrement refcount)
+$ git merge ceph/master
+Auto-merging drivers/block/rbd.c
+Merge made by the 'recursive' strategy.
+ drivers/block/rbd.c | 77 +++++++++++++++++++++++++++++++----------
+ fs/fscache/cookie.c | 3 +-
+ include/linux/ceph/osd_client.h | 2 ++
+ net/ceph/osd_client.c | 11 ++++++
+ 4 files changed, 74 insertions(+), 19 deletions(-)
+Merging cifs/for-next (9ae6cf6 cifs: stop trying to use virtual circuits)
+$ git merge cifs/for-next
+Auto-merging fs/cifs/file.c
+Merge made by the 'recursive' strategy.
+ fs/cifs/cifsglob.h | 4 ---
+ fs/cifs/cifssmb.c | 1 -
+ fs/cifs/file.c | 8 ++++++
+ fs/cifs/fscache.c | 7 +++++
+ fs/cifs/fscache.h | 13 +++++++++
+ fs/cifs/sess.c | 84 +-----------------------------------------------------
+ 6 files changed, 29 insertions(+), 88 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 (3cc69b6 Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
+$ git merge ecryptfs/next
+Already up-to-date.
+Merging ext3/for_next (97a2847 Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jeffm/linux-reiserfs into for_next_testing)
+$ git merge ext3/for_next
+Already up-to-date.
+Merging ext4/dev (ad4eec6 ext4: allow specifying external journal by pathname mount option)
+$ git merge ext4/dev
+Already up-to-date.
+Merging f2fs/dev (26b0332 Merge tag 'dmaengine-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine)
+$ git merge f2fs/dev
+Already up-to-date.
+Merging fscache/fscache (19ce0a7 CIFS: FS-Cache: Uncache unread pages in cifs_readpages() before freeing them)
+$ git merge fscache/fscache
+Merge made by the 'recursive' strategy.
+Merging fuse/for-next (58111cc fuse: fix race in fuse_writepages())
+$ git merge fuse/for-next
+Auto-merging fs/fuse/file.c
+Merge made by the 'recursive' strategy.
+ fs/fuse/file.c | 252 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 224 insertions(+), 28 deletions(-)
+Merging gfs2/master (149ed7f GFS2: new function gfs2_rbm_incr)
+$ git merge gfs2/master
+Merge made by the 'recursive' strategy.
+ fs/gfs2/incore.h | 13 +++--
+ fs/gfs2/inode.c | 4 +-
+ fs/gfs2/rgrp.c | 142 ++++++++++++++++++++++++++++++++++---------------------
+ 3 files changed, 98 insertions(+), 61 deletions(-)
+Merging jfs/jfs-next (8660998 jfs: fix error path in ialloc)
+$ git merge jfs/jfs-next
+Merge made by the 'recursive' strategy.
+ fs/jfs/jfs_inode.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found)
+$ git merge logfs/master
+Auto-merging fs/logfs/super.c
+Merge made by the 'recursive' strategy.
+ fs/logfs/dev_mtd.c | 2 +-
+ fs/logfs/super.c | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+Merging nfs/linux-next (a0f6ed8 RPCSEC_GSS: fix crash on destroying gss auth)
+$ git merge nfs/linux-next
+Merge made by the 'recursive' strategy.
+ net/sunrpc/auth_gss/auth_gss.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+Merging nfsd/nfsd-next (d4a5165 rpc: let xdr layer allocate gssproxy receieve pages)
+$ git merge nfsd/nfsd-next
+Already up-to-date.
+Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
+$ git merge ocfs2/linux-next
+Auto-merging fs/ocfs2/dlm/dlmrecovery.c
+Auto-merging fs/ocfs2/dlm/dlmmaster.c
+Auto-merging fs/ocfs2/cluster/heartbeat.c
+Merge made by the 'recursive' strategy.
+ fs/ocfs2/cluster/heartbeat.c | 40 +++++++++-------------------------------
+ fs/ocfs2/cluster/masklog.h | 3 ++-
+ fs/ocfs2/dlm/dlmmaster.c | 8 +++++++-
+ fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++
+ 4 files changed, 25 insertions(+), 33 deletions(-)
+Merging omfs/for-next (976d167 Linux 3.1-rc9)
+$ git merge omfs/for-next
+Already up-to-date.
+Merging squashfs/master (9e01242 Squashfs: add corruption check for type in squashfs_readdir())
+$ git merge squashfs/master
+Already up-to-date.
+Merging v9fs/for-next (50192ab fs/9p: avoid accessing utsname after namespace has been torn down)
+$ git merge v9fs/for-next
+Already up-to-date.
+Merging ubifs/linux-next (c23e9b7 UBIFS: remove invalid warn msg with tst_recovery enabled)
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/for-next (08474ed xfs: remove dead code from xlog_recover_inode_pass2)
+$ git merge xfs/for-next
+Already up-to-date.
+Merging vfs/for-next (dc03a60 do_remount(): pull touch_mnt_namespace() up)
+$ git merge vfs/for-next
+Resolved 'fs/nfs/direct.c' using previous resolution.
+Resolved 'fs/nfs/file.c' using previous resolution.
+Auto-merging include/linux/fs.h
+Auto-merging fs/nfs/nfs4file.c
+Auto-merging fs/nfs/file.c
+CONFLICT (content): Merge conflict in fs/nfs/file.c
+Auto-merging fs/nfs/direct.c
+CONFLICT (content): Merge conflict in fs/nfs/direct.c
+Auto-merging fs/gfs2/inode.c
+Auto-merging fs/9p/vfs_file.c
+Auto-merging Documentation/filesystems/vfs.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 8d31a38] Merge remote-tracking branch 'vfs/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/vfs.txt | 14 ++---
+ fs/9p/cache.h | 12 ++++
+ fs/9p/v9fs.c | 7 ++-
+ fs/9p/vfs_file.c | 2 -
+ fs/9p/vfs_inode.c | 6 --
+ fs/9p/vfs_inode_dotl.c | 12 +---
+ fs/autofs4/waitq.c | 13 +---
+ fs/befs/linuxvfs.c | 61 +++++++++----------
+ fs/btrfs/ctree.h | 5 --
+ fs/btrfs/ioctl.c | 8 +--
+ fs/cifs/cifsfs.c | 2 +-
+ fs/cifs/cifsfs.h | 2 -
+ fs/cifs/dir.c | 1 +
+ fs/cifs/link.c | 7 ---
+ fs/ecryptfs/dentry.c | 29 ++++-----
+ fs/ecryptfs/ecryptfs_kernel.h | 19 ++----
+ fs/ecryptfs/inode.c | 16 +----
+ fs/ecryptfs/main.c | 3 +-
+ fs/gfs2/inode.c | 13 ++--
+ fs/libfs.c | 79 +++++++++++++-----------
+ fs/namei.c | 34 +++++++----
+ fs/namespace.c | 22 ++-----
+ fs/ncpfs/dir.c | 55 +++++++----------
+ fs/ncpfs/file.c | 12 ++--
+ fs/nfs/dir.c | 122 ++++++++++++++++----------------------
+ fs/nfs/direct.c | 17 ++----
+ fs/nfs/file.c | 117 ++++++++++++++----------------------
+ fs/nfs/namespace.c | 5 +-
+ fs/nfs/nfs3proc.c | 8 +--
+ fs/nfs/nfs4file.c | 4 +-
+ fs/nfs/nfs4namespace.c | 7 +--
+ fs/nfs/nfs4proc.c | 5 +-
+ fs/nfs/proc.c | 8 +--
+ fs/nfs/unlink.c | 9 ++-
+ fs/nfs/write.c | 6 +-
+ fs/nfsd/nfs4recover.c | 12 ++--
+ fs/nfsd/nfs4state.c | 15 ++---
+ fs/nfsd/nfsfh.c | 28 ++++-----
+ fs/nfsd/nfsfh.h | 4 +-
+ fs/nfsd/vfs.c | 9 ++-
+ fs/open.c | 21 ++++++-
+ fs/proc/self.c | 10 +---
+ fs/ubifs/dir.c | 41 ++++++-------
+ fs/ubifs/journal.c | 6 +-
+ fs/ubifs/xattr.c | 16 ++---
+ include/linux/fs.h | 1 +
+ net/sunrpc/rpc_pipe.c | 12 ++--
+ 47 files changed, 394 insertions(+), 523 deletions(-)
+Merging pci/next (a923874 Merge tag 'pci-v3.12-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
+$ git merge pci/next
+Already up-to-date.
+Merging hid/for-next (2f39579 Merge branch 'for-3.12/upstream' into for-next)
+$ git merge hid/for-next
+Merge made by the 'recursive' strategy.
+Merging i2c/i2c/for-next (b720423 i2c: rcar: add rcar-H2 support)
+$ git merge i2c/i2c/for-next
+Already up-to-date.
+Merging jdelvare-hwmon/master (e5c832d vfs: fix dentry RCU to refcounting possibly sleeping dput())
+$ git merge jdelvare-hwmon/master
+Already up-to-date.
+Merging hwmon-staging/hwmon-next (bf7ae49 hwmon: (jc42) fix coccinelle warnings)
+$ git merge hwmon-staging/hwmon-next
+Merge made by the 'recursive' strategy.
+ drivers/hwmon/acpi_power_meter.c | 13 ++-
+ drivers/hwmon/adm1026.c | 6 +-
+ drivers/hwmon/adt7462.c | 5 +-
+ drivers/hwmon/asc7621.c | 12 +--
+ drivers/hwmon/atxp1.c | 3 +-
+ drivers/hwmon/ds1621.c | 63 ++++---------
+ drivers/hwmon/f71882fg.c | 1 -
+ drivers/hwmon/f75375s.c | 4 +-
+ drivers/hwmon/gpio-fan.c | 45 ++++------
+ drivers/hwmon/hwmon.c | 185 +++++++++++++++++++++++++++++++++++----
+ drivers/hwmon/ina209.c | 46 ++++------
+ drivers/hwmon/ina2xx.c | 64 +++++---------
+ drivers/hwmon/jc42.c | 62 +++++--------
+ drivers/hwmon/lm73.c | 70 +++++----------
+ drivers/hwmon/lm95234.c | 138 +++++++++++------------------
+ drivers/hwmon/ltc4245.c | 78 +++++------------
+ drivers/hwmon/ltc4261.c | 56 ++++--------
+ drivers/hwmon/max16065.c | 124 +++++++++++---------------
+ drivers/hwmon/max6642.c | 73 +++++----------
+ drivers/hwmon/max6697.c | 55 ++++--------
+ drivers/hwmon/mc13783-adc.c | 2 +-
+ drivers/hwmon/nct6775.c | 141 +++++++++--------------------
+ drivers/hwmon/pmbus/pmbus_core.c | 22 ++---
+ drivers/hwmon/tmp401.c | 89 ++++++-------------
+ include/linux/hwmon-vid.h | 2 +-
+ include/linux/hwmon.h | 10 +++
+ 26 files changed, 578 insertions(+), 791 deletions(-)
+Merging v4l-dvb/master (d6cd75e Merge branch 'patchwork' into to_next)
+$ git merge v4l-dvb/master
+Resolved 'drivers/media/platform/s5p-mfc/s5p_mfc_dec.c' using previous resolution.
+Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
+CONFLICT (content): Merge conflict in drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 74a5f97] Merge remote-tracking branch 'v4l-dvb/master'
+$ git diff -M --stat --summary HEAD^..
+Merging kbuild/for-next (1e1a5f4 Merge branch 'kbuild/kconfig' into kbuild/for-next)
+$ git merge kbuild/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
+$ git merge kconfig/for-next
+Already up-to-date.
+Merging libata/for-next (062728a Merge branch 'for-3.12' into for-next)
+$ git merge libata/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging pstore/master (bd08ec3 pstore/ram: Restore ecc information block)
+$ git merge pstore/master
+Already up-to-date.
+Merging pm/linux-next (032fb7d Merge branch 'acpi-pci-next' into linux-next)
+$ git merge pm/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/cpufreq/cpufreq.c | 29 +++++++++++++++++++----------
+ drivers/pci/pci-acpi.c | 6 +++---
+ 2 files changed, 22 insertions(+), 13 deletions(-)
+Merging idle/next (d7b0a1b intel_idle: Support Intel Atom Processor C2000 Product Family)
+$ git merge idle/next
+Merge made by the 'recursive' strategy.
+ arch/x86/include/uapi/asm/msr-index.h | 2 +
+ drivers/idle/intel_idle.c | 38 ++++++++-
+ tools/power/x86/turbostat/turbostat.c | 155 +++++++++++++++++++++++++---------
+ 3 files changed, 153 insertions(+), 42 deletions(-)
+Merging apm/for-next (fb9d78a 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 cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
+$ git merge cpupowerutils/master
+Already up-to-date.
+Merging thermal/next (50e66c7 drivers: thermal: add check when unregistering cpu cooling)
+$ git merge thermal/next
+Already up-to-date.
+Merging ieee1394/for-next (db9ae8f firewire: ohci: Fix deadlock at bus reset)
+$ git merge ieee1394/for-next
+Already up-to-date.
+Merging ubi/linux-next (8930fa5 UBI: Fix invalidate_fastmap())
+$ git merge ubi/linux-next
+Already up-to-date.
+Merging dlm/next (c6ca7bc dlm: remove signal blocking)
+$ git merge dlm/next
+Already up-to-date.
+Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
+$ git merge swiotlb/linux-next
+Already up-to-date.
+Merging slave-dma/next (9be1d5a Merge branch 'for-linus' into next)
+$ git merge slave-dma/next
+Merge made by the 'recursive' strategy.
+ drivers/dma/Kconfig | 1 +
+ drivers/dma/edma.c | 2 +-
+ drivers/dma/pl330.c | 10 ++--------
+ drivers/dma/tegra20-apb-dma.c | 2 +-
+ 4 files changed, 5 insertions(+), 10 deletions(-)
+Merging dmaengine/next (4a43f39 dmaengine: dma_sync_wait and dma_find_channel undefined)
+$ git merge dmaengine/next
+Already up-to-date.
+Merging net-next/master (e7d33bb lockref: add ability to mark lockrefs "dead")
+$ git merge net-next/master
+Already up-to-date.
+Merging ipsec-next/master (aba8269 {ipv4,xfrm}: Introduce xfrm_tunnel_notifier for xfrm tunnel mode callback)
+$ git merge ipsec-next/master
+Resolved 'include/net/xfrm.h' using previous resolution.
+Auto-merging net/xfrm/xfrm_state.c
+Auto-merging include/net/xfrm.h
+CONFLICT (content): Merge conflict in include/net/xfrm.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 6ddc0c6] Merge remote-tracking branch 'ipsec-next/master'
+$ git diff -M --stat --summary HEAD^..
+ include/net/xfrm.h | 10 +++++--
+ net/ipv4/ip_vti.c | 67 +-------------------------------------------
+ net/ipv4/xfrm4_mode_tunnel.c | 16 +++++------
+ net/xfrm/xfrm_state.c | 2 +-
+ 4 files changed, 18 insertions(+), 77 deletions(-)
+Merging wireless-next/master (f212781 net: ipv6: mld: document force_mld_version in ip-sysctl.txt)
+$ git merge wireless-next/master
+Already up-to-date.
+Merging bluetooth/master (e793dcf Bluetooth: Fix waiting for clearing of BT_SK_SUSPEND flag)
+$ git merge bluetooth/master
+Merge made by the 'recursive' strategy.
+ drivers/bluetooth/hci_vhci.c | 170 ++++++++++++++++++++++---------
+ include/net/bluetooth/bluetooth.h | 1 +
+ include/net/bluetooth/hci.h | 5 +-
+ net/bluetooth/af_bluetooth.c | 40 ++++++++
+ net/bluetooth/hci_conn.c | 1 +
+ net/bluetooth/hci_core.c | 61 +++++++++---
+ net/bluetooth/hci_sock.c | 204 ++++++++++++++++++++++++++++++--------
+ net/bluetooth/l2cap_core.c | 52 +++++++---
+ net/bluetooth/l2cap_sock.c | 6 ++
+ net/bluetooth/mgmt.c | 9 ++
+ net/bluetooth/rfcomm/sock.c | 7 +-
+ 11 files changed, 432 insertions(+), 124 deletions(-)
+Merging infiniband/for-next (82af24a Merge branches 'cxgb4', 'flowsteer', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next)
+$ git merge infiniband/for-next
+Already up-to-date.
+Merging mtd/master (ef9a61b Merge tag 'for-linus-20130909' of git://git.infradead.org/linux-mtd)
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master (9be2121 mtd: atmel_nand: add MODULE_DEVICE_TABLE for nfc driver)
+$ git merge l2-mtd/master
+Auto-merging drivers/mtd/nand/nandsim.c
+Merge made by the 'recursive' strategy.
+ drivers/mtd/devices/mtd_dataflash.c | 2 --
+ drivers/mtd/lpddr/lpddr_cmds.c | 2 +-
+ drivers/mtd/nand/atmel_nand.c | 20 +++++---------------
+ drivers/mtd/nand/denali.c | 2 +-
+ drivers/mtd/nand/docg4.c | 1 -
+ drivers/mtd/nand/fsl_elbc_nand.c | 2 --
+ drivers/mtd/nand/fsl_ifc_nand.c | 2 --
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 8 ++++----
+ drivers/mtd/nand/lpc32xx_slc.c | 8 --------
+ drivers/mtd/nand/nand_base.c | 24 +++++++++++++++---------
+ drivers/mtd/nand/nand_bbt.c | 1 -
+ drivers/mtd/nand/nandsim.c | 2 +-
+ drivers/mtd/nand/pxa3xx_nand.c | 7 -------
+ drivers/mtd/onenand/omap2.c | 22 ----------------------
+ drivers/mtd/onenand/onenand_base.c | 17 ++++++-----------
+ include/linux/mtd/nand.h | 2 --
+ include/linux/of_mtd.h | 21 ++++++++++++++++++++-
+ 17 files changed, 53 insertions(+), 90 deletions(-)
+Merging crypto/master (1005bcc crypto: caam - enable instantiation of all RNG4 state handles)
+$ git merge crypto/master
+Merge made by the 'recursive' strategy.
+ arch/x86/crypto/Makefile | 2 +
+ arch/x86/crypto/sha256_ssse3_glue.c | 2 +-
+ drivers/char/hw_random/via-rng.c | 2 +-
+ drivers/crypto/caam/caamalg.c | 7 +
+ drivers/crypto/caam/caamhash.c | 7 +
+ drivers/crypto/caam/caamrng.c | 7 +
+ drivers/crypto/caam/ctrl.c | 400 ++++++++++++++++++++++++++++--------
+ drivers/crypto/caam/desc.h | 17 +-
+ drivers/crypto/caam/intern.h | 6 +
+ drivers/crypto/caam/regs.h | 14 +-
+ drivers/crypto/tegra-aes.c | 15 +-
+ 11 files changed, 371 insertions(+), 108 deletions(-)
+Merging drm/drm-next (86a7e12 Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next)
+$ git merge drm/drm-next
+Already up-to-date.
+Merging drm-intel/for-linux-next (507c1a4 drm/i915: check for more ASLC interrupts)
+$ git merge drm-intel/for-linux-next
+Resolved 'drivers/gpu/drm/i915/i915_gem.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/intel_drv.h' using previous resolution.
+Auto-merging drivers/gpu/drm/i915/intel_sdvo.c
+Auto-merging drivers/gpu/drm/i915/intel_pm.c
+Auto-merging drivers/gpu/drm/i915/intel_panel.c
+Auto-merging drivers/gpu/drm/i915/intel_opregion.c
+Auto-merging drivers/gpu/drm/i915/intel_dvo.c
+Auto-merging drivers/gpu/drm/i915/intel_drv.h
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/intel_ddi.c
+Auto-merging drivers/gpu/drm/i915/i915_irq.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_stolen.c
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c
+Auto-merging drivers/gpu/drm/i915/i915_dma.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 6ef6117] Merge remote-tracking branch 'drm-intel/for-linux-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/gpu/drm/drm_crtc.c | 2 +
+ drivers/gpu/drm/i915/Makefile | 3 +
+ drivers/gpu/drm/i915/dvo.h | 11 -
+ drivers/gpu/drm/i915/i915_debugfs.c | 20 +-
+ drivers/gpu/drm/i915/i915_dma.c | 2 +-
+ drivers/gpu/drm/i915/i915_drv.c | 74 ++--
+ drivers/gpu/drm/i915/i915_drv.h | 73 +++-
+ drivers/gpu/drm/i915/i915_gem.c | 146 ++++---
+ drivers/gpu/drm/i915/i915_gem_context.c | 14 +-
+ drivers/gpu/drm/i915/i915_gem_evict.c | 48 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 350 ++++++++-------
+ drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 24 +
+ drivers/gpu/drm/i915/i915_irq.c | 19 +-
+ drivers/gpu/drm/i915/i915_reg.h | 461 +++++++++++++++++++-
+ drivers/gpu/drm/i915/i915_suspend.c | 8 +-
+ drivers/gpu/drm/i915/i915_sysfs.c | 14 +-
+ drivers/gpu/drm/i915/intel_bios.c | 16 +
+ drivers/gpu/drm/i915/intel_bios.h | 41 ++
+ drivers/gpu/drm/i915/intel_crt.c | 11 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 37 +-
+ drivers/gpu/drm/i915/intel_display.c | 673 ++++++++++++++++++-----------
+ drivers/gpu/drm/i915/intel_dp.c | 313 +++++++++-----
+ drivers/gpu/drm/i915/intel_drv.h | 36 +-
+ drivers/gpu/drm/i915/intel_dsi.c | 621 ++++++++++++++++++++++++++
+ drivers/gpu/drm/i915/intel_dsi.h | 102 +++++
+ drivers/gpu/drm/i915/intel_dsi_cmd.c | 427 ++++++++++++++++++
+ drivers/gpu/drm/i915/intel_dsi_cmd.h | 109 +++++
+ drivers/gpu/drm/i915/intel_dsi_pll.c | 317 ++++++++++++++
+ drivers/gpu/drm/i915/intel_dvo.c | 7 +-
+ drivers/gpu/drm/i915/intel_hdmi.c | 61 ++-
+ drivers/gpu/drm/i915/intel_lvds.c | 8 +
+ drivers/gpu/drm/i915/intel_opregion.c | 431 ++++++++++++++++--
+ drivers/gpu/drm/i915/intel_overlay.c | 5 +-
+ drivers/gpu/drm/i915/intel_panel.c | 182 ++++----
+ drivers/gpu/drm/i915/intel_pm.c | 211 ++++-----
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 58 ++-
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 15 +-
+ drivers/gpu/drm/i915/intel_sdvo.c | 15 +-
+ drivers/gpu/drm/i915/intel_sideband.c | 74 +++-
+ drivers/gpu/drm/i915/intel_sprite.c | 10 +-
+ include/uapi/drm/drm_mode.h | 2 +
+ 42 files changed, 4081 insertions(+), 972 deletions(-)
+ create mode 100644 drivers/gpu/drm/i915/intel_dsi.c
+ create mode 100644 drivers/gpu/drm/i915/intel_dsi.h
+ create mode 100644 drivers/gpu/drm/i915/intel_dsi_cmd.c
+ create mode 100644 drivers/gpu/drm/i915/intel_dsi_cmd.h
+ create mode 100644 drivers/gpu/drm/i915/intel_dsi_pll.c
+Merging drm-tegra/drm/for-next (03da0e7 drm/tegra: Parse device tree earlier)
+$ git merge drm-tegra/drm/for-next
+Already up-to-date.
+Merging sound/for-next (bf69aa9 ALSA: rme9652: Remove redundant break)
+$ git merge sound/for-next
+Merge made by the 'recursive' strategy.
+ sound/pci/asihpi/asihpi.c | 9 +++++++--
+ sound/pci/au88x0/au88x0_synth.c | 29 ++++++++++-------------------
+ sound/pci/ctxfi/ctdaio.c | 4 ++--
+ sound/pci/hda/patch_ca0132.c | 2 +-
+ sound/pci/rme9652/hdspm.c | 5 -----
+ 5 files changed, 20 insertions(+), 29 deletions(-)
+Merging sound-asoc/for-next (e108124 Merge remote-tracking branch 'asoc/topic/wm8400' into asoc-next)
+$ git merge sound-asoc/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/sound/tlv320aic3x.txt | 26 ++
+ include/sound/soc-dai.h | 3 +
+ include/sound/soc.h | 95 ++----
+ include/trace/events/asoc.h | 1 +
+ sound/soc/Makefile | 2 +-
+ sound/soc/blackfin/bf6xx-i2s.c | 1 +
+ sound/soc/codecs/88pm860x-codec.c | 3 +
+ sound/soc/codecs/ab8500-codec.c | 7 +-
+ sound/soc/codecs/ak4104.c | 11 +-
+ sound/soc/codecs/ak4642.c | 2 -
+ sound/soc/codecs/arizona.c | 23 +-
+ sound/soc/codecs/cq93vc.c | 26 +-
+ sound/soc/codecs/max98095.c | 4 +-
+ sound/soc/codecs/rt5640.c | 13 +-
+ sound/soc/codecs/twl6040.c | 4 +-
+ sound/soc/codecs/wm8400.c | 95 ++----
+ sound/soc/davinci/davinci-evm.c | 64 +++--
+ sound/soc/fsl/fsl_spdif.c | 4 +-
+ sound/soc/fsl/fsl_ssi.c | 5 +-
+ sound/soc/kirkwood/kirkwood-dma.c | 4 +-
+ sound/soc/mxs/mxs-sgtl5000.c | 20 +-
+ sound/soc/samsung/bells.c | 1 +
+ sound/soc/samsung/i2s.c | 14 +-
+ sound/soc/samsung/smdk_wm8994.c | 12 +-
+ sound/soc/sh/rcar/gen.c | 41 +--
+ sound/soc/soc-cache.c | 263 ++++-------------
+ sound/soc/soc-core.c | 319 +++++++++++----------
+ sound/soc/soc-devres.c | 86 ++++++
+ sound/soc/soc-io.c | 26 --
+ sound/soc/soc-utils.c | 6 +-
+ sound/soc/spear/spdif_in.c | 12 +-
+ sound/soc/spear/spdif_out.c | 12 +-
+ 32 files changed, 536 insertions(+), 669 deletions(-)
+ create mode 100644 sound/soc/soc-devres.c
+Merging modules/modules-next (942e443 module: Fix mod->mkobj.kobj potentially freed too early)
+$ git merge modules/modules-next
+Already up-to-date.
+Merging virtio/virtio-next (9e266ec virtio_pci: pm: Use CONFIG_PM_SLEEP instead of CONFIG_PM)
+$ git merge virtio/virtio-next
+Already up-to-date.
+Merging input/next (8474cad Input: cyttsp4_core - remove redundant dev_set_drvdata)
+$ git merge input/next
+Merge made by the 'recursive' strategy.
+ drivers/input/misc/cobalt_btns.c | 2 --
+ drivers/input/misc/rb532_button.c | 1 -
+ drivers/input/mouse/cypress_ps2.c | 2 +-
+ drivers/input/touchscreen/cyttsp4_core.c | 2 --
+ drivers/input/touchscreen/htcpen.c | 2 --
+ 5 files changed, 1 insertion(+), 8 deletions(-)
+Merging input-mt/for-next (ad81f05 Linux 3.11-rc1)
+$ git merge input-mt/for-next
+Already up-to-date.
+Merging cgroup/for-next (58b79a9 cgroup: fix cgroup post-order descendant walk of empty subtree)
+$ git merge cgroup/for-next
+Auto-merging kernel/cgroup.c
+Merge made by the 'recursive' strategy.
+ kernel/cgroup.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+Merging block/for-next (0cf6343 Merge branch 'for-3.12/core' into for-next)
+$ git merge block/for-next
+Auto-merging fs/bio-integrity.c
+Auto-merging drivers/md/bcache/sysfs.c
+Auto-merging drivers/md/bcache/btree.c
+Auto-merging drivers/block/loop.c
+Auto-merging block/cfq-iosched.c
+Auto-merging block/blk-core.c
+Auto-merging block/blk-cgroup.c
+Merge made by the 'recursive' strategy.
+ block/blk-cgroup.c | 25 +-
+ block/blk-core.c | 6 +-
+ block/cfq-iosched.c | 2 +-
+ block/deadline-iosched.c | 2 +-
+ block/elevator.c | 2 +-
+ block/genhd.c | 3 +-
+ drivers/block/Kconfig | 9 +
+ drivers/block/Makefile | 2 +
+ drivers/block/loop.c | 15 +-
+ drivers/block/mtip32xx/mtip32xx.c | 500 +--
+ drivers/block/mtip32xx/mtip32xx.h | 18 +-
+ drivers/block/rsxx/core.c | 8 +-
+ drivers/block/rsxx/dma.c | 111 +-
+ drivers/block/rsxx/rsxx_priv.h | 9 +-
+ drivers/block/skd_main.c | 5817 +++++++++++++++++++++++++++++++++++
+ drivers/block/skd_s1120.h | 354 +++
+ drivers/block/xen-blkback/blkback.c | 3 +-
+ drivers/block/xen-blkfront.c | 44 +-
+ drivers/md/bcache/Kconfig | 11 +-
+ drivers/md/bcache/alloc.c | 383 ++-
+ drivers/md/bcache/bcache.h | 334 +-
+ drivers/md/bcache/bset.c | 324 +-
+ drivers/md/bcache/bset.h | 93 +-
+ drivers/md/bcache/btree.c | 1389 +++++----
+ drivers/md/bcache/btree.h | 195 +-
+ drivers/md/bcache/closure.c | 25 +-
+ drivers/md/bcache/closure.h | 110 +-
+ drivers/md/bcache/debug.c | 170 +-
+ drivers/md/bcache/debug.h | 50 +-
+ drivers/md/bcache/journal.c | 321 +-
+ drivers/md/bcache/journal.h | 49 +-
+ drivers/md/bcache/movinggc.c | 85 +-
+ drivers/md/bcache/request.c | 1106 ++++---
+ drivers/md/bcache/request.h | 43 +-
+ drivers/md/bcache/stats.c | 26 +-
+ drivers/md/bcache/stats.h | 13 +-
+ drivers/md/bcache/super.c | 190 +-
+ drivers/md/bcache/sysfs.c | 51 +-
+ drivers/md/bcache/trace.c | 1 -
+ drivers/md/bcache/util.c | 23 +-
+ drivers/md/bcache/util.h | 27 +-
+ drivers/md/bcache/writeback.c | 483 ++-
+ drivers/md/bcache/writeback.h | 47 +-
+ fs/bio-integrity.c | 2 +-
+ include/trace/events/bcache.h | 47 +-
+ include/uapi/linux/bcache.h | 373 +++
+ 46 files changed, 9694 insertions(+), 3207 deletions(-)
+ create mode 100644 drivers/block/skd_main.c
+ create mode 100644 drivers/block/skd_s1120.h
+ create mode 100644 include/uapi/linux/bcache.h
+Merging device-mapper/for-next (d36c748 dm: add reserved_bio_based_ios module parameter)
+$ git merge device-mapper/for-next
+Merge made by the 'recursive' strategy.
+ drivers/md/dm-io.c | 7 +++---
+ drivers/md/dm-mpath.c | 7 +++---
+ drivers/md/dm-stats.c | 23 ++++++++++++++------
+ drivers/md/dm.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++----
+ drivers/md/dm.h | 3 +++
+ 5 files changed, 83 insertions(+), 17 deletions(-)
+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 (272b98c Linux 3.12-rc1)
+$ git merge mmc/mmc-next
+Already up-to-date.
+Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command)
+$ git merge kgdb/kgdb-next
+Merge made by the 'recursive' strategy.
+Merging slab/for-next (23774a2 slab: Use correct GFP_DMA constant)
+$ git merge slab/for-next
+Already up-to-date.
+Merging uclinux/for-next (6dbe51c Linux 3.9-rc1)
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next (bfc90cb raid5: only wakeup necessary threads)
+$ git merge md/for-next
+Already up-to-date.
+Merging mfd/master (9c31e88 Merge tag 'mfd-lee-3.12-2' of git://git.linaro.org/people/ljones/mfd)
+$ git merge mfd/master
+Already up-to-date.
+Merging mfd-lj/for-mfd-next (cb28a30 mfd: wm8994: Remove unused irq_lock)
+$ git merge mfd-lj/for-mfd-next
+Auto-merging drivers/mfd/wm8994-core.c
+Auto-merging drivers/mfd/tps6586x.c
+Auto-merging drivers/mfd/sm501.c
+Merge made by the 'recursive' strategy.
+ drivers/mfd/da9052-i2c.c | 12 ++++--
+ drivers/mfd/sm501.c | 2 +-
+ drivers/mfd/tps6586x.c | 18 +++++++--
+ drivers/mfd/wm8994-core.c | 78 ---------------------------------------
+ include/linux/mfd/da9052/da9052.h | 20 +++++++---
+ include/linux/mfd/wm8994/core.h | 47 +++++++++++++++++------
+ 6 files changed, 74 insertions(+), 103 deletions(-)
+Merging battery/master (db15e63 rx51_battery: Fix channel number when reading adc value)
+$ git merge battery/master
+Already up-to-date.
+Merging fbdev/for-next (5e8be02 video: atmel_lcdfb: add device tree suport)
+$ git merge fbdev/for-next
+Auto-merging drivers/video/atmel_lcdfb.c
+Auto-merging drivers/video/Kconfig
+Auto-merging arch/avr32/mach-at32ap/at32ap700x.c
+Auto-merging arch/avr32/boards/atngw100/mrmt.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/video/atmel,lcdc.txt | 75 +++++
+ arch/arm/mach-at91/at91sam9261_devices.c | 6 +-
+ arch/arm/mach-at91/at91sam9263_devices.c | 6 +-
+ arch/arm/mach-at91/at91sam9g45_devices.c | 6 +-
+ arch/arm/mach-at91/at91sam9rl_devices.c | 6 +-
+ arch/arm/mach-at91/board-sam9261ek.c | 10 +-
+ arch/arm/mach-at91/board-sam9263ek.c | 6 +-
+ arch/arm/mach-at91/board-sam9m10g45ek.c | 4 +-
+ arch/arm/mach-at91/board-sam9rlek.c | 6 +-
+ arch/arm/mach-at91/board.h | 4 +-
+ arch/avr32/boards/atngw100/evklcd10x.c | 8 +-
+ arch/avr32/boards/atngw100/mrmt.c | 4 +-
+ arch/avr32/boards/atstk1000/atstk1000.h | 2 +-
+ arch/avr32/boards/atstk1000/setup.c | 2 +-
+ arch/avr32/boards/favr-32/setup.c | 2 +-
+ arch/avr32/boards/hammerhead/setup.c | 2 +-
+ arch/avr32/boards/merisc/display.c | 2 +-
+ arch/avr32/boards/mimc200/setup.c | 4 +-
+ arch/avr32/mach-at32ap/at32ap700x.c | 8 +-
+ arch/avr32/mach-at32ap/include/mach/board.h | 4 +-
+ drivers/video/Kconfig | 2 +
+ drivers/video/atmel_lcdfb.c | 343 +++++++++++++++++----
+ include/video/atmel_lcdc.h | 25 +-
+ 23 files changed, 402 insertions(+), 135 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/video/atmel,lcdc.txt
+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 (6f001cc Merge branch '3.12/dss-legacy-removal' into for-next)
+$ git merge omap_dss2/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging regulator/for-next (792824d Merge remote-tracking branch 'regulator/topic/stw481x' into regulator-next)
+$ git merge regulator/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/regulator/palmas-pmic.txt | 12 +-
+ .../devicetree/bindings/regulator/regulator.txt | 5 +
+ Documentation/driver-model/devres.txt | 1 +
+ drivers/regulator/88pm8607.c | 12 +-
+ drivers/regulator/Kconfig | 18 +-
+ drivers/regulator/Makefile | 3 +-
+ drivers/regulator/aat2870-regulator.c | 11 +-
+ drivers/regulator/ad5398.c | 19 +-
+ drivers/regulator/anatop-regulator.c | 3 +-
+ drivers/regulator/arizona-ldo1.c | 12 +-
+ drivers/regulator/arizona-micsupp.c | 14 +-
+ drivers/regulator/as3711-regulator.c | 22 +-
+ drivers/regulator/core.c | 249 +++-----------------
+ drivers/regulator/da903x.c | 11 +-
+ drivers/regulator/da9052-regulator.c | 14 +-
+ drivers/regulator/da9055-regulator.c | 24 +-
+ drivers/regulator/da9063-regulator.c | 4 +-
+ drivers/regulator/devres.c | 252 +++++++++++++++++++++
+ drivers/regulator/fan53555.c | 12 +-
+ drivers/regulator/fixed.c | 28 +--
+ drivers/regulator/internal.h | 38 ++++
+ drivers/regulator/isl6271a-regulator.c | 24 +-
+ drivers/regulator/max1586.c | 26 +--
+ drivers/regulator/max77686.c | 23 +-
+ drivers/regulator/max77693.c | 29 +--
+ drivers/regulator/max8649.c | 14 +-
+ drivers/regulator/max8660.c | 30 +--
+ drivers/regulator/max8907-regulator.c | 23 +-
+ drivers/regulator/max8973-regulator.c | 11 +-
+ drivers/regulator/max8997.c | 39 +---
+ drivers/regulator/max8998.c | 35 +--
+ drivers/regulator/mc13783-regulator.c | 25 +-
+ drivers/regulator/mc13892-regulator.c | 22 +-
+ drivers/regulator/of_regulator.c | 6 +
+ drivers/regulator/palmas-regulator.c | 220 ++++++++++++++----
+ drivers/regulator/rc5t583-regulator.c | 22 +-
+ drivers/regulator/s2mps11.c | 23 +-
+ drivers/regulator/s5m8767.c | 24 +-
+ drivers/regulator/stw481x-vmmc.c | 110 +++++++++
+ drivers/regulator/ti-abb-regulator.c | 79 ++-----
+ drivers/regulator/tps51632-regulator.c | 11 +-
+ drivers/regulator/tps62360-regulator.c | 17 +-
+ drivers/regulator/tps65023-regulator.c | 22 +-
+ drivers/regulator/tps6507x-regulator.c | 23 +-
+ drivers/regulator/tps65090-regulator.c | 35 +--
+ drivers/regulator/tps65217-regulator.c | 26 +--
+ drivers/regulator/tps6586x-regulator.c | 31 +--
+ drivers/regulator/tps65910-regulator.c | 23 +-
+ drivers/regulator/tps65912-regulator.c | 24 +-
+ drivers/regulator/tps80031-regulator.c | 30 +--
+ drivers/regulator/wm831x-dcdc.c | 118 +++-------
+ drivers/regulator/wm831x-isink.c | 25 +-
+ drivers/regulator/wm831x-ldo.c | 63 ++----
+ drivers/regulator/wm8350-regulator.c | 6 +-
+ drivers/regulator/wm8400-regulator.c | 13 +-
+ drivers/regulator/wm8994-regulator.c | 14 +-
+ include/linux/regulator/driver.h | 9 +
+ include/linux/regulator/machine.h | 7 +-
+ 58 files changed, 853 insertions(+), 1193 deletions(-)
+ create mode 100644 drivers/regulator/devres.c
+ create mode 100644 drivers/regulator/internal.h
+ create mode 100644 drivers/regulator/stw481x-vmmc.c
+Merging security/next (7320336 Merge branch 'smack-for-3.12' of git://git.gitorious.org/smack-next/kernel into ra-next)
+$ git merge security/next
+Already up-to-date.
+Merging selinux/master (7a36283 selinux: add Paul Moore as a SELinux maintainer)
+$ git merge selinux/master
+Auto-merging security/selinux/include/xfrm.h
+Auto-merging security/selinux/hooks.c
+Auto-merging security/security.c
+Auto-merging security/capability.c
+Auto-merging include/linux/security.h
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 3 +-
+ include/linux/security.h | 26 ++-
+ security/capability.c | 15 +-
+ security/security.c | 13 +-
+ security/selinux/hooks.c | 146 +++++++-----
+ security/selinux/include/objsec.h | 4 +-
+ security/selinux/include/security.h | 13 +-
+ security/selinux/include/xfrm.h | 45 ++--
+ security/selinux/netnode.c | 2 +
+ security/selinux/selinuxfs.c | 4 +-
+ security/selinux/ss/ebitmap.c | 20 +-
+ security/selinux/ss/ebitmap.h | 10 +-
+ security/selinux/ss/mls.c | 22 +-
+ security/selinux/ss/mls_types.h | 2 +-
+ security/selinux/ss/policydb.c | 3 +-
+ security/selinux/ss/services.c | 66 ++++--
+ security/selinux/xfrm.c | 453 ++++++++++++++++--------------------
+ 17 files changed, 450 insertions(+), 397 deletions(-)
+Merging lblnet/master (07bc9dc Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc)
+$ git merge lblnet/master
+Already up-to-date.
+Merging watchdog/master (272b98c Linux 3.12-rc1)
+$ git merge watchdog/master
+Already up-to-date.
+Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging iommu/next (d6a60fc Merge branches 'arm/exynos', 'ppc/pamu', 'arm/smmu', 'x86/amd' and 'iommu/fixes' into next)
+$ git merge iommu/next
+Already up-to-date.
+Merging vfio/next (dac09b5 vfio: fix documentation)
+$ git merge vfio/next
+Already up-to-date.
+Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error)
+$ 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 (2e515bf Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial)
+$ git merge trivial/for-next
+Already up-to-date.
+Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
+$ git merge audit/for-next
+Already up-to-date.
+Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls)
+$ git merge fsnotify/for-next
+Already up-to-date.
+Merging devicetree/devicetree/next (2bc552d of/platform: add error reporting to of_amba_device_create())
+$ git merge devicetree/devicetree/next
+Already up-to-date.
+Merging dt-rh/for-next (8851b9f include: dt-binding: input: create a DT header defining key codes.)
+$ git merge dt-rh/for-next
+Already up-to-date.
+Merging spi/for-next (d8c363d Merge remote-tracking branch 'spi/topic/tegra' into spi-next)
+$ git merge spi/for-next
+Auto-merging Documentation/driver-model/devres.txt
+Merge made by the 'recursive' strategy.
+ Documentation/driver-model/devres.txt | 3 +
+ drivers/spi/Kconfig | 3 +-
+ drivers/spi/spi-altera.c | 2 +-
+ drivers/spi/spi-ath79.c | 2 +-
+ drivers/spi/spi-atmel.c | 41 ++++----
+ drivers/spi/spi-au1550.c | 2 +-
+ drivers/spi/spi-bfin-sport.c | 27 ++---
+ drivers/spi/spi-bfin5xx.c | 24 +++--
+ drivers/spi/spi-bitbang.c | 12 ++-
+ drivers/spi/spi-butterfly.c | 2 +-
+ drivers/spi/spi-clps711x.c | 2 -
+ drivers/spi/spi-davinci.c | 13 ++-
+ drivers/spi/spi-dw-mmio.c | 5 +-
+ drivers/spi/spi-dw-pci.c | 1 -
+ drivers/spi/spi-efm32.c | 4 +-
+ drivers/spi/spi-fsl-dspi.c | 19 ++--
+ drivers/spi/spi-gpio.c | 5 +-
+ drivers/spi/spi-imx.c | 2 +-
+ drivers/spi/spi-lm70llp.c | 2 +-
+ drivers/spi/spi-mpc512x-psc.c | 4 +-
+ drivers/spi/spi-nuc900.c | 3 +-
+ drivers/spi/spi-oc-tiny.c | 2 +-
+ drivers/spi/spi-pl022.c | 3 -
+ drivers/spi/spi-ppc4xx.c | 3 +-
+ drivers/spi/spi-pxa2xx.c | 11 +-
+ drivers/spi/spi-rspi.c | 183 ++++++++++++++++++++++++++--------
+ drivers/spi/spi-s3c24xx.c | 4 +-
+ drivers/spi/spi-s3c64xx.c | 23 +----
+ drivers/spi/spi-sh-sci.c | 2 +-
+ drivers/spi/spi-sirf.c | 2 +-
+ drivers/spi/spi-tegra114.c | 2 +-
+ drivers/spi/spi-tegra20-sflash.c | 2 +-
+ drivers/spi/spi-tegra20-slink.c | 2 +-
+ drivers/spi/spi-xilinx.c | 2 +-
+ drivers/spi/spi.c | 40 +++++++-
+ drivers/spi/spidev.c | 1 -
+ include/linux/spi/rspi.h | 2 +
+ include/linux/spi/spi.h | 2 +
+ 38 files changed, 300 insertions(+), 164 deletions(-)
+Merging tip/auto-latest (3ef354f Merge branch 'x86/urgent')
+$ git merge tip/auto-latest
+CONFLICT (modify/delete): include/linux/time-armada-370-xp.h deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of include/linux/time-armada-370-xp.h left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f include/linux/time-armada-370-xp.h
+include/linux/time-armada-370-xp.h: needs merge
+rm 'include/linux/time-armada-370-xp.h'
+$ git commit -v -a
+[master d8a2540] Merge remote-tracking branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ arch/x86/include/asm/uaccess_64.h | 24 +++--
+ arch/x86/kernel/cpu/perf_event.h | 5 +
+ arch/x86/kernel/cpu/perf_event_intel.c | 77 ++++++++++++++-
+ arch/x86/kernel/cpu/perf_event_intel_ds.c | 137 ++++++++++++--------------
+ arch/x86/kernel/i8259.c | 3 +-
+ arch/x86/kernel/reboot.c | 7 +-
+ arch/x86/mm/init.c | 23 ++++-
+ kernel/reboot.c | 9 +-
+ kernel/sched/fair.c | 157 +++++++++++++++---------------
+ kernel/sched/sched.h | 1 +
+ 10 files changed, 272 insertions(+), 171 deletions(-)
+Merging edac/linux_next (de4772c edac: sb_edac.c should not require prescence of IMC_DDRIO device)
+$ git merge edac/linux_next
+Already up-to-date.
+Merging edac-amd/for-next (75a9551 cpc925_edac: Use proper array termination)
+$ git merge edac-amd/for-next
+Already up-to-date.
+Merging ftrace/for-next (a0a5a05 ftrace/rcu: Do not trace debug_lockdep_rcu_enabled())
+$ git merge ftrace/for-next
+Already up-to-date.
+Merging rcu/rcu/next (25f27ce Merge branches 'doc.2013.08.19a', 'fixes.2013.08.20a', 'sysidle.2013.08.31a' and 'torture.2013.08.20a' into HEAD)
+$ 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 kvm/linux-next (272b98c Linux 3.12-rc1)
+$ git merge kvm/linux-next
+Already up-to-date.
+Merging kvm-arm/kvm-arm-next (1fe40f6 ARM: KVM: Add newlines to panic strings)
+$ git merge kvm-arm/kvm-arm-next
+Already up-to-date.
+Merging kvm-ppc/kvm-ppc-next (6b9e4fa Merge tag 'kvm-arm-for-3.12' of git://git.linaro.org/people/cdall/linux-kvm-arm into queue)
+$ git merge kvm-ppc/kvm-ppc-next
+Already up-to-date.
+Merging oprofile/for-next (f722406 Linux 3.10-rc1)
+$ git merge oprofile/for-next
+Already up-to-date.
+Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work)
+$ git merge fw-nohz/nohz/next
+Already up-to-date.
+Merging xen-tip/linux-next (5582c05 Merge remote branch 'xentip/stable/for-linus-3.12' into linux-next)
+$ git merge xen-tip/linux-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging percpu/for-next (abec1a8 percpu: Make __verify_pcu_ptr handle per cpu pointers to arrays)
+$ git merge percpu/for-next
+Already up-to-date.
+Merging workqueues/for-next (016564d workqueue: fix pool ID allocation leakage and remove BUILD_BUG_ON() in init_workqueues)
+$ git merge workqueues/for-next
+Auto-merging kernel/workqueue.c
+Merge made by the 'recursive' strategy.
+ kernel/workqueue.c | 41 ++++++++++++++++++++++++++++++++---------
+ 1 file changed, 32 insertions(+), 9 deletions(-)
+Merging drivers-x86/linux-next (5c07eae platform/x86: panasonic-laptop: reuse module_acpi_driver)
+$ git merge drivers-x86/linux-next
+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 (fdf2002 regmap: add regmap_field_update_bits())
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/regmap.c | 20 ++++++++++++++++++++
+ include/linux/regmap.h | 2 ++
+ 2 files changed, 22 insertions(+)
+Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
+$ git merge hsi/for-next
+Already up-to-date.
+Merging leds/for-next (bf178f3 leds: lp55xx: enable setting default trigger)
+$ git merge leds/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/leds/leds-lp55xx.txt | 10 +++++++---
+ drivers/leds/leds-blinkm.c | 3 ---
+ drivers/leds/leds-lp55xx-common.c | 3 +++
+ include/linux/platform_data/leds-lp55xx.h | 1 +
+ 4 files changed, 11 insertions(+), 6 deletions(-)
+Merging driver-core/driver-core-next (272b98c Linux 3.12-rc1)
+$ git merge driver-core/driver-core-next
+Already up-to-date.
+Merging tty/tty-next (272b98c Linux 3.12-rc1)
+$ git merge tty/tty-next
+Already up-to-date.
+Merging usb/usb-next (c8f2efc usbcore: fix read of usbdevfs_ctrltransfer fields in proc_control())
+$ git merge usb/usb-next
+Auto-merging drivers/usb/host/ehci-fsl.c
+Merge made by the 'recursive' strategy.
+ drivers/usb/core/devio.c | 6 +-
+ drivers/usb/core/hcd.c | 14 +++-
+ drivers/usb/core/hub.c | 11 ++-
+ drivers/usb/core/usb.h | 1 +
+ drivers/usb/host/ehci-fsl.c | 2 +-
+ drivers/usb/host/ehci-sched.c | 180 ++++++++++++++++++++++++++----------------
+ drivers/usb/host/ehci.h | 1 +
+ include/linux/usb.h | 2 +-
+ include/linux/usb/hcd.h | 7 ++
+ 9 files changed, 142 insertions(+), 82 deletions(-)
+Merging usb-gadget/next (272b98c Linux 3.12-rc1)
+$ git merge usb-gadget/next
+Already up-to-date.
+Merging staging/staging-next (9076b09 staging/lustre: fix coccinelle warnings)
+$ git merge staging/staging-next
+Auto-merging drivers/staging/rtl8188eu/include/odm.h
+Auto-merging drivers/staging/rtl8188eu/core/rtw_wlan_util.c
+Auto-merging drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c
+Auto-merging drivers/staging/lustre/lustre/Kconfig
+Auto-merging drivers/staging/dgnc/dgnc_driver.c
+Auto-merging drivers/staging/dgap/dgap_driver.c
+Merge made by the 'recursive' strategy.
+ drivers/staging/android/Kconfig | 7 +-
+ drivers/staging/android/alarm-dev.c | 8 +-
+ drivers/staging/android/ashmem.c | 137 +++++--
+ drivers/staging/android/binder.c | 9 +-
+ drivers/staging/android/timed_output.h | 4 +-
+ drivers/staging/bcm/InterfaceMisc.c | 2 +-
+ drivers/staging/bcm/nvm.c | 12 +-
+ drivers/staging/comedi/comedidev.h | 2 +
+ drivers/staging/comedi/drivers.c | 29 ++
+ drivers/staging/comedi/drivers/8255.c | 25 +-
+ .../staging/comedi/drivers/addi-data/addi_common.c | 2 -
+ .../comedi/drivers/addi-data/hwdrv_apci1564.c | 7 +-
+ .../comedi/drivers/addi-data/hwdrv_apci3120.c | 17 +-
+ .../comedi/drivers/addi-data/hwdrv_apci3200.c | 7 +-
+ drivers/staging/comedi/drivers/addi_apci_1516.c | 8 +-
+ drivers/staging/comedi/drivers/addi_apci_16xx.c | 11 +-
+ drivers/staging/comedi/drivers/addi_apci_2032.c | 8 +-
+ drivers/staging/comedi/drivers/addi_apci_2200.c | 8 +-
+ drivers/staging/comedi/drivers/addi_apci_3120.c | 2 -
+ drivers/staging/comedi/drivers/addi_apci_3501.c | 8 +-
+ drivers/staging/comedi/drivers/addi_apci_3xxx.c | 17 +-
+ drivers/staging/comedi/drivers/adl_pci6208.c | 10 +-
+ drivers/staging/comedi/drivers/adl_pci7x3x.c | 13 +-
+ drivers/staging/comedi/drivers/adl_pci9111.c | 9 +-
+ drivers/staging/comedi/drivers/adl_pci9118.c | 11 +-
+ drivers/staging/comedi/drivers/adq12b.c | 32 +-
+ drivers/staging/comedi/drivers/adv_pci1710.c | 16 +-
+ drivers/staging/comedi/drivers/adv_pci1723.c | 13 +-
+ drivers/staging/comedi/drivers/adv_pci_dio.c | 33 +-
+ drivers/staging/comedi/drivers/aio_iiro_16.c | 4 +-
+ .../staging/comedi/drivers/amplc_dio200_common.c | 33 +-
+ drivers/staging/comedi/drivers/amplc_pc263.c | 17 +-
+ drivers/staging/comedi/drivers/amplc_pci263.c | 17 +-
+ drivers/staging/comedi/drivers/cb_das16_cs.c | 9 +-
+ drivers/staging/comedi/drivers/cb_pcidas64.c | 25 +-
+ drivers/staging/comedi/drivers/comedi_parport.c | 380 +++++++++---------
+ drivers/staging/comedi/drivers/contec_pci_dio.c | 12 +-
+ drivers/staging/comedi/drivers/das08.c | 46 +--
+ drivers/staging/comedi/drivers/das08.h | 1 -
+ drivers/staging/comedi/drivers/das16.c | 9 +-
+ drivers/staging/comedi/drivers/das16m1.c | 22 +-
+ drivers/staging/comedi/drivers/das1800.c | 22 +-
+ drivers/staging/comedi/drivers/das800.c | 6 +-
+ drivers/staging/comedi/drivers/dmm32at.c | 70 ++--
+ drivers/staging/comedi/drivers/dt2801.c | 18 +-
+ drivers/staging/comedi/drivers/dt2811.c | 8 +-
+ drivers/staging/comedi/drivers/dt2817.c | 51 ++-
+ drivers/staging/comedi/drivers/dt282x.c | 10 +-
+ drivers/staging/comedi/drivers/dt3000.c | 9 +-
+ drivers/staging/comedi/drivers/dt9812.c | 9 +-
+ drivers/staging/comedi/drivers/dyna_pci10xx.c | 20 +-
+ drivers/staging/comedi/drivers/icp_multi.c | 14 +-
+ drivers/staging/comedi/drivers/ii_pci20kc.c | 7 +-
+ drivers/staging/comedi/drivers/me4000.c | 25 +-
+ drivers/staging/comedi/drivers/me_daq.c | 9 +-
+ drivers/staging/comedi/drivers/multiq3.c | 8 +-
+ drivers/staging/comedi/drivers/ni_6527.c | 22 +-
+ drivers/staging/comedi/drivers/ni_660x.c | 1 -
+ drivers/staging/comedi/drivers/ni_670x.c | 11 +-
+ drivers/staging/comedi/drivers/ni_at_a2150.c | 7 +-
+ drivers/staging/comedi/drivers/ni_at_ao.c | 8 +-
+ drivers/staging/comedi/drivers/ni_atmio16d.c | 9 +-
+ drivers/staging/comedi/drivers/ni_daq_700.c | 19 +-
+ drivers/staging/comedi/drivers/ni_labpc.c | 10 +-
+ drivers/staging/comedi/drivers/ni_mio_common.c | 45 +--
+ drivers/staging/comedi/drivers/ni_pcidio.c | 9 +-
+ drivers/staging/comedi/drivers/pcl711.c | 19 +-
+ drivers/staging/comedi/drivers/pcl726.c | 19 +-
+ drivers/staging/comedi/drivers/pcl730.c | 13 +-
+ drivers/staging/comedi/drivers/pcl812.c | 11 +-
+ drivers/staging/comedi/drivers/pcl818.c | 18 +-
+ drivers/staging/comedi/drivers/pcmad.c | 8 +-
+ drivers/staging/comedi/drivers/quatech_daqp_cs.c | 8 +-
+ drivers/staging/comedi/drivers/rtd520.c | 8 +-
+ drivers/staging/comedi/drivers/rti800.c | 8 +-
+ drivers/staging/comedi/drivers/s526.c | 9 +-
+ drivers/staging/comedi/drivers/s626.c | 13 +-
+ drivers/staging/comedi/drivers/skel.c | 46 ++-
+ drivers/staging/comedi/drivers/ssv_dnp.c | 48 +--
+ drivers/staging/comedi/drivers/usbdux.c | 6 +-
+ drivers/staging/comedi/drivers/usbduxsigma.c | 6 +-
+ drivers/staging/comedi/drivers/vmk80xx.c | 35 +-
+ drivers/staging/dgap/dgap_downld.h | 2 +-
+ drivers/staging/dgap/dgap_driver.c | 4 -
+ drivers/staging/dgap/dgap_driver.h | 2 +-
+ drivers/staging/dgap/dgap_fep5.h | 2 +-
+ drivers/staging/dgap/dgap_kcompat.h | 29 --
+ drivers/staging/dgap/dgap_parse.c | 10 +-
+ drivers/staging/dgap/dgap_sysfs.c | 22 +-
+ drivers/staging/dgap/dgap_tty.c | 4 +-
+ drivers/staging/dgap/digi.h | 4 +-
+ drivers/staging/dgap/downld.c | 4 +-
+ drivers/staging/dgnc/dgnc_cls.c | 22 +-
+ drivers/staging/dgnc/dgnc_driver.c | 126 +++---
+ drivers/staging/dgnc/dgnc_driver.h | 12 +-
+ drivers/staging/dgnc/dgnc_mgmt.c | 22 +-
+ drivers/staging/dgnc/dgnc_neo.c | 30 +-
+ drivers/staging/dgnc/dgnc_neo.h | 2 +-
+ drivers/staging/dgnc/dgnc_sysfs.c | 166 ++++----
+ drivers/staging/dgnc/dgnc_sysfs.h | 6 +-
+ drivers/staging/dgnc/dgnc_tty.c | 254 ++++++-------
+ drivers/staging/dgnc/dgnc_tty.h | 6 +-
+ drivers/staging/dgnc/digi.h | 4 +-
+ drivers/staging/dgrp/dgrp_sysfs.c | 30 +-
+ drivers/staging/dwc2/core.c | 2 +-
+ drivers/staging/dwc2/hcd_queue.c | 4 +-
+ drivers/staging/et131x/Module.symvers | 0
+ drivers/staging/et131x/README | 7 +-
+ drivers/staging/et131x/et131x.c | 17 +-
+ drivers/staging/fwserial/fwserial.c | 3 +-
+ drivers/staging/lustre/lustre/Kconfig | 2 +-
+ drivers/staging/lustre/lustre/lvfs/fsfilt.c | 12 +-
+ drivers/staging/lustre/lustre/lvfs/lvfs_lib.c | 5 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_br_ext.c | 3 +-
+ drivers/staging/rtl8188eu/core/rtw_efuse.c | 8 +-
+ drivers/staging/rtl8188eu/core/rtw_recv.c | 23 +-
+ drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 7 +-
+ drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 26 +-
+ drivers/staging/rtl8188eu/core/rtw_xmit.c | 7 +-
+ drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c | 423 ---------------------
+ drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 4 +-
+ drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 96 ++---
+ drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h | 2 +-
+ drivers/staging/rtl8188eu/include/HalPhyRf_8188e.h | 2 -
+ drivers/staging/rtl8188eu/include/odm.h | 4 +-
+ drivers/staging/rtl8188eu/include/odm_HWConfig.h | 4 +-
+ drivers/staging/rtl8188eu/include/rtw_recv.h | 2 +-
+ drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 11 +-
+ drivers/staging/rtl8188eu/os_dep/osdep_service.c | 3 +-
+ drivers/staging/rtl8188eu/os_dep/recv_linux.c | 3 +-
+ drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 +-
+ drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 18 +-
+ drivers/staging/rtl8192e/rtllib_rx.c | 13 +-
+ drivers/staging/rtl8712/usb_intf.c | 16 +-
+ drivers/staging/silicom/bpctl_mod.c | 188 +++------
+ drivers/staging/slicoss/slicoss.c | 6 +-
+ drivers/staging/speakup/Kconfig | 4 +
+ drivers/staging/speakup/kobjects.c | 72 ++--
+ drivers/staging/vt6655/bssdb.c | 11 +-
+ drivers/staging/vt6655/dpc.c | 7 +-
+ drivers/staging/vt6655/iwctl.c | 6 +-
+ drivers/staging/vt6655/key.c | 10 +-
+ drivers/staging/vt6655/vntwifi.c | 22 --
+ drivers/staging/vt6655/wctl.c | 8 +-
+ drivers/staging/vt6655/wmgr.c | 3 +-
+ drivers/staging/vt6655/wpactl.c | 2 +-
+ drivers/staging/vt6656/bssdb.c | 12 +-
+ drivers/staging/vt6656/dpc.c | 13 +-
+ drivers/staging/vt6656/iwctl.c | 8 +-
+ drivers/staging/vt6656/key.c | 10 +-
+ drivers/staging/vt6656/wctl.c | 7 +-
+ drivers/staging/vt6656/wmgr.c | 4 +-
+ drivers/staging/vt6656/wpactl.c | 2 +-
+ drivers/staging/wlan-ng/cfg80211.c | 6 +-
+ drivers/staging/wlan-ng/hfa384x_usb.c | 90 ++---
+ 156 files changed, 1452 insertions(+), 2277 deletions(-)
+ create mode 100644 drivers/staging/et131x/Module.symvers
+Merging char-misc/char-misc-next (272b98c Linux 3.12-rc1)
+$ git merge char-misc/char-misc-next
+Already up-to-date.
+Merging scsi/for-next (fc85799 [SCSI] fnic: fnic Driver Tuneables Exposed through CLI)
+$ git merge scsi/for-next
+Already up-to-date.
+Merging target-updates/for-next (2999ee7 target/iscsi: Bump versions to v4.1.0)
+$ git merge target-updates/for-next
+Already up-to-date.
+Merging target-merge/for-next-merge (d4e4ab8 Linux 3.11-rc5)
+$ git merge target-merge/for-next-merge
+Already up-to-date.
+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 (6734092 isci: add a couple __iomem annotations)
+$ git merge isci/all
+Already up-to-date.
+Merging bcon/master (e284f34 netconsole: s/syslogd/cancd/ in documentation)
+$ git merge bcon/master
+Resolved 'drivers/block/Kconfig' using previous resolution.
+Auto-merging kernel/printk/printk.c
+Auto-merging init/do_mounts.c
+Auto-merging include/linux/mount.h
+Auto-merging include/linux/console.h
+Auto-merging drivers/net/netconsole.c
+Auto-merging drivers/block/Makefile
+Auto-merging drivers/block/Kconfig
+CONFLICT (content): Merge conflict in drivers/block/Kconfig
+Auto-merging block/partitions/check.h
+Auto-merging block/partitions/check.c
+Auto-merging block/partitions/Makefile
+Auto-merging Documentation/networking/netconsole.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 1222d62] Merge remote-tracking branch 'bcon/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/block/blockconsole.txt | 94 ++++
+ Documentation/block/blockconsole/bcon_tail | 82 ++++
+ Documentation/block/blockconsole/mkblockconsole | 29 ++
+ Documentation/networking/netconsole.txt | 16 +-
+ block/partitions/Makefile | 1 +
+ block/partitions/blockconsole.c | 22 +
+ block/partitions/check.c | 3 +
+ block/partitions/check.h | 3 +
+ drivers/block/Kconfig | 6 +
+ drivers/block/Makefile | 1 +
+ drivers/block/blockconsole.c | 618 ++++++++++++++++++++++++
+ drivers/net/netconsole.c | 2 +-
+ include/linux/blockconsole.h | 7 +
+ include/linux/console.h | 1 +
+ include/linux/mount.h | 2 +-
+ init/do_mounts.c | 2 +-
+ kernel/printk/printk.c | 5 +-
+ 17 files changed, 885 insertions(+), 9 deletions(-)
+ create mode 100644 Documentation/block/blockconsole.txt
+ create mode 100755 Documentation/block/blockconsole/bcon_tail
+ create mode 100755 Documentation/block/blockconsole/mkblockconsole
+ create mode 100644 block/partitions/blockconsole.c
+ create mode 100644 drivers/block/blockconsole.c
+ create mode 100644 include/linux/blockconsole.h
+Merging tmem/linux-next (8f0d816 Linux 3.7-rc3)
+$ git merge tmem/linux-next
+Already up-to-date.
+Merging writeback/writeback-for-next (a885599 writeback: Do not sort b_io list only because of block device inode)
+$ git merge writeback/writeback-for-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 (bb15cb1 pinctrl: tegra114: Remove MODULE_ALIAS)
+$ git merge pinctrl/for-next
+Merge made by the 'recursive' strategy.
+ drivers/pinctrl/pinctrl-tegra114.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+Merging vhost/linux-next (d3d665a vhost-scsi: whitespace tweak)
+$ git merge vhost/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/vhost/scsi.c | 43 ++++++++++++++++++++++++++++---------------
+ drivers/vhost/vhost.c | 4 +++-
+ 2 files changed, 31 insertions(+), 16 deletions(-)
+Merging remoteproc/for-next (b977785 remoteproc: fix kconfig dependencies for VIRTIO)
+$ git merge remoteproc/for-next
+Already up-to-date.
+Merging rpmsg/for-next (397944d rpmsg: fix kconfig dependencies for VIRTIO)
+$ git merge rpmsg/for-next
+Already up-to-date.
+Merging gpio/for-next (b12cb1a gpio: pcf857x: only use set_irq_flags() on ARM)
+$ git merge gpio/for-next
+Merge made by the 'recursive' strategy.
+ drivers/gpio/gpio-pcf857x.c | 61 ++++++++++++++++++++++++---------------------
+ drivers/gpio/gpiolib-acpi.c | 9 +------
+ 2 files changed, 33 insertions(+), 37 deletions(-)
+Merging arm-soc/for-next (660e1c2 Merge tag 'omap-for-v3.12/fixes-dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes)
+$ git merge arm-soc/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/am335x-bone-common.dtsi | 262 ++++++++++++++++++++++++++++++
+ arch/arm/boot/dts/am335x-bone.dts | 256 +----------------------------
+ arch/arm/boot/dts/am335x-boneblack.dts | 17 ++
+ arch/arm/boot/dts/imx27.dtsi | 6 +-
+ arch/arm/boot/dts/imx51.dtsi | 2 +-
+ arch/arm/boot/dts/imx6q-pinfunc.h | 4 +-
+ arch/arm/boot/dts/omap3-beagle-xm.dts | 2 +-
+ arch/arm/boot/dts/omap3-igep.dtsi | 14 ++
+ arch/arm/boot/dts/omap4-panda-common.dtsi | 46 +++++-
+ arch/arm/boot/dts/omap4-sdp.dts | 39 ++++-
+ arch/arm/boot/dts/omap5.dtsi | 7 +-
+ arch/arm/configs/multi_v7_defconfig | 2 +
+ arch/arm/mach-imx/clk-fixup-mux.c | 1 +
+ arch/arm/mach-imx/clk-imx51-imx53.c | 2 +-
+ arch/arm/mach-imx/system.c | 11 ++
+ arch/arm/mach-omap2/cclock44xx_data.c | 2 +-
+ arch/arm/mach-omap2/cpuidle44xx.c | 2 +-
+ arch/arm/mach-omap2/gpmc.c | 4 +-
+ arch/arm/mach-omap2/mux34xx.c | 2 +-
+ arch/arm/mach-omap2/omap-smp.c | 2 +-
+ arch/arm/mach-omap2/omap_device.c | 2 +-
+ arch/arm/mach-sa1100/collie.c | 2 +-
+ arch/arm/mach-u300/Kconfig | 10 +-
+ arch/arm/mach-ux500/cache-l2x0.c | 1 +
+ drivers/mailbox/mailbox-omap2.c | 1 -
+ 26 files changed, 418 insertions(+), 282 deletions(-)
+ create mode 100644 arch/arm/boot/dts/am335x-bone-common.dtsi
+ create mode 100644 arch/arm/boot/dts/am335x-boneblack.dts
+Merging bcm2835/for-next (7d13205 Linux 3.10-rc6)
+$ git merge bcm2835/for-next
+Already up-to-date.
+Merging cortex/for-next (3ad87ac ARM: ARMv7-M: Fix name of NVIC handler function)
+$ git merge cortex/for-next
+Merge made by the 'recursive' strategy.
+Merging ep93xx/ep93xx-for-next (6868a89 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
+$ git merge ep93xx/ep93xx-for-next
+Auto-merging arch/arm/mach-ep93xx/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/mach-ep93xx/Kconfig | 1 +
+ arch/arm/mach-ep93xx/core.c | 108 ++++++++++++++++++++++++++-
+ arch/arm/mach-ep93xx/include/mach/platform.h | 3 +-
+ 3 files changed, 110 insertions(+), 2 deletions(-)
+Merging imx-mxs/for-next (092448e Merge branches 'imx/fixes', 'imx/soc' and 'imx/dt' into for-next)
+$ git merge imx-mxs/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/clock/imx6q-clock.txt | 1 +
+ arch/arm/boot/dts/imx28-evk.dts | 2 +
+ arch/arm/boot/dts/imx28.dtsi | 10 ++
+ arch/arm/boot/dts/imx51-babbage.dts | 4 +-
+ arch/arm/boot/dts/imx51.dtsi | 23 +++++
+ arch/arm/boot/dts/imx53-qsb.dts | 3 +-
+ arch/arm/boot/dts/imx6q-sabrelite.dts | 103 +++++++++++++--------
+ arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 5 +-
+ arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 21 +++++
+ arch/arm/boot/dts/imx6qdl.dtsi | 51 ++++++++++
+ arch/arm/boot/dts/imx6sl-evk.dts | 39 ++++++++
+ arch/arm/boot/dts/imx6sl.dtsi | 84 +++++++++++++++--
+ arch/arm/boot/dts/vf610-twr.dts | 17 ++++
+ arch/arm/boot/dts/vf610.dtsi | 12 +++
+ arch/arm/mach-imx/Kconfig | 2 +-
+ arch/arm/mach-imx/clk-imx6q.c | 9 +-
+ arch/arm/mach-imx/epit.c | 2 +-
+ arch/arm/mach-imx/mach-armadillo5x0.c | 3 +-
+ arch/arm/mach-imx/mach-imx6sl.c | 21 +++++
+ arch/arm/mach-imx/mach-mx31_3ds.c | 2 +-
+ arch/arm/mach-imx/mach-pcm037.c | 3 +-
+ arch/arm/mach-imx/mx31lilly-db.c | 3 +-
+ arch/arm/mach-imx/time.c | 2 +-
+ include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 5 +
+ 24 files changed, 362 insertions(+), 65 deletions(-)
+Merging ixp4xx/next (19f949f Linux 3.8)
+$ git merge ixp4xx/next
+Already up-to-date.
+Merging msm/for-next (8fb0bf1 Merge branch 'for-3.12/msm-cleanup2' into for-next)
+$ git merge msm/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging mvebu/for-next (5d7b08b6 Merge branch 'mvebu/dove_pcie-mbus-dt' into for-next)
+$ git merge mvebu/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/armada-370-xp-mpic.txt | 3 +
+ .../devicetree/bindings/pci/mvebu-pci.txt | 10 +
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/armada-370-xp.dtsi | 3 +-
+ arch/arm/boot/dts/armada-370.dtsi | 9 +
+ arch/arm/boot/dts/armada-xp-mv78230.dtsi | 1 +
+ arch/arm/boot/dts/armada-xp-mv78260.dtsi | 1 +
+ arch/arm/boot/dts/armada-xp-mv78460.dtsi | 1 +
+ arch/arm/boot/dts/armada-xp.dtsi | 21 +
+ arch/arm/boot/dts/dove-cm-a510.dts | 2 +-
+ arch/arm/boot/dts/dove-cubox.dts | 2 +-
+ arch/arm/boot/dts/dove-d2plug.dts | 2 +-
+ arch/arm/boot/dts/dove-d3plug.dts | 103 ++
+ arch/arm/boot/dts/dove-dove-db.dts | 2 +-
+ arch/arm/boot/dts/dove.dtsi | 1009 +++++++++++---------
+ arch/arm/boot/dts/kirkwood.dtsi | 1 +
+ arch/arm/mach-dove/board-dt.c | 39 +-
+ arch/arm/mach-mvebu/coherency.c | 8 +-
+ arch/arm/mach-mvebu/pmsu.c | 1 +
+ arch/arm/mach-mvebu/system-controller.c | 1 +
+ drivers/bus/mvebu-mbus.c | 6 +-
+ drivers/irqchip/irq-armada-370-xp.c | 202 +++-
+ drivers/pci/host/Kconfig | 2 +-
+ drivers/pci/host/pci-mvebu.c | 121 ++-
+ 24 files changed, 995 insertions(+), 556 deletions(-)
+ create mode 100644 arch/arm/boot/dts/dove-d3plug.dts
+Merging renesas/next (63c9972 Merge branch 'clocksource-fixes-for-v3.12' into next)
+$ git merge renesas/next
+Resolved 'arch/arm/boot/dts/r8a73a4.dtsi' using previous resolution.
+Resolved 'arch/arm/boot/dts/r8a7790.dtsi' using previous resolution.
+Auto-merging drivers/clocksource/em_sti.c
+Auto-merging arch/arm/boot/dts/r8a7790.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7790.dtsi
+Auto-merging arch/arm/boot/dts/r8a73a4.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a73a4.dtsi
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 745369b] Merge remote-tracking branch 'renesas/next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/clocksource/em_sti.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging samsung/for-next (28ca23d Merge branch 'v3.13-next/dt-s3c64xx' into for-next)
+$ git merge samsung/for-next
+Removing arch/arm/mach-s3c64xx/clock.c
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/vic.txt | 12 +
+ arch/arm/Kconfig | 2 +-
+ arch/arm/boot/dts/Makefile | 2 +
+ arch/arm/boot/dts/s3c6400.dtsi | 41 +
+ arch/arm/boot/dts/s3c6410-mini6410.dts | 228 +++++
+ arch/arm/boot/dts/s3c6410-smdk6410.dts | 103 +++
+ arch/arm/boot/dts/s3c6410.dtsi | 57 ++
+ arch/arm/boot/dts/s3c64xx-pinctrl.dtsi | 687 ++++++++++++++++
+ arch/arm/boot/dts/s3c64xx.dtsi | 199 +++++
+ arch/arm/mach-s3c64xx/Kconfig | 16 +
+ arch/arm/mach-s3c64xx/Makefile | 3 +-
+ arch/arm/mach-s3c64xx/clock.c | 1007 -----------------------
+ arch/arm/mach-s3c64xx/common.c | 33 +-
+ arch/arm/mach-s3c64xx/common.h | 12 +-
+ arch/arm/mach-s3c64xx/dma.c | 13 +-
+ arch/arm/mach-s3c64xx/include/mach/regs-clock.h | 132 +--
+ arch/arm/mach-s3c64xx/irq-pm.c | 9 +
+ arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-hmt.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-ncp.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c | 85 ++
+ arch/arm/mach-s3c64xx/mach-smartq.c | 11 +-
+ arch/arm/mach-s3c64xx/mach-smdk6400.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +-
+ arch/arm/mach-s3c64xx/pm.c | 21 -
+ arch/arm/mach-s3c64xx/s3c6400.c | 15 +-
+ arch/arm/mach-s3c64xx/s3c6410.c | 16 +-
+ arch/arm/plat-samsung/include/plat/cpu.h | 4 +
+ arch/arm/plat-samsung/include/plat/uncompress.h | 2 +
+ arch/arm/plat-samsung/init.c | 12 +-
+ drivers/clk/samsung/Makefile | 2 -
+ drivers/gpio/gpio-samsung.c | 34 +-
+ drivers/irqchip/irq-vic.c | 7 +-
+ drivers/usb/host/ohci-s3c2410.c | 8 +-
+ 36 files changed, 1552 insertions(+), 1235 deletions(-)
+ create mode 100644 arch/arm/boot/dts/s3c6400.dtsi
+ create mode 100644 arch/arm/boot/dts/s3c6410-mini6410.dts
+ create mode 100644 arch/arm/boot/dts/s3c6410-smdk6410.dts
+ create mode 100644 arch/arm/boot/dts/s3c6410.dtsi
+ create mode 100644 arch/arm/boot/dts/s3c64xx-pinctrl.dtsi
+ create mode 100644 arch/arm/boot/dts/s3c64xx.dtsi
+ delete mode 100644 arch/arm/mach-s3c64xx/clock.c
+ create mode 100644 arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c
+Merging tegra/for-next (7373012 Merge branch for-3.13/defconfig into for-next)
+$ git merge tegra/for-next
+Removing arch/arm/mach-tegra/gpio-names.h
+Removing arch/arm/mach-tegra/common.c
+Removing arch/arm/mach-tegra/board-paz00.h
+Merge made by the 'recursive' strategy.
+ arch/arm/configs/tegra_defconfig | 2 +
+ arch/arm/mach-tegra/Makefile | 1 -
+ arch/arm/mach-tegra/board-paz00.c | 5 +-
+ arch/arm/mach-tegra/board-paz00.h | 25 ----
+ arch/arm/mach-tegra/board.h | 12 --
+ arch/arm/mach-tegra/common.c | 115 -----------------
+ arch/arm/mach-tegra/fuse.c | 56 +++++++-
+ arch/arm/mach-tegra/gpio-names.h | 247 ------------------------------------
+ arch/arm/mach-tegra/iomap.h | 152 ----------------------
+ arch/arm/mach-tegra/irammap.h | 6 +
+ arch/arm/mach-tegra/pm.c | 8 +-
+ arch/arm/mach-tegra/pm.h | 3 -
+ arch/arm/mach-tegra/pmc.c | 50 +++++---
+ arch/arm/mach-tegra/pmc.h | 5 +
+ arch/arm/mach-tegra/reset.c | 2 +-
+ arch/arm/mach-tegra/sleep-tegra20.S | 5 +-
+ arch/arm/mach-tegra/sleep-tegra30.S | 5 +-
+ arch/arm/mach-tegra/tegra.c | 79 +++++++++++-
+ 18 files changed, 188 insertions(+), 590 deletions(-)
+ delete mode 100644 arch/arm/mach-tegra/board-paz00.h
+ delete mode 100644 arch/arm/mach-tegra/common.c
+ delete mode 100644 arch/arm/mach-tegra/gpio-names.h
+Merging dma-mapping/dma-mapping-next (d5d04bb Bye, bye, WfW flag)
+$ git merge dma-mapping/dma-mapping-next
+Already up-to-date.
+Merging pwm/for-next (1e185c7 pwm: pxa: Use module_platform_driver)
+$ git merge pwm/for-next
+Already up-to-date.
+Merging dma-buf/for-next (19e8697 dma-buf: Expose buffer size to userspace (v2))
+$ git merge dma-buf/for-next
+Already up-to-date.
+Merging userns/for-next (c7b96ac userns: Kill nsown_capable it makes the wrong thing easy)
+$ git merge userns/for-next
+Already up-to-date.
+Merging ktest/for-next (df5f7c6 ktest: Reset grub menu cache with different machines)
+$ git merge ktest/for-next
+Already up-to-date.
+Merging signal/for-next (20b4fb4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
+$ git merge signal/for-next
+Already up-to-date.
+Merging clk/clk-next (12d29886 clk: only call get_parent if there is one)
+$ git merge clk/clk-next
+Already up-to-date.
+Merging random/dev (b980955 random: fix locking dependency with the tasklist_lock)
+$ git merge random/dev
+Already up-to-date.
+Merging lzo-update/lzo-update (42b775a lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
+$ git merge lzo-update/lzo-update
+Merge made by the 'recursive' strategy.
+ lib/lzo/lzo1x_decompress_safe.c | 4 ++++
+ lib/lzo/lzodefs.h | 6 ++++++
+ 2 files changed, 10 insertions(+)
+Merging arm64-hugepages/for-next/hugepages (af07484 ARM64: mm: THP support.)
+$ git merge arm64-hugepages/for-next/hugepages
+Already up-to-date.
+Merging aio/master (d9b2c87 aio: rcu_read_lock protection for new rcu_dereference calls)
+$ git merge aio/master
+Already up-to-date.
+Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6)
+Merging akpm-current/current (ea8adca mm-page-writebackc-add-strictlimit-feature-fix)
+$ git merge --no-ff akpm-current/current
+Auto-merging virt/kvm/async_pf.c
+Auto-merging scripts/sortextable.c
+Auto-merging scripts/mod/modpost.c
+Auto-merging scripts/checkpatch.pl
+CONFLICT (content): Merge conflict in scripts/checkpatch.pl
+Auto-merging net/sunrpc/clnt.c
+Auto-merging net/mac80211/main.c
+Auto-merging net/mac80211/key.c
+Auto-merging net/mac80211/driver-ops.h
+Auto-merging mm/swap_state.c
+Auto-merging mm/swap.c
+CONFLICT (content): Merge conflict in mm/swap.c
+Auto-merging mm/sparse.c
+CONFLICT (content): Merge conflict in mm/sparse.c
+Auto-merging mm/rmap.c
+Auto-merging mm/mmap.c
+Auto-merging mm/mlock.c
+CONFLICT (content): Merge conflict in mm/mlock.c
+Auto-merging mm/mempolicy.c
+CONFLICT (content): Merge conflict in mm/mempolicy.c
+Auto-merging mm/memory.c
+Auto-merging mm/hugetlb.c
+Auto-merging mm/filemap.c
+CONFLICT (content): Merge conflict in mm/filemap.c
+Auto-merging lib/Makefile
+Auto-merging lib/Kconfig
+Auto-merging kernel/watchdog.c
+Auto-merging kernel/smp.c
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/printk/printk.c
+Auto-merging kernel/nsproxy.c
+Auto-merging kernel/fork.c
+CONFLICT (content): Merge conflict in kernel/fork.c
+Auto-merging include/linux/syscalls.h
+Auto-merging include/linux/smp.h
+CONFLICT (content): Merge conflict in include/linux/smp.h
+Auto-merging include/linux/namei.h
+Auto-merging include/linux/interrupt.h
+CONFLICT (content): Merge conflict in include/linux/interrupt.h
+Auto-merging include/linux/compat.h
+Auto-merging include/linux/buffer_head.h
+Auto-merging fs/xfs/xfs_mount.c
+Auto-merging fs/ocfs2/file.c
+Auto-merging fs/nfs/nfs4state.c
+Auto-merging fs/nfs/nfs4proc.c
+Auto-merging fs/namespace.c
+CONFLICT (content): Merge conflict in fs/namespace.c
+Auto-merging fs/namei.c
+CONFLICT (content): Merge conflict in fs/namei.c
+Auto-merging fs/inode.c
+Auto-merging fs/file_table.c
+Auto-merging fs/fat/inode.c
+Auto-merging fs/fat/file.c
+Auto-merging fs/ext4/mballoc.c
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/ext3/inode.c
+Auto-merging fs/eventpoll.c
+Auto-merging fs/dcache.c
+Auto-merging fs/block_dev.c
+Auto-merging fs/autofs4/waitq.c
+Auto-merging fs/autofs4/dev-ioctl.c
+Auto-merging fs/anon_inodes.c
+Auto-merging drivers/video/atmel_lcdfb.c
+Auto-merging drivers/usb/core/urb.c
+Auto-merging drivers/usb/core/hcd.c
+Auto-merging drivers/staging/lustre/lustre/ptlrpc/sec_gc.c
+Auto-merging drivers/staging/lustre/lustre/ptlrpc/sec_config.c
+Auto-merging drivers/staging/lustre/lustre/ptlrpc/sec.c
+Auto-merging drivers/staging/lustre/lustre/ptlrpc/gss/gss_pipefs.c
+Auto-merging drivers/staging/lustre/lustre/ptlrpc/gss/gss_cli_upcall.c
+Auto-merging drivers/staging/lustre/lustre/ptlrpc/client.c
+Auto-merging drivers/staging/lustre/lustre/osc/osc_page.c
+Auto-merging drivers/staging/lustre/lustre/osc/osc_lock.c
+Auto-merging drivers/staging/lustre/lustre/obdclass/cl_page.c
+Auto-merging drivers/staging/lustre/lustre/obdclass/cl_object.c
+Auto-merging drivers/staging/lustre/lustre/obdclass/cl_lock.c
+Auto-merging drivers/staging/lustre/lustre/llite/remote_perm.c
+Auto-merging drivers/rtc/rtc-hid-sensor-time.c
+CONFLICT (content): Merge conflict in drivers/rtc/rtc-hid-sensor-time.c
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/pci/iov.c
+Auto-merging drivers/net/wireless/iwlwifi/iwl-trans.h
+Auto-merging drivers/net/wireless/iwlwifi/iwl-op-mode.h
+Auto-merging drivers/net/wireless/cw1200/cw1200_spi.c
+Auto-merging drivers/net/wireless/b43legacy/dma.c
+Auto-merging drivers/net/wireless/b43/main.c
+Auto-merging drivers/net/wireless/b43/dma.c
+Auto-merging drivers/net/wireless/ath/wil6210/wmi.c
+Auto-merging drivers/net/irda/donauboe.c
+Auto-merging drivers/net/ethernet/sfc/falcon.c
+Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+Auto-merging drivers/mmc/core/core.c
+Auto-merging drivers/misc/ti-st/st_core.c
+Auto-merging drivers/md/raid5.c
+Auto-merging drivers/md/dm.c
+Auto-merging drivers/isdn/mISDN/core.c
+Auto-merging dResolved 'arch/s390/kernel/kprobes.c' using previous resolution.
+Resolved 'drivers/block/aoe/aoeblk.c' using previous resolution.
+Resolved 'drivers/rtc/rtc-hid-sensor-time.c' using previous resolution.
+Resolved 'fs/namei.c' using previous resolution.
+Resolved 'fs/namespace.c' using previous resolution.
+Resolved 'include/linux/interrupt.h' using previous resolution.
+Resolved 'include/linux/smp.h' using previous resolution.
+Resolved 'kernel/fork.c' using previous resolution.
+Resolved 'mm/filemap.c' using previous resolution.
+Resolved 'mm/mempolicy.c' using previous resolution.
+Resolved 'mm/mlock.c' using previous resolution.
+Resolved 'mm/sparse.c' using previous resolution.
+Resolved 'mm/swap.c' using previous resolution.
+Resolved 'scripts/checkpatch.pl' using previous resolution.
+rivers/infiniband/hw/cxgb4/cm.c
+Auto-merging drivers/infiniband/hw/cxgb3/iwch_cm.c
+Auto-merging drivers/gpu/drm/nouveau/nouveau_acpi.c
+Auto-merging drivers/gpio/gpiolib.c
+Auto-merging drivers/block/aoe/aoeblk.c
+CONFLICT (content): Merge conflict in drivers/block/aoe/aoeblk.c
+Auto-merging drivers/base/dma-buf.c
+Auto-merging block/genhd.c
+Auto-merging block/blk-core.c
+Auto-merging block/blk-cgroup.c
+Auto-merging arch/x86/lib/csum-wrappers_64.c
+Auto-merging arch/x86/kernel/e820.c
+Auto-merging arch/x86/include/asm/uaccess.h
+Auto-merging arch/x86/include/asm/e820.h
+Auto-merging arch/x86/include/asm/checksum_32.h
+Auto-merging arch/tile/mm/highmem.c
+Auto-merging arch/s390/kernel/kprobes.c
+CONFLICT (content): Merge conflict in arch/s390/kernel/kprobes.c
+Auto-merging arch/powerpc/kernel/rtas.c
+Auto-merging arch/arm/mm/hugetlbpage.c
+Auto-merging arch/arm/mach-omap2/omap_hwmod.c
+Auto-merging Makefile
+Auto-merging Documentation/block/cmdline-partition.txt
+CONFLICT (add/add): Merge conflict in Documentation/block/cmdline-partition.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'Documentation/block/cmdline-partition.txt'.
+[master 0925697] Merge branch 'akpm-current/current'
+$ git diff -M --stat --summary HEAD^..
+ Makefile | 6 +
+ arch/arm/common/mcpm_entry.c | 1 +
+ arch/arm/mach-omap2/omap_hwmod.c | 1 +
+ arch/arm/mm/highmem.c | 1 +
+ arch/arm/mm/hugetlbpage.c | 5 +
+ arch/blackfin/kernel/bfin_gpio.c | 1 +
+ arch/frv/mm/highmem.c | 1 +
+ arch/m32r/include/asm/uaccess.h | 1 +
+ arch/microblaze/include/asm/highmem.h | 1 +
+ arch/mn10300/include/asm/uaccess.h | 1 +
+ arch/parisc/include/asm/cacheflush.h | 1 +
+ arch/powerpc/include/asm/highmem.h | 1 +
+ arch/powerpc/kernel/rtas.c | 1 +
+ arch/powerpc/lib/checksum_wrappers_64.c | 1 +
+ arch/powerpc/lib/usercopy_64.c | 1 +
+ arch/sh/kernel/process_64.c | 4 +-
+ arch/tile/mm/highmem.c | 1 +
+ arch/x86/include/asm/checksum_32.h | 1 +
+ arch/x86/include/asm/e820.h | 2 +
+ arch/x86/include/asm/pgtable-2level.h | 82 ++---
+ arch/x86/include/asm/uaccess.h | 1 +
+ arch/x86/kernel/e820.c | 72 ++++-
+ arch/x86/lib/csum-wrappers_64.c | 1 +
+ arch/x86/mm/highmem_32.c | 1 +
+ arch/x86/mm/mmio-mod.c | 1 +
+ arch/x86/platform/efi/efi.c | 15 +-
+ block/blk-cgroup.c | 1 +
+ block/blk-core.c | 1 +
+ block/genhd.c | 3 +-
+ drivers/base/dma-buf.c | 1 +
+ drivers/block/rsxx/dev.c | 1 +
+ drivers/dma/ipu/ipu_irq.c | 1 +
+ drivers/gpio/gpiolib.c | 1 +
+ drivers/gpu/drm/cirrus/cirrus_mode.c | 4 +-
+ drivers/gpu/drm/drm_fb_helper.c | 8 +
+ drivers/gpu/drm/nouveau/nouveau_acpi.c | 5 +
+ drivers/ide/ide-io.c | 1 +
+ drivers/infiniband/core/cm.c | 5 +-
+ drivers/infiniband/hw/amso1100/c2_cq.c | 1 +
+ drivers/infiniband/hw/cxgb3/iwch_cm.c | 1 +
+ drivers/infiniband/hw/cxgb4/cm.c | 1 +
+ drivers/isdn/mISDN/core.c | 6 +
+ drivers/isdn/mISDN/core.h | 1 +
+ drivers/isdn/mISDN/socket.c | 9 +
+ drivers/md/dm.c | 1 +
+ drivers/md/raid5.c | 1 +
+ drivers/misc/ti-st/st_core.c | 2 +-
+ drivers/mmc/core/core.c | 1 +
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 1 +
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 1 +
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 1 +
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 1 +
+ drivers/net/ethernet/intel/e1000e/netdev.c | 1 +
+ drivers/net/ethernet/intel/igbvf/netdev.c | 1 +
+ drivers/net/ethernet/sfc/falcon.c | 1 +
+ drivers/net/ieee802154/at86rf230.c | 1 +
+ drivers/net/ieee802154/fakelb.c | 1 +
+ drivers/net/irda/donauboe.c | 15 +-
+ drivers/net/wireless/ath/carl9170/usb.c | 1 +
+ drivers/net/wireless/ath/wil6210/wmi.c | 1 +
+ drivers/net/wireless/b43/dma.c | 1 +
+ drivers/net/wireless/b43/main.c | 1 +
+ drivers/net/wireless/b43/phy_a.c | 1 +
+ drivers/net/wireless/b43/phy_g.c | 1 +
+ drivers/net/wireless/b43legacy/dma.c | 1 +
+ drivers/net/wireless/b43legacy/radio.c | 1 +
+ drivers/net/wireless/cw1200/cw1200_spi.c | 1 +
+ drivers/net/wireless/iwlwifi/dvm/sta.c | 1 +
+ drivers/net/wireless/iwlwifi/iwl-op-mode.h | 1 +
+ drivers/net/wireless/iwlwifi/iwl-trans.h | 1 +
+ drivers/net/wireless/libertas_tf/cmd.c | 1 +
+ drivers/pci/iov.c | 1 +
+ drivers/pci/pci.c | 1 +
+ drivers/pcmcia/pd6729.c | 13 +-
+ drivers/pcmcia/yenta_socket.c | 16 +-
+ drivers/platform/olpc/olpc-ec.c | 1 +
+ drivers/rtc/rtc-hid-sensor-time.c | 7 +
+ drivers/scsi/a100u2w.c | 12 +-
+ drivers/scsi/dc395x.c | 24 +-
+ drivers/scsi/dmx3191d.c | 13 +-
+ drivers/scsi/initio.c | 13 +-
+ drivers/scsi/mvumi.c | 20 +-
+ drivers/ssb/driver_pcicore.c | 1 +
+ drivers/staging/lustre/lustre/llite/remote_perm.c | 1 +
+ drivers/staging/lustre/lustre/obdclass/cl_lock.c | 1 +
+ drivers/staging/lustre/lustre/obdclass/cl_object.c | 1 +
+ drivers/staging/lustre/lustre/obdclass/cl_page.c | 1 +
+ drivers/staging/lustre/lustre/osc/osc_lock.c | 1 +
+ drivers/staging/lustre/lustre/osc/osc_page.c | 1 +
+ drivers/staging/lustre/lustre/ptlrpc/client.c | 1 +
+ .../lustre/lustre/ptlrpc/gss/gss_cli_upcall.c | 1 +
+ .../staging/lustre/lustre/ptlrpc/gss/gss_pipefs.c | 1 +
+ drivers/staging/lustre/lustre/ptlrpc/sec.c | 1 +
+ drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 1 +
+ drivers/staging/lustre/lustre/ptlrpc/sec_gc.c | 1 +
+ drivers/usb/core/hcd.c | 1 +
+ drivers/usb/core/urb.c | 1 +
+ drivers/video/atmel_lcdfb.c | 1 +
+ drivers/video/cyber2000fb.c | 3 +
+ fs/anon_inodes.c | 10 +-
+ fs/autofs4/autofs_i.h | 4 +-
+ fs/autofs4/dev-ioctl.c | 16 +-
+ fs/autofs4/inode.c | 33 +-
+ fs/autofs4/waitq.c | 16 +-
+ fs/binfmt_elf.c | 21 +-
+ fs/block_dev.c | 1 +
+ fs/buffer.c | 1 +
+ fs/dcache.c | 1 +
+ fs/eventpoll.c | 34 +-
+ fs/ext3/inode.c | 1 +
+ fs/ext4/ext4_jbd2.c | 1 +
+ fs/ext4/inode.c | 1 +
+ fs/ext4/mballoc.c | 1 +
+ fs/fat/file.c | 108 ++++++-
+ fs/fat/inode.c | 54 ++++
+ fs/file_table.c | 1 +
+ fs/inode.c | 1 +
+ fs/jbd/revoke.c | 1 +
+ fs/jbd2/revoke.c | 1 +
+ fs/locks.c | 1 +
+ fs/nfs/nfs4filelayoutdev.c | 1 +
+ fs/nfs/nfs4proc.c | 1 +
+ fs/nfs/nfs4state.c | 1 +
+ fs/nilfs2/the_nilfs.c | 1 +
+ fs/ocfs2/alloc.c | 2 +-
+ fs/ocfs2/file.c | 60 +++-
+ fs/ocfs2/namei.c | 12 +-
+ fs/xfs/xfs_mount.c | 1 +
+ include/asm-generic/gpio.h | 1 +
+ include/linux/buffer_head.h | 1 +
+ include/linux/clk.h | 1 +
+ include/linux/compat.h | 4 +-
+ include/linux/crc64_ecma.h | 56 ++++
+ include/linux/gpio.h | 1 +
+ include/linux/highmem.h | 1 +
+ include/linux/irqreturn.h | 2 +-
+ include/linux/namei.h | 1 +
+ include/linux/page-flags.h | 4 +-
+ include/linux/pagemap.h | 2 +
+ include/linux/smp.h | 6 +
+ include/linux/syscalls.h | 4 +-
+ kernel/fork.c | 1 +
+ kernel/freezer.c | 1 +
+ kernel/hrtimer.c | 2 +
+ kernel/irq/chip.c | 1 +
+ kernel/nsproxy.c | 1 +
+ kernel/printk/printk.c | 1 +
+ kernel/sched/core.c | 3 +-
+ kernel/smp.c | 1 +
+ kernel/time/sched_clock.c | 2 +-
+ kernel/watchdog.c | 70 ++++-
+ lib/Kconfig | 7 +
+ lib/Makefile | 1 +
+ lib/crc64_ecma.c | 341 +++++++++++++++++++++
+ mm/filemap.c | 2 +
+ mm/hugetlb.c | 1 +
+ mm/memory.c | 1 +
+ mm/mmap.c | 1 +
+ mm/rmap.c | 1 +
+ mm/swap_state.c | 63 +++-
+ net/caif/cfcnfg.c | 1 +
+ net/mac80211/driver-ops.h | 1 +
+ net/mac80211/key.c | 1 +
+ net/mac80211/main.c | 1 +
+ net/mac80211/sta_info.c | 1 +
+ net/phonet/pep.c | 1 +
+ net/sunrpc/clnt.c | 1 +
+ net/wimax/op-msg.c | 1 +
+ net/wimax/op-reset.c | 1 +
+ net/wimax/op-rfkill.c | 1 +
+ net/wireless/wext-proc.c | 1 +
+ scripts/mod/modpost.c | 15 +-
+ scripts/sortextable.c | 24 ++
+ scripts/sortextable.h | 26 +-
+ sound/core/info.c | 1 +
+ virt/kvm/async_pf.c | 1 +
+ 176 files changed, 1217 insertions(+), 271 deletions(-)
+ create mode 100644 include/linux/crc64_ecma.h
+ create mode 100644 lib/crc64_ecma.c
+$ git am -3 ../patches/0001-fat-fix-up-for-lockref-changes.patch
+Applying: fat: fix up for lockref changes
+$ git reset HEAD^
+Unstaged changes after reset:
+M fs/fat/file.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 8308f56] Merge branch 'akpm-current/current'
+$ git clone -s -l -n -q . ../rebase-tmp
+$ cd ../rebase-tmp
+$ git checkout -b akpm remotes/origin/akpm/master
+Switched to a new branch 'akpm'
+$ git rebase --onto master remotes/origin/akpm/master-base
+First, rewinding head to replay your work on top of it...
+Applying: mm: drop actor argument of do_generic_file_read()
+Applying: mm-drop-actor-argument-of-do_generic_file_read-fix
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + 72d7e5a...01e6151 akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (01e6151 mm-drop-actor-argument-of-do_generic_file_read-fix)
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ mm/filemap.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
projects / karo-tx-linux.git / commitdiff