diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 2383 |
1 files changed, 2383 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..c97317d13171 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2383 @@ +$ date +Monday 18 August 05:24:05 AEST 2014 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 899552d6e84b Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild +Merging origin/master (7d1311b93e58 Linux 3.17-rc1) +$ git merge origin/master +Updating 899552d6e84b..7d1311b93e58 +Fast-forward + Documentation/DocBook/drm.tmpl | 2 +- + Documentation/filesystems/Locking | 6 +- + Documentation/laptops/00-INDEX | 2 + + Documentation/laptops/toshiba_haps.txt | 76 + + MAINTAINERS | 3 +- + Makefile | 4 +- + arch/sparc/include/uapi/asm/unistd.h | 3 +- + arch/sparc/kernel/pci.c | 67 +- + arch/sparc/kernel/systbls_32.S | 2 +- + arch/sparc/kernel/systbls_64.S | 4 +- + arch/x86/include/uapi/asm/msr-index.h | 3 + + arch/x86/kernel/cpu/perf_event_intel_uncore.c | 10 +- + arch/x86/kernel/iosf_mbi.c | 2 +- + drivers/acpi/battery.c | 2 +- + drivers/acpi/processor_driver.c | 1 + + drivers/acpi/scan.c | 3 +- + drivers/block/mtip32xx/mtip32xx.c | 2 +- + drivers/block/rsxx/core.c | 2 +- + drivers/block/skd_main.c | 2 +- + drivers/char/hw_random/virtio-rng.c | 1 + + drivers/cpufreq/arm_big_little.c | 5 + + drivers/cpufreq/arm_big_little_dt.c | 2 +- + drivers/cpufreq/cpufreq-cpu0.c | 2 +- + drivers/cpufreq/cpufreq_opp.c | 2 +- + drivers/cpufreq/integrator-cpufreq.c | 10 +- + drivers/cpufreq/speedstep-smi.c | 4 +- + drivers/cpuidle/governors/menu.c | 43 +- + drivers/crypto/ccp/ccp-pci.c | 2 +- + drivers/edac/Kconfig | 4 +- + drivers/edac/edac_mc_sysfs.c | 4 +- + drivers/edac/sb_edac.c | 810 +++-- + drivers/gpu/drm/ast/ast_drv.c | 2 +- + drivers/gpu/drm/bochs/bochs_drv.c | 2 +- + drivers/gpu/drm/cirrus/cirrus_drv.c | 2 +- + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 2 +- + drivers/gpu/drm/gma500/psb_drv.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +- + drivers/gpu/drm/nouveau/core/core/client.c | 4 +- + drivers/gpu/drm/nouveau/core/engine/device/nve0.c | 1 + + drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c | 6 + + drivers/gpu/drm/nouveau/core/include/core/client.h | 2 +- + drivers/gpu/drm/nouveau/core/subdev/bar/base.c | 14 +- + drivers/gpu/drm/nouveau/core/subdev/fb/ramnvc0.c | 4 +- + drivers/gpu/drm/nouveau/core/subdev/ltc/gf100.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_platform.c | 3 +- + drivers/gpu/drm/nouveau/nvif/class.h | 4 +- + drivers/gpu/drm/nouveau/nvif/notify.c | 29 +- + drivers/gpu/drm/nouveau/nvif/object.c | 4 +- + drivers/gpu/drm/qxl/qxl_drv.c | 2 +- + drivers/hid/wacom_sys.c | 2 + + drivers/idle/intel_idle.c | 77 +- + drivers/infiniband/hw/qib/qib_init.c | 2 +- + drivers/infiniband/hw/usnic/usnic_ib_main.c | 2 +- + drivers/input/input-mt.c | 38 +- + drivers/input/joystick/analog.c | 2 +- + drivers/input/joystick/xpad.c | 174 +- + drivers/input/keyboard/cap1106.c | 8 +- + drivers/input/mouse/synaptics.c | 72 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 366 +- + drivers/input/touchscreen/edt-ft5x06.c | 1 - + drivers/mmc/host/dw_mmc-pci.c | 2 +- + drivers/net/arcnet/com20020-pci.c | 2 +- + drivers/net/can/c_can/c_can_pci.c | 3 +- + drivers/net/can/pch_can.c | 2 +- + drivers/net/can/sja1000/ems_pci.c | 2 +- + drivers/net/can/sja1000/kvaser_pci.c | 2 +- + drivers/net/can/sja1000/peak_pci.c | 2 +- + drivers/net/can/sja1000/plx_pci.c | 2 +- + drivers/net/ethernet/3com/3c59x.c | 2 +- + drivers/net/ethernet/3com/typhoon.c | 2 +- + drivers/net/ethernet/8390/ne2k-pci.c | 2 +- + drivers/net/ethernet/adaptec/starfire.c | 2 +- + drivers/net/ethernet/alteon/acenic.c | 2 +- + drivers/net/ethernet/amd/pcnet32.c | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 7 +- + drivers/net/ethernet/atheros/alx/main.c | 2 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 2 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 2 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 2 +- + drivers/net/ethernet/broadcom/b44.c | 2 +- + drivers/net/ethernet/broadcom/bnx2.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- + drivers/net/ethernet/broadcom/tg3.c | 9 +- + drivers/net/ethernet/brocade/bna/bnad.c | 2 +- + drivers/net/ethernet/chelsio/cxgb/subr.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 2 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 2 +- + drivers/net/ethernet/dec/tulip/de4x5.c | 2 +- + drivers/net/ethernet/dec/tulip/dmfe.c | 2 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 4 +- + drivers/net/ethernet/dec/tulip/uli526x.c | 2 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 2 +- + drivers/net/ethernet/dec/tulip/xircom_cb.c | 2 +- + drivers/net/ethernet/dlink/dl2k.h | 2 +- + drivers/net/ethernet/dlink/sundance.c | 2 +- + drivers/net/ethernet/emulex/benet/be_main.c | 2 +- + drivers/net/ethernet/fealnx.c | 2 +- + drivers/net/ethernet/hp/hp100.c | 2 +- + drivers/net/ethernet/ibm/ehea/Makefile | 2 +- + drivers/net/ethernet/icplus/ipg.c | 2 +- + drivers/net/ethernet/intel/e100.c | 2 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +- + drivers/net/ethernet/intel/e1000e/manage.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_fcoe.c | 1 + + drivers/net/ethernet/intel/i40e/i40e_main.c | 20 +- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 6 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 2 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +- + drivers/net/ethernet/jme.c | 2 +- + drivers/net/ethernet/marvell/skge.c | 2 +- + drivers/net/ethernet/marvell/sky2.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 2 +- + drivers/net/ethernet/micrel/ksz884x.c | 2 +- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 90 +- + drivers/net/ethernet/natsemi/natsemi.c | 2 +- + drivers/net/ethernet/natsemi/ns83820.c | 2 +- + drivers/net/ethernet/neterion/s2io.c | 2 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 +- + drivers/net/ethernet/nvidia/forcedeth.c | 2 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 2 +- + drivers/net/ethernet/packetengines/hamachi.c | 2 +- + drivers/net/ethernet/packetengines/yellowfin.c | 2 +- + drivers/net/ethernet/pasemi/pasemi_mac.c | 2 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 2 +- + drivers/net/ethernet/qlogic/qla3xxx.c | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 +- + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 2 +- + drivers/net/ethernet/rdc/r6040.c | 2 +- + drivers/net/ethernet/realtek/8139too.c | 2 +- + drivers/net/ethernet/realtek/r8169.c | 2 +- + drivers/net/ethernet/sfc/efx.c | 2 +- + drivers/net/ethernet/sgi/ioc3-eth.c | 2 +- + drivers/net/ethernet/silan/sc92031.c | 2 +- + drivers/net/ethernet/sis/sis190.c | 2 +- + drivers/net/ethernet/sis/sis900.c | 3 +- + drivers/net/ethernet/smsc/epic100.c | 2 +- + drivers/net/ethernet/smsc/smsc9420.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 2 +- + drivers/net/ethernet/sun/cassini.c | 2 +- + drivers/net/ethernet/sun/niu.c | 2 +- + drivers/net/ethernet/sun/sungem.c | 2 +- + drivers/net/ethernet/sun/sunhme.c | 2 +- + drivers/net/ethernet/sun/sunvnet.c | 38 +- + drivers/net/ethernet/sun/sunvnet.h | 4 + + drivers/net/ethernet/tehuti/tehuti.c | 2 +- + drivers/net/ethernet/ti/tlan.c | 2 +- + drivers/net/ethernet/toshiba/spider_net.c | 2 +- + drivers/net/ethernet/toshiba/tc35815.c | 2 +- + drivers/net/ethernet/via/via-rhine.c | 2 +- + drivers/net/ethernet/via/via-velocity.c | 2 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 1 - + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 1 - + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 1 - + drivers/net/fddi/defxx.c | 2 +- + drivers/net/fddi/skfp/skfddi.c | 2 +- + drivers/net/hippi/rrunner.c | 2 +- + drivers/net/irda/donauboe.c | 17 +- + drivers/net/irda/via-ircc.c | 2 +- + drivers/net/irda/vlsi_ir.c | 2 +- + drivers/net/macvlan.c | 12 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 2 +- + drivers/net/wan/dscc4.c | 2 +- + drivers/net/wan/farsync.c | 2 +- + drivers/net/wan/lmc/lmc_main.c | 2 +- + drivers/net/wan/pc300too.c | 2 +- + drivers/net/wan/pci200syn.c | 2 +- + drivers/net/wan/wanxl.c | 2 +- + drivers/net/wireless/adm8211.c | 2 +- + drivers/net/wireless/airo.c | 2 +- + drivers/net/wireless/ath/ath10k/pci.c | 2 +- + drivers/net/wireless/ath/ath5k/led.c | 2 +- + drivers/net/wireless/ath/ath5k/pci.c | 2 +- + drivers/net/wireless/ath/ath9k/pci.c | 2 +- + drivers/net/wireless/ath/carl9170/carl9170.h | 1 + + drivers/net/wireless/ath/carl9170/usb.c | 31 +- + drivers/net/wireless/atmel_pci.c | 2 +- + drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c | 4 + + drivers/net/wireless/brcm80211/brcmfmac/pcie.c | 3 +- + drivers/net/wireless/hostap/hostap_pci.c | 2 +- + drivers/net/wireless/hostap/hostap_plx.c | 2 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 2 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 3 +- + drivers/net/wireless/iwlegacy/3945.c | 2 +- + drivers/net/wireless/iwlegacy/4965-mac.c | 2 +- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 3 +- + drivers/net/wireless/iwlwifi/pcie/drv.c | 2 +- + drivers/net/wireless/mwifiex/pcie.c | 2 +- + drivers/net/wireless/mwl8k.c | 2 +- + drivers/net/wireless/orinoco/orinoco_nortel.c | 2 +- + drivers/net/wireless/orinoco/orinoco_pci.c | 2 +- + drivers/net/wireless/orinoco/orinoco_plx.c | 2 +- + drivers/net/wireless/orinoco/orinoco_tmd.c | 2 +- + drivers/net/wireless/p54/p54pci.c | 2 +- + drivers/net/wireless/prism54/islpci_hotplug.c | 2 +- + drivers/net/wireless/rt2x00/rt2400pci.c | 2 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 2 +- + drivers/net/wireless/rt2x00/rt2800pci.c | 2 +- + drivers/net/wireless/rt2x00/rt61pci.c | 2 +- + drivers/net/wireless/rtl818x/rtl8180/dev.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8188ee/sw.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8723be/sw.c | 2 +- + drivers/net/xen-netback/common.h | 5 + + drivers/net/xen-netback/interface.c | 56 +- + drivers/net/xen-netback/netback.c | 26 +- + drivers/net/xen-netback/xenbus.c | 17 +- + drivers/pci/ioapic.c | 2 +- + drivers/platform/x86/Kconfig | 19 + + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/acer-wmi.c | 54 +- + drivers/platform/x86/alienware-wmi.c | 26 +- + drivers/platform/x86/asus-nb-wmi.c | 80 +- + drivers/platform/x86/asus-wmi.c | 16 +- + drivers/platform/x86/compal-laptop.c | 2 +- + drivers/platform/x86/dell-laptop.c | 6 +- + drivers/platform/x86/eeepc-laptop.c | 8 +- + drivers/platform/x86/eeepc-wmi.c | 2 +- + drivers/platform/x86/fujitsu-laptop.c | 19 +- + drivers/platform/x86/fujitsu-tablet.c | 6 +- + drivers/platform/x86/hp-wmi.c | 6 +- + drivers/platform/x86/hp_accel.c | 4 +- + drivers/platform/x86/ideapad-laptop.c | 72 +- + drivers/platform/x86/intel_ips.c | 8 +- + drivers/platform/x86/intel_scu_ipc.c | 2 +- + drivers/platform/x86/sony-laptop.c | 2 +- + drivers/platform/x86/thinkpad_acpi.c | 8 +- + drivers/platform/x86/toshiba_acpi.c | 30 +- + drivers/platform/x86/toshiba_haps.c | 265 ++ + drivers/platform/x86/wmi.c | 4 - + drivers/ptp/ptp_pch.c | 2 +- + drivers/rapidio/devices/tsi721.c | 2 +- + drivers/scsi/BusLogic.c | 2 +- + drivers/scsi/be2iscsi/be_main.c | 2 +- + drivers/scsi/csiostor/csio_init.c | 2 +- + drivers/scsi/cxgbi/cxgb3i/Kconfig | 2 +- + drivers/scsi/cxgbi/cxgb4i/Kconfig | 2 +- + drivers/scsi/isci/init.c | 2 +- + drivers/scsi/libiscsi.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +- + drivers/scsi/mvumi.c | 2 +- + drivers/scsi/pm8001/pm8001_ctl.c | 144 +- + drivers/scsi/pm8001/pm8001_hwi.c | 4 +- + drivers/scsi/pm8001/pm8001_init.c | 39 +- + drivers/scsi/qla4xxx/ql4_init.c | 6 + + drivers/scsi/qla4xxx/ql4_mbx.c | 14 +- + drivers/scsi/qla4xxx/ql4_nx.c | 2 +- + drivers/scsi/qla4xxx/ql4_os.c | 16 +- + drivers/scsi/scsi_transport_iscsi.c | 6 +- + drivers/scsi/u14-34f.c | 4 +- + drivers/scsi/ufs/ufshcd-pci.c | 2 +- + drivers/video/fbdev/hyperv_fb.c | 2 +- + drivers/video/fbdev/i740fb.c | 2 +- + drivers/xen/xen-pciback/pci_stub.c | 2 +- + fs/aio.c | 86 +- + fs/btrfs/backref.c | 14 +- + fs/btrfs/btrfs_inode.h | 6 - + fs/btrfs/ctree.c | 20 +- + fs/btrfs/ctree.h | 4 +- + fs/btrfs/disk-io.c | 32 - + fs/btrfs/extent-tree.c | 285 +- + fs/btrfs/file-item.c | 2 +- + fs/btrfs/file.c | 26 +- + fs/btrfs/inode.c | 59 +- + fs/btrfs/ordered-data.c | 123 - + fs/btrfs/ordered-data.h | 5 - + fs/btrfs/qgroup.c | 169 + + fs/btrfs/qgroup.h | 1 + + fs/btrfs/super.c | 51 +- + fs/btrfs/transaction.c | 33 +- + fs/btrfs/transaction.h | 1 - + fs/btrfs/ulist.h | 15 + + fs/locks.c | 86 +- + include/linux/edac.h | 5 + + include/linux/input/mt.h | 1 + + include/linux/rhashtable.h | 17 +- + include/linux/sched.h | 3 +- + include/net/inet_connection_sock.h | 1 + + include/net/sock.h | 1 - + include/net/tcp.h | 7 +- + include/scsi/iscsi_if.h | 1 + + kernel/module.c | 5 + + kernel/power/snapshot.c | 21 +- + kernel/sched/core.c | 7 + + kernel/sched/proc.c | 7 - + lib/rhashtable.c | 10 +- + net/atm/lec.c | 5 +- + net/atm/svc.c | 60 +- + net/ipv4/tcp.c | 14 +- + net/ipv4/tcp_input.c | 27 +- + net/ipv4/tcp_ipv4.c | 5 +- + net/ipv4/tcp_metrics.c | 6 +- + net/ipv4/tcp_output.c | 24 +- + net/ipv6/sit.c | 6 +- + net/ipv6/tcp_ipv6.c | 3 +- + net/irda/irlap_frame.c | 2 +- + net/netlink/af_netlink.c | 2 + + net/openvswitch/vport.c | 4 +- + scripts/analyze_suspend.py | 3817 +++++++++++++++----- + sound/oss/kahlua.c | 2 +- + sound/oss/uart401.c | 40 +- + sound/oss/waveartist.c | 157 +- + sound/pci/ad1889.c | 2 +- + sound/pci/ali5451/ali5451.c | 2 +- + sound/pci/als300.c | 2 +- + sound/pci/als4000.c | 2 +- + sound/pci/asihpi/asihpi.c | 2 +- + sound/pci/atiixp.c | 2 +- + sound/pci/atiixp_modem.c | 2 +- + sound/pci/au88x0/au8810.c | 2 +- + sound/pci/au88x0/au8820.c | 2 +- + sound/pci/au88x0/au8830.c | 2 +- + sound/pci/aw2/aw2-alsa.c | 2 +- + sound/pci/azt3328.c | 2 +- + sound/pci/bt87x.c | 4 +- + sound/pci/ca0106/ca0106_main.c | 2 +- + sound/pci/cmipci.c | 4 +- + sound/pci/cs4281.c | 2 +- + sound/pci/cs46xx/cs46xx.c | 2 +- + sound/pci/cs5530.c | 2 +- + sound/pci/cs5535audio/cs5535audio.c | 2 +- + sound/pci/ctxfi/xfi.c | 2 +- + sound/pci/echoaudio/darla20.c | 2 +- + sound/pci/echoaudio/darla24.c | 2 +- + sound/pci/echoaudio/echo3g.c | 2 +- + sound/pci/echoaudio/gina20.c | 2 +- + sound/pci/echoaudio/gina24.c | 2 +- + sound/pci/echoaudio/indigo.c | 2 +- + sound/pci/echoaudio/indigodj.c | 2 +- + sound/pci/echoaudio/indigodjx.c | 2 +- + sound/pci/echoaudio/indigoio.c | 2 +- + sound/pci/echoaudio/indigoiox.c | 2 +- + sound/pci/echoaudio/layla20.c | 2 +- + sound/pci/echoaudio/layla24.c | 2 +- + sound/pci/echoaudio/mia.c | 2 +- + sound/pci/echoaudio/mona.c | 2 +- + sound/pci/emu10k1/emu10k1.c | 2 +- + sound/pci/emu10k1/emu10k1x.c | 2 +- + sound/pci/ens1370.c | 2 +- + sound/pci/es1938.c | 2 +- + sound/pci/es1968.c | 2 +- + sound/pci/fm801.c | 2 +- + sound/pci/hda/hda_intel.c | 7 + + sound/pci/hda/patch_ca0132.c | 7 +- + sound/pci/hda/patch_cmedia.c | 47 + + sound/pci/hda/patch_conexant.c | 6 + + sound/pci/hda/patch_realtek.c | 35 +- + sound/pci/ice1712/ice1712.c | 2 +- + sound/pci/ice1712/ice1724.c | 2 +- + sound/pci/intel8x0.c | 2 +- + sound/pci/intel8x0m.c | 2 +- + sound/pci/korg1212/korg1212.c | 2 +- + sound/pci/lola/lola.c | 2 +- + sound/pci/lx6464es/lx6464es.c | 2 +- + sound/pci/maestro3.c | 2 +- + sound/pci/mixart/mixart.c | 2 +- + sound/pci/nm256/nm256.c | 2 +- + sound/pci/oxygen/oxygen.c | 2 +- + sound/pci/oxygen/virtuoso.c | 2 +- + sound/pci/pcxhr/pcxhr.c | 2 +- + sound/pci/riptide/riptide.c | 4 +- + sound/pci/rme32.c | 2 +- + sound/pci/rme96.c | 2 +- + sound/pci/rme9652/hdsp.c | 2 +- + sound/pci/rme9652/hdspm.c | 2 +- + sound/pci/rme9652/rme9652.c | 2 +- + sound/pci/sis7019.c | 2 +- + sound/pci/sonicvibes.c | 2 +- + sound/pci/trident/trident.c | 2 +- + sound/pci/via82xx.c | 2 +- + sound/pci/via82xx_modem.c | 2 +- + sound/pci/vx222/vx222.c | 2 +- + sound/pci/ymfpci/ymfpci.c | 2 +- + sound/usb/quirks-table.h | 29 + + tools/power/x86/turbostat/turbostat.c | 80 +- + 384 files changed, 6499 insertions(+), 2584 deletions(-) + create mode 100644 Documentation/laptops/toshiba_haps.txt + create mode 100644 drivers/platform/x86/toshiba_haps.c +Merging fixes/master (23cf8d3ca0fd powerpc: Fix "attempt to move .org backwards" error) +$ git merge fixes/master +Merge made by the 'recursive' strategy. +Merging kbuild-current/rc-fixes (dd5a6752ae7d firmware: Create directories for external firmware) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (89ca3b881987 Linux 3.15-rc4) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (e57e41931134 ARM: wire up memfd_create syscall) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (9117710a5997 m68k/sun3: Remove define statement no longer needed) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging mips-fixes/mips-fixes (08a9c3c9afcf MIPS: OCTEON: make get_system_type() thread-safe) +$ git merge mips-fixes/mips-fixes +Auto-merging arch/mips/kernel/scall64-o32.S +Merge made by the 'recursive' strategy. + arch/mips/cavium-octeon/setup.c | 18 ++++++--- + arch/mips/include/asm/eva.h | 43 ++++++++++++++++++++++ + .../include/asm/mach-malta/kernel-entry-init.h | 22 ++++++++--- + arch/mips/include/asm/syscall.h | 8 ++-- + arch/mips/kernel/cps-vec.S | 4 ++ + arch/mips/kernel/scall64-o32.S | 12 ++++-- + 6 files changed, 89 insertions(+), 18 deletions(-) + create mode 100644 arch/mips/include/asm/eva.h +Merging powerpc-merge/merge (396a34340cdf powerpc: Fix endianness of flash_block_list in rtas_flash) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc/master (c9d26423e56c Merge tag 'pm+acpi-3.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge sparc/master +Already up-to-date. +Merging net/master (21009686662f net: phy: smsc: move smsc_phy_config_init reset part in a soft_reset function) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 44 ++++++++++++++++------ + drivers/net/phy/bcm7xxx.c | 42 ++++++++++----------- + drivers/net/phy/smsc.c | 33 ++++++++++------ + include/linux/brcmphy.h | 1 - + net/batman-adv/fragmentation.c | 2 +- + 6 files changed, 76 insertions(+), 48 deletions(-) +Merging ipsec/master (a0e5ef53aac8 xfrm: Fix installation of AH IPsec SAs) +$ git merge ipsec/master +Already up-to-date. +Merging sound-current/for-linus (f3ee07d8b6e0 ALSA: hda/realtek - Avoid setting wrong COEF on ALC269 & co) +$ git merge sound-current/for-linus +Auto-merging sound/soc/codecs/arizona.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 +++ + sound/pci/hda/patch_realtek.c | 17 ++++++++++----- + sound/soc/codecs/arizona.c | 6 ++++-- + sound/soc/codecs/pcm512x.c | 4 ++-- + sound/soc/davinci/davinci-mcasp.c | 14 ++++++++++--- + sound/soc/fsl/Kconfig | 1 - + sound/soc/fsl/fsl_esai.c | 2 -- + sound/soc/intel/sst-acpi.c | 4 ++-- + sound/soc/intel/sst-baytrail-ipc.c | 10 +-------- + sound/soc/intel/sst-baytrail-ipc.h | 1 - + sound/soc/intel/sst-baytrail-pcm.c | 43 +++++++++++++------------------------- + sound/soc/pxa/pxa-ssp.c | 4 +--- + sound/soc/soc-dapm.c | 12 ++++++----- + 13 files changed, 58 insertions(+), 63 deletions(-) +Merging pci-current/for-linus (9baa3c34ac4e PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use) +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless/master (77b2f2865956 iwlwifi: mvm: disable scheduled scan to prevent firmware crash) +$ git merge wireless/master +Already up-to-date. +Merging driver-core.current/driver-core-linus (7d1311b93e58 Linux 3.17-rc1) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (7d1311b93e58 Linux 3.17-rc1) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (7d1311b93e58 Linux 3.17-rc1) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (a8a85b01d185 usb: musb/cppi41: call musb_ep_select() before accessing an endpoint's CSR) +$ git merge usb-gadget-fixes/fixes +Resolved 'drivers/usb/musb/musb_host.c' using previous resolution. +Auto-merging drivers/usb/musb/musb_host.c +CONFLICT (content): Merge conflict in drivers/usb/musb/musb_host.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5a86a1a5521c] Merge remote-tracking branch 'usb-gadget-fixes/fixes' +$ git diff -M --stat --summary HEAD^.. +Merging usb-serial-fixes/usb-linus (7d1311b93e58 Linux 3.17-rc1) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging staging.current/staging-linus (eb29835fb3ae staging: android: fix a possible memory leak) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/staging/android/logger.c | 5 +- + drivers/staging/et131x/et131x.c | 68 +++++++++------------- + drivers/staging/lustre/lustre/libcfs/workitem.c | 1 + + drivers/staging/lustre/lustre/obdclass/class_obd.c | 2 +- + 4 files changed, 33 insertions(+), 43 deletions(-) +Merging char-misc.current/char-misc-linus (7d1311b93e58 Linux 3.17-rc1) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (91167e191467 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) +$ git merge md-current/for-linus +Already up-to-date. +Merging crypto-current/master (ce5481d01f67 crypto: drbg - fix failure of generating multiple of 2**16 bytes) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (a53dae49b2fe ide: use module_platform_driver()) +$ git merge ide/master +Already up-to-date. +Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) +$ git merge dwmw2/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (5a12a597a862 arm: Add devicetree fixup machine function) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (79465d2fd48e module: remove warning about waiting module removal.) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (103ae732ad26 drm/i915: Don't try to enable cursor from setplane when crtc is disabled) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/intel_crt.c | 7 ++++++- + drivers/gpu/drm/i915/intel_display.c | 37 ++++++++++++++---------------------- + drivers/gpu/drm/i915/intel_drv.h | 3 +-- + drivers/gpu/drm/i915/intel_tv.c | 7 ++++++- + 4 files changed, 27 insertions(+), 27 deletions(-) +Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (2a5e95d4181c mm, arc: remove obsolete pagefault oom killer comment) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (e57e41931134 ARM: wire up memfd_create syscall) +$ git merge arm/for-next +Already up-to-date. +Merging arm-perf/for-next/perf (4c834452aad0 Linux 3.16-rc3) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (74f9f3185b80 Merge branch 'fixes' into for-next) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 268 +++++++++++++++++++++++++++++++++ + 1 file changed, 268 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6) +$ git merge bcm2835/for-next +Already up-to-date. +Merging berlin/berlin/for-next (251f72d06c59 Merge branch 'berlin/soc' into berlin/for-next) +$ git merge berlin/berlin/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support) +$ git merge cortex-m/for-next +Already up-to-date. +Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next) +$ git merge ep93xx/ep93xx-for-next +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (c917f0911378 Merge branch 'imx/dt' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm/mach-imx/suspend-imx6.S +Removing arch/arm/mach-imx/mach-cpuimx27.c +Removing arch/arm/mach-imx/eukrea_mbimx27-baseboard.c +Auto-merging arch/arm/mach-imx/Kconfig +Auto-merging arch/arm/boot/dts/vf610-colibri.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 2 +- + arch/arm/boot/dts/imx1-pinfunc.h | 302 ++++++++++++++++++ + arch/arm/boot/dts/imx1.dtsi | 266 ++++++++++++++++ + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 33 ++ + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 19 ++ + arch/arm/boot/dts/imx6sl.dtsi | 10 +- + arch/arm/boot/dts/vf610-colibri-eval-v3.dts | 46 +++ + .../dts/{vf610-colibri.dts => vf610-colibri.dtsi} | 14 +- + arch/arm/boot/dts/vf610-twr.dts | 17 +- + arch/arm/configs/imx_v4_v5_defconfig | 3 - + arch/arm/mach-imx/Kconfig | 60 +--- + arch/arm/mach-imx/Makefile | 5 +- + arch/arm/mach-imx/anatop.c | 13 + + arch/arm/mach-imx/clk-vf610.c | 9 + + arch/arm/mach-imx/eukrea-baseboards.h | 10 +- + arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 351 --------------------- + arch/arm/mach-imx/imx1-dt.c | 26 ++ + arch/arm/mach-imx/iomux-imx31.c | 7 - + arch/arm/mach-imx/iomux-v1.c | 2 - + arch/arm/mach-imx/iomux-v3.c | 2 - + arch/arm/mach-imx/mach-cpuimx27.c | 321 ------------------- + arch/arm/mach-imx/mxc.h | 2 + + arch/arm/mach-imx/suspend-imx6.S | 2 + + 23 files changed, 756 insertions(+), 766 deletions(-) + create mode 100644 arch/arm/boot/dts/imx1-pinfunc.h + create mode 100644 arch/arm/boot/dts/imx1.dtsi + create mode 100644 arch/arm/boot/dts/vf610-colibri-eval-v3.dts + rename arch/arm/boot/dts/{vf610-colibri.dts => vf610-colibri.dtsi} (90%) + delete mode 100644 arch/arm/mach-imx/eukrea_mbimx27-baseboard.c + create mode 100644 arch/arm/mach-imx/imx1-dt.c + delete mode 100644 arch/arm/mach-imx/mach-cpuimx27.c +Merging ixp4xx/next (19f949f52599 Linux 3.8) +$ git merge ixp4xx/next +Already up-to-date. +Merging keystone/next (c9eaa447e77e Linux 3.15-rc1) +$ git merge keystone/next +Already up-to-date. +Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix) +$ git merge msm/for-next +Already up-to-date. +Merging mvebu/for-next (7d1311b93e58 Linux 3.17-rc1) +$ git merge mvebu/for-next +Already up-to-date. +Merging renesas/next (0e44223f9432 Merge branches 'heads/cleanup-for-v3.18', 'heads/defconfig-for-v3.18', 'heads/dt-for-v3.18', 'heads/maintainers-for-v3.18' and 'heads/soc-for-v3.18' into next) +$ git merge renesas/next +Removing arch/arm/mach-shmobile/r7s72100.h +Removing arch/arm/mach-shmobile/clock-r7s72100.c +Removing arch/arm/mach-shmobile/board-genmai.c +Removing arch/arm/mach-shmobile/board-genmai-reference.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + arch/arm/boot/dts/r7s72100-genmai.dts | 4 + + arch/arm/boot/dts/r7s72100.dtsi | 10 + + arch/arm/boot/dts/r8a7779-marzen.dts | 4 + + arch/arm/boot/dts/r8a7779.dtsi | 42 +++++ + arch/arm/boot/dts/r8a7790-lager.dts | 40 ++++ + arch/arm/boot/dts/r8a7790.dtsi | 152 ++++++++++++++- + arch/arm/boot/dts/r8a7791-henninger.dts | 35 ++++ + arch/arm/boot/dts/r8a7791-koelsch.dts | 39 ++++ + arch/arm/boot/dts/r8a7791.dtsi | 133 ++++++++++++- + arch/arm/configs/ape6evm_defconfig | 9 +- + arch/arm/configs/bockw_defconfig | 2 + + arch/arm/configs/koelsch_defconfig | 17 ++ + arch/arm/configs/kzm9g_defconfig | 1 + + arch/arm/configs/lager_defconfig | 8 +- + arch/arm/configs/marzen_defconfig | 1 + + arch/arm/configs/shmobile_defconfig | 2 + + arch/arm/mach-shmobile/Kconfig | 17 -- + arch/arm/mach-shmobile/Makefile | 5 - + arch/arm/mach-shmobile/Makefile.boot | 1 - + arch/arm/mach-shmobile/board-ape6evm-reference.c | 3 +- + arch/arm/mach-shmobile/board-ape6evm.c | 3 +- + arch/arm/mach-shmobile/board-bockw-reference.c | 1 + + arch/arm/mach-shmobile/board-genmai-reference.c | 55 ------ + arch/arm/mach-shmobile/board-genmai.c | 161 ---------------- + arch/arm/mach-shmobile/board-koelsch-reference.c | 2 - + arch/arm/mach-shmobile/board-kzm9g-reference.c | 2 +- + arch/arm/mach-shmobile/board-kzm9g.c | 1 - + arch/arm/mach-shmobile/board-lager-reference.c | 2 - + arch/arm/mach-shmobile/board-marzen-reference.c | 12 +- + arch/arm/mach-shmobile/clock-r7s72100.c | 231 ----------------------- + arch/arm/mach-shmobile/dma-register.h | 4 +- + arch/arm/mach-shmobile/irqs.h | 2 +- + arch/arm/mach-shmobile/r7s72100.h | 7 - + arch/arm/mach-shmobile/r8a7779.h | 1 - + arch/arm/mach-shmobile/r8a7790.h | 1 - + arch/arm/mach-shmobile/r8a7791.h | 1 - + arch/arm/mach-shmobile/setup-r7s72100.c | 24 +-- + arch/arm/mach-shmobile/setup-r8a73a4.c | 1 + + arch/arm/mach-shmobile/setup-r8a7778.c | 3 +- + arch/arm/mach-shmobile/setup-r8a7779.c | 20 +- + arch/arm/mach-shmobile/setup-r8a7790.c | 7 +- + arch/arm/mach-shmobile/setup-r8a7791.c | 7 +- + arch/arm/mach-shmobile/setup-sh7372.c | 1 - + arch/arm/mach-shmobile/setup-sh73a0.c | 2 +- + 45 files changed, 511 insertions(+), 566 deletions(-) + delete mode 100644 arch/arm/mach-shmobile/board-genmai-reference.c + delete mode 100644 arch/arm/mach-shmobile/board-genmai.c + delete mode 100644 arch/arm/mach-shmobile/clock-r7s72100.c + delete mode 100644 arch/arm/mach-shmobile/r7s72100.h +Merging samsung/for-next (d5e49aabb545 Merge branch 'v3.17-next/dt-samsung-2' into for-next) +$ git merge samsung/for-next +Auto-merging arch/arm/mach-s5pv210/regs-clock.h +Removing arch/arm/mach-exynos/include/mach/memory.h +Merge made by the 'recursive' strategy. + arch/arm/mach-exynos/include/mach/memory.h | 26 ---------------------- + arch/arm/mach-s5pv210/pm.c | 3 +-- + .../mach-s5pv210/{include/mach => }/regs-clock.h | 3 +-- + arch/arm/mach-s5pv210/s5pv210.c | 2 +- + 4 files changed, 3 insertions(+), 31 deletions(-) + delete mode 100644 arch/arm/mach-exynos/include/mach/memory.h + rename arch/arm/mach-s5pv210/{include/mach => }/regs-clock.h (99%) +Merging sunxi/sunxi/for-next (44b61dc11c6d Merge branch 'sunxi/dt-for-3.17' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (9a3c4145af32 Linux 3.16-rc6) +$ git merge tegra/for-next +Already up-to-date. +Merging arm64/for-next/core (ea1719672f59 arm64: add newline to I-cache policy string) +$ git merge arm64/for-next/core +Already up-to-date. +Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP) +$ git merge blackfin/for-linus +Merge made by the 'recursive' strategy. + arch/blackfin/configs/BF518F-EZBRD_defconfig | 1 - + arch/blackfin/configs/BF527-TLL6527M_defconfig | 1 - + arch/blackfin/configs/BF533-EZKIT_defconfig | 1 - + arch/blackfin/configs/BF533-STAMP_defconfig | 1 - + arch/blackfin/configs/BF537-STAMP_defconfig | 3 ++- + arch/blackfin/configs/BF538-EZKIT_defconfig | 1 - + arch/blackfin/configs/BF561-ACVILON_defconfig | 1 - + arch/blackfin/configs/BF561-EZKIT-SMP_defconfig | 1 - + arch/blackfin/configs/BF561-EZKIT_defconfig | 1 - + arch/blackfin/configs/CM-BF527_defconfig | 1 - + arch/blackfin/configs/CM-BF533_defconfig | 1 - + arch/blackfin/configs/CM-BF537E_defconfig | 1 - + arch/blackfin/configs/CM-BF537U_defconfig | 1 - + arch/blackfin/configs/CM-BF548_defconfig | 1 - + arch/blackfin/configs/CM-BF561_defconfig | 1 - + arch/blackfin/configs/DNP5370_defconfig | 1 - + arch/blackfin/configs/IP0X_defconfig | 1 - + arch/blackfin/configs/PNAV-10_defconfig | 1 - + arch/blackfin/configs/SRV1_defconfig | 1 - + arch/blackfin/configs/TCM-BF518_defconfig | 1 - + arch/blackfin/configs/TCM-BF537_defconfig | 1 - + arch/blackfin/kernel/kgdb.c | 12 ++++-------- + arch/blackfin/mach-bf609/boards/ezkit.c | 8 ++++---- + 23 files changed, 10 insertions(+), 33 deletions(-) +Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header) +$ git merge cris/for-next +Already up-to-date. +Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h) +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (6b15075c2c36 [IA64] sn: Do not needlessly convert between pointers and integers) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (9117710a5997 m68k/sun3: Remove define statement no longer needed) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (9a1a1aea7572 m68knommu: Remove unnecessary prototype for kobjsize()) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (5676d5bfb93b microblaze: Wire-up getrandom syscall) +$ git merge microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/include/uapi/asm/unistd.h | 2 ++ + arch/microblaze/kernel/syscall_table.S | 2 ++ + 2 files changed, 4 insertions(+) +Merging mips/mips-for-linux-next (475d5928b79b Merge branch '3.16-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done()) +$ git merge openrisc/for-upstream +Already up-to-date. +Merging parisc/for-next (6c700d71f7fa [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 (64aa90f26c06 Linux 3.16-rc7) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) +$ git merge powerpc/next +Already up-to-date. +Merging fsl/next (78eb9094ca08 powerpc/t2080rdb: Add T2080RDB board support) +$ git merge fsl/next +Already up-to-date. +Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (b8a2bbdf02b8 s390/sclp: remove unnecessary XTABS flag) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/include/uapi/asm/unistd.h | 5 ++++- + arch/s390/kernel/compat_wrapper.c | 3 +++ + arch/s390/kernel/ipl.c | 7 +++++++ + arch/s390/kernel/setup.c | 19 +++++++++++++++++++ + arch/s390/kernel/syscalls.S | 3 +++ + drivers/s390/char/con3215.c | 20 +++++++++++++++++--- + drivers/s390/char/sclp_tty.c | 2 +- + 7 files changed, 54 insertions(+), 5 deletions(-) +Merging sparc-next/master (c9d26423e56c Merge tag 'pm+acpi-3.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (ed93567c6fbc tile: Remove tile-specific _sinitdata and _einitdata) +$ git merge tile/master +Merge made by the 'recursive' strategy. + arch/tile/include/asm/sections.h | 3 --- + arch/tile/kernel/traps.c | 2 +- + arch/tile/kernel/vmlinux.lds.S | 2 -- + arch/tile/mm/init.c | 12 ++++++------ + 4 files changed, 7 insertions(+), 12 deletions(-) +Merging uml/next (989e59fa41c5 um: Include generic barrier.h) +$ git merge uml/next +Resolved 'arch/um/include/asm/Kbuild' using previous resolution. +Removing arch/x86/um/shared/sysdep/skas_ptrace.h +Removing arch/um/sys-ppc/shared/sysdep/skas_ptrace.h +Removing arch/um/sys-ia64/sysdep/skas_ptrace.h +Auto-merging arch/um/os-Linux/skas/process.c +Auto-merging arch/um/kernel/trap.c +Removing arch/um/include/shared/skas_ptrace.h +Removing arch/um/include/shared/skas/proc_mm.h +Auto-merging arch/um/include/shared/os.h +Auto-merging arch/um/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 17ce4b7954eb] Merge remote-tracking branch 'uml/next' +$ git diff -M --stat --summary HEAD^.. + arch/um/include/shared/os.h | 2 - + arch/um/include/shared/skas/proc_mm.h | 44 ------ + arch/um/include/shared/skas/skas.h | 3 - + arch/um/include/shared/skas_ptrace.h | 14 -- + arch/um/kernel/ptrace.c | 32 ---- + arch/um/kernel/reboot.c | 35 ++--- + arch/um/kernel/skas/mmu.c | 68 +++------ + arch/um/kernel/skas/process.c | 27 ---- + arch/um/kernel/trap.c | 2 +- + arch/um/kernel/um_arch.c | 10 -- + arch/um/os-Linux/process.c | 16 -- + arch/um/os-Linux/skas/mem.c | 100 ++---------- + arch/um/os-Linux/skas/process.c | 200 ++++++------------------ + arch/um/os-Linux/start_up.c | 154 ------------------- + arch/um/sys-ia64/sysdep/skas_ptrace.h | 22 --- + arch/um/sys-ppc/shared/sysdep/skas_ptrace.h | 22 --- + arch/x86/um/ldt.c | 227 ++++++---------------------- + arch/x86/um/shared/sysdep/faultinfo_32.h | 3 - + arch/x86/um/shared/sysdep/faultinfo_64.h | 3 - + arch/x86/um/shared/sysdep/skas_ptrace.h | 22 --- + 20 files changed, 148 insertions(+), 858 deletions(-) + delete mode 100644 arch/um/include/shared/skas/proc_mm.h + delete mode 100644 arch/um/include/shared/skas_ptrace.h + delete mode 100644 arch/um/sys-ia64/sysdep/skas_ptrace.h + delete mode 100644 arch/um/sys-ppc/shared/sysdep/skas_ptrace.h + delete mode 100644 arch/x86/um/shared/sysdep/skas_ptrace.h +Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (4ed2ad38b3b4 Merge tag 'xtensa-for-next-20140715' of git://github.com/jcmvbkbc/linux-xtensa into for_next) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (8d875f95da43 btrfs: disable strict file flushes for renames and truncates) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/master (5f740d7e1531 libceph: set last_piece in ceph_msg_data_pages_cursor_init() correctly) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (18f39e7be012 [CIFS] Possible null ptr deref in SMB2_tcon) +$ git merge cifs/for-next +Auto-merging fs/cifs/cifsfs.c +Merge made by the 'recursive' strategy. + fs/cifs/cifsfs.c | 5 +++-- + fs/cifs/cifsglob.h | 1 + + fs/cifs/cifspdu.h | 23 ++++++++++++++++++++ + fs/cifs/misc.c | 7 ------- + fs/cifs/smb2misc.c | 17 ++++++++++++++- + fs/cifs/smb2ops.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fs/cifs/smb2pdu.c | 7 +++++-- + 7 files changed, 109 insertions(+), 12 deletions(-) +Merging configfs/linux-next (b930c26416c4 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 (04ec5f5c0022 ecryptfs: remove unnecessary break after goto) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/inode.c +Auto-merging fs/ecryptfs/file.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/file.c | 4 ++-- + fs/ecryptfs/inode.c | 16 +++++++--------- + fs/ecryptfs/keystore.c | 2 -- + fs/ecryptfs/messaging.c | 3 +-- + 4 files changed, 10 insertions(+), 15 deletions(-) +Merging ext3/for_next (01777836c870 reiserfs: Fix use after free in journal teardown) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (86f0afd46321 ext4: fix ext4_discard_allocated_blocks() if we can't allocate the pa struct) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (7f0d32e0c1a7 Merge tag 'microblaze-3.17-rc1' of git://git.monstr.eu/linux-2.6-microblaze) +$ git merge f2fs/dev +Already up-to-date. +Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree) +$ git merge fscache/fscache +Merge made by the 'recursive' strategy. +Merging fuse/for-next (d7afaec0b564 fuse: add FUSE_NO_OPEN_SUPPORT flag to INIT) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master (9a464443aec5 GFS2: Change maxlen variables to size_t) +$ git merge gfs2/master +Auto-merging fs/gfs2/super.c +Merge made by the 'recursive' strategy. + fs/gfs2/bmap.c | 9 +++++---- + fs/gfs2/super.c | 20 ++++++++++---------- + 2 files changed, 15 insertions(+), 14 deletions(-) +Merging jfs/jfs-next (bb5e50aaa805 fs/jfs/super.c: convert simple_str to kstr) +$ git merge jfs/jfs-next +Already up-to-date. +Merging logfs/master (339466142b3f 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 (71a6ec8ac587 nfs: reject changes to resvport and sharecache during remount) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (c8d6637d0497 Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux) +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging omfs/for-next (976d167615b6 Linux 3.1-rc9) +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (25601a3c9737 UBIFS: Add log overlap assertions) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (645f98572134 Merge branch 'xfs-misc-fixes-3.17-2' into for-next) +$ git merge xfs/for-next +Already up-to-date. +Merging file-locks/linux-next (2ece173e4715 locks: update Locking documentation to clarify fl_release_private behavior) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (ef115d4d3296 fs: Fix theoretical division by 0 in super_cache_scan().) +$ git merge vfs/for-next +Auto-merging fs/nfs/dir.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/vfs.txt | 2 +- + arch/x86/ia32/ia32_aout.c | 21 ++--- + fs/afs/dir.c | 5 -- + fs/binfmt_aout.c | 25 ++---- + fs/binfmt_elf.c | 25 ++---- + fs/binfmt_elf_fdpic.c | 24 ++---- + fs/btrfs/ioctl.c | 5 +- + fs/ceph/dir.c | 1 - + fs/cifs/readdir.c | 6 +- + fs/dcache.c | 174 ++++++++++++++------------------------ + fs/exec.c | 17 ++-- + fs/fuse/dir.c | 7 +- + fs/gfs2/dentry.c | 3 - + fs/jffs2/jffs2_fs_sb.h | 2 - + fs/jffs2/wbuf.c | 17 +--- + fs/kernfs/dir.c | 11 --- + fs/mount.h | 25 +++++- + fs/namei.c | 22 +++-- + fs/namespace.c | 157 +++++++++++++++++++++++++++++----- + fs/nfs/dir.c | 7 +- + fs/proc/base.c | 10 +-- + fs/proc/fd.c | 2 - + fs/super.c | 2 + + include/linux/dcache.h | 3 +- + include/linux/fs.h | 2 +- + 25 files changed, 283 insertions(+), 292 deletions(-) +Merging pci/next (981c191778a4 Merge branches 'pci/host-designware', 'pci/host-mvebu' and 'pci/host-tegra' into next) +$ git merge pci/next +Auto-merging drivers/pci/host/pci-tegra.c +Auto-merging drivers/pci/host/Makefile +Auto-merging drivers/pci/host/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pci/designware-pcie.txt | 4 + + Documentation/devicetree/bindings/pci/ti-pci.txt | 59 +++ + MAINTAINERS | 8 + + drivers/pci/host/Kconfig | 11 +- + drivers/pci/host/Makefile | 1 + + drivers/pci/host/pci-dra7xx.c | 458 +++++++++++++++++++++ + drivers/pci/host/pci-tegra.c | 118 ++++++ + drivers/pci/host/pcie-designware.c | 134 ++++-- + drivers/pci/host/pcie-designware.h | 11 + + 9 files changed, 771 insertions(+), 33 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/ti-pci.txt + create mode 100644 drivers/pci/host/pci-dra7xx.c +Merging hid/for-next (71095593b5d8 Merge branch 'for-3.17/hyperv' into for-next) +$ git merge hid/for-next +Resolved 'drivers/hid/hid-gt683r.c' using previous resolution. +Auto-merging drivers/hid/hid-gt683r.c +CONFLICT (add/add): Merge conflict in drivers/hid/hid-gt683r.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c0698b7d9847] Merge remote-tracking branch 'hid/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-hid-driver-gt683r | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + create mode 100644 Documentation/ABI/testing/sysfs-class-hid-driver-gt683r +Merging i2c/i2c/for-next (88a469fec24c Merge branch 'i2c/for-3.17' into i2c/for-next) +$ git merge i2c/i2c/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging jdelvare-hwmon/master (c7208164e66f Linux 3.15-rc7) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (899552d6e84b Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging v4l-dvb/master (d1352f268415 Merge two fixes from branch 'patchwork' into to_next) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. + drivers/media/dvb-frontends/si2168.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging kbuild/for-next (0eaeb361a894 Merge branches 'kbuild/kbuild' and 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging lib/Kconfig.debug +Auto-merging init/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/lto-build | 173 +++++++++++++++++++++++++++++++++++++++++++++++ + Makefile | 19 +++++- + arch/x86/Kconfig | 2 +- + init/Kconfig | 73 ++++++++++++++++++++ + kernel/gcov/Kconfig | 2 +- + lib/Kconfig.debug | 2 +- + scripts/Makefile.lto | 84 +++++++++++++++++++++++ + scripts/Makefile.modpost | 7 +- + scripts/link-vmlinux.sh | 2 +- + 9 files changed, 356 insertions(+), 8 deletions(-) + create mode 100644 Documentation/lto-build + create mode 100644 scripts/Makefile.lto +Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (68a82c67e9ff Merge branch 'for-3.17-fixes' into for-next) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + drivers/ata/ahci_platform.c | 18 +----------------- + drivers/ata/ahci_tegra.c | 2 +- + drivers/ata/ahci_xgene.c | 4 ++-- + drivers/ata/libahci_platform.c | 23 ----------------------- + drivers/ata/pata_samsung_cf.c | 2 +- + include/linux/ahci_platform.h | 13 ------------- + 6 files changed, 5 insertions(+), 57 deletions(-) +Merging pm/linux-next (af5b7e84d022 Merge branch 'pm-tools') +$ git merge pm/linux-next +Already up-to-date. +Merging idle/next (e7c95ff32d00 tools/power turbostat: tweak whitespace in output format) +$ git merge idle/next +Already up-to-date. +Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) +$ git merge apm/for-next +Already up-to-date. +Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles) +$ git merge cpupowerutils/master +Already up-to-date. +Merging thermal/next (47d104ba5879 Merge branches 'exynos-fix', 'for-rc', 'int3403-fix', 'misc', 'rcar-thermal' and 'sti-thermal' of .git into next) +$ git merge thermal/next +Already up-to-date. +Merging ieee1394/for-next (d584a6627994 firewire: ohci: disable MSI for VIA VT6315 again) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (883854c5457a dlm: keep listening connection alive with sctp mode) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (a0bbe990c161 dmaengine: sun6i: depends on RESET_CONTROLLER) +$ git merge slave-dma/next +Already up-to-date. +Merging dmaengine/next (fbeec99ad5c0 dma: mv_xor: Rename __mv_xor_slot_cleanup() to mv_xor_slot_cleanup()) +$ git merge dmaengine/next +Auto-merging drivers/dma/mv_xor.c +Merge made by the 'recursive' strategy. + drivers/dma/ioat/dca.c | 13 ++++---- + drivers/dma/ioat/dma.c | 2 +- + drivers/dma/ioat/dma_v3.c | 6 ++-- + drivers/dma/mv_xor.c | 80 +++++++++++++++++++++++++++++++++++++---------- + 4 files changed, 74 insertions(+), 27 deletions(-) +Merging net-next/master (c9d26423e56c Merge tag 'pm+acpi-3.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge net-next/master +Already up-to-date. +Merging ipsec-next/master (1759389e8af4 xfrm4: Remove duplicate semicolon) +$ git merge ipsec-next/master +Already up-to-date. +Merging wireless-next/master (33caee39925b Merge branch 'akpm' (patchbomb from Andrew Morton)) +$ git merge wireless-next/master +Already up-to-date. +Merging bluetooth/master (13cac15296af Bluetooth: Fix ERTM L2CAP resend packet) +$ git merge bluetooth/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 +- + drivers/bluetooth/ath3k.c | 2 + + drivers/bluetooth/bluecard_cs.c | 35 +- + drivers/bluetooth/bt3c_cs.c | 27 +- + drivers/bluetooth/btuart_cs.c | 27 +- + drivers/bluetooth/btusb.c | 1 + + drivers/bluetooth/dtl1_cs.c | 36 +- + drivers/bluetooth/hci_h5.c | 2 +- + include/net/bluetooth/hci_core.h | 8 +- + include/net/bluetooth/l2cap.h | 33 +- + net/bluetooth/6lowpan.c | 10 +- + net/bluetooth/hci_core.c | 71 +++- + net/bluetooth/hci_event.c | 11 +- + net/bluetooth/l2cap_core.c | 309 ++++++++--------- + net/bluetooth/l2cap_sock.c | 15 +- + net/bluetooth/mgmt.c | 124 +++---- + net/bluetooth/smp.c | 726 ++++++++++++++++++++++++++------------- + net/bluetooth/smp.h | 10 +- + net/ieee802154/6lowpan_rtnl.c | 8 - + net/mac802154/rx.c | 5 +- + net/mac802154/tx.c | 15 +- + net/mac802154/wpan.c | 10 +- + 22 files changed, 877 insertions(+), 617 deletions(-) +Merging infiniband/for-next (d087f6ad724d Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'iwcm', 'mad', 'misc', 'mlx4', 'mlx5', 'ocrdma' and 'srp' into for-next) +$ git merge infiniband/for-next +Already up-to-date. +Merging mtd/master (5d20bad19d25 mtd: cfi_cmdset_0002: check return code for get_chip()) +$ git merge mtd/master +Merge made by the 'recursive' strategy. + drivers/mtd/chips/cfi_cmdset_0002.c | 4 ++++ + 1 file changed, 4 insertions(+) +Merging l2-mtd/master (5d20bad19d25 mtd: cfi_cmdset_0002: check return code for get_chip()) +$ git merge l2-mtd/master +Already up-to-date. +Merging crypto/master (ce5481d01f67 crypto: drbg - fix failure of generating multiple of 2**16 bytes) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (7963e9db1b1f Revert "drm: drop redundant drm_file->is_master") +$ git merge drm/drm-next +Already up-to-date. +Merging drm-panel/drm/panel/for-next (9746c61960b6 drm/panel: simple: Use devm_gpiod_get_optional()) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (be71eabebaf9 Revert "drm/i915: Enable semaphores on BDW") +$ git merge drm-intel/for-linux-next +Already up-to-date. +Merging drm-tegra/drm/tegra/for-next (ef70728c7a65 drm/tegra: add MODULE_DEVICE_TABLEs) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging sound/for-next (f3ee07d8b6e0 ALSA: hda/realtek - Avoid setting wrong COEF on ALC269 & co) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (fa5b4e6993a6 Merge remote-tracking branches 'asoc/topic/tas2552' and 'asoc/topic/wm8994' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/adi,axi-spdif-tx.txt | 2 +- + .../devicetree/bindings/sound/cs35l32.txt | 62 ++ + Documentation/devicetree/bindings/sound/es8328.txt | 38 ++ + .../devicetree/bindings/sound/fsl-asoc-card.txt | 82 +++ + .../devicetree/bindings/sound/fsl-sai.txt | 15 + + .../devicetree/bindings/sound/imx-audio-es8328.txt | 60 ++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + include/dt-bindings/sound/cs35l32.h | 26 + + include/sound/soc.h | 6 +- + sound/soc/codecs/Kconfig | 19 + + sound/soc/codecs/Makefile | 8 + + sound/soc/codecs/ab8500-codec.c | 11 +- + sound/soc/codecs/cs35l32.c | 648 ++++++++++++++++++ + sound/soc/codecs/cs35l32.h | 93 +++ + sound/soc/codecs/es8328-i2c.c | 60 ++ + sound/soc/codecs/es8328-spi.c | 49 ++ + sound/soc/codecs/es8328.c | 756 +++++++++++++++++++++ + sound/soc/codecs/es8328.h | 314 +++++++++ + sound/soc/codecs/tas2552.c | 68 +- + sound/soc/codecs/wm8994.c | 18 +- + sound/soc/davinci/edma-pcm.c | 2 + + sound/soc/fsl/Kconfig | 30 + + sound/soc/fsl/Makefile | 4 + + sound/soc/fsl/fsl-asoc-card.c | 573 ++++++++++++++++ + sound/soc/fsl/fsl_esai.c | 14 +- + sound/soc/fsl/fsl_esai.h | 8 +- + sound/soc/fsl/fsl_sai.c | 46 +- + sound/soc/fsl/fsl_sai.h | 5 + + sound/soc/fsl/fsl_ssi.c | 33 +- + sound/soc/fsl/imx-es8328.c | 232 +++++++ + sound/soc/intel/Makefile | 3 +- + sound/soc/intel/sst-atom-controls.c | 39 ++ + sound/soc/intel/sst-atom-controls.h | 286 +++++++- + sound/soc/intel/sst-mfld-platform-pcm.c | 34 +- + sound/soc/intel/sst-mfld-platform.h | 30 +- + sound/soc/samsung/idma.c | 4 +- + sound/soc/samsung/odroidx2_max98090.c | 4 +- + sound/soc/sh/fsi.c | 7 +- + sound/soc/sh/rcar/core.c | 6 +- + sound/soc/sh/rcar/gen.c | 2 +- + sound/soc/sirf/sirf-usp.c | 24 +- + sound/soc/soc-core.c | 2 +- + 42 files changed, 3620 insertions(+), 104 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/cs35l32.txt + create mode 100644 Documentation/devicetree/bindings/sound/es8328.txt + create mode 100644 Documentation/devicetree/bindings/sound/fsl-asoc-card.txt + create mode 100644 Documentation/devicetree/bindings/sound/imx-audio-es8328.txt + create mode 100644 include/dt-bindings/sound/cs35l32.h + create mode 100644 sound/soc/codecs/cs35l32.c + create mode 100644 sound/soc/codecs/cs35l32.h + create mode 100644 sound/soc/codecs/es8328-i2c.c + create mode 100644 sound/soc/codecs/es8328-spi.c + create mode 100644 sound/soc/codecs/es8328.c + create mode 100644 sound/soc/codecs/es8328.h + create mode 100644 sound/soc/fsl/fsl-asoc-card.c + create mode 100644 sound/soc/fsl/imx-es8328.c + create mode 100644 sound/soc/intel/sst-atom-controls.c +Merging modules/modules-next (76215b04fd29 arch/powerpc/platforms/powernv/opal-dump.c: fix world-writable sysfs files) +$ git merge modules/modules-next +Already up-to-date. +Merging virtio/virtio-next (eeec626366ff Revert "hwrng: virtio - ensure reads happen after successful probe") +$ git merge virtio/virtio-next +Already up-to-date. +Merging input/next (3361a97601f2 Input: edt-ft5x06 - remove superfluous assignment) +$ git merge input/next +Already up-to-date. +Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) +$ git merge input-mt/for-next +Already up-to-date. +Merging block/for-next (b595b8ec704e blk-mq: blk_mq_freeze_queue() should allow nesting) +$ git merge block/for-next +Merge made by the 'recursive' strategy. + block/bio-integrity.c | 2 +- + block/blk-mq.c | 39 ++++++++++++++++++++++++--------------- + include/linux/blk-mq.h | 9 +++++---- + 3 files changed, 30 insertions(+), 20 deletions(-) +Merging device-mapper/for-next (465a3d61c229 dm crypt: sort writes) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-crypt.c | 368 +++++++++++++++++++++++++------------------------- + 1 file changed, 186 insertions(+), 182 deletions(-) +Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence) +$ git merge embedded/master +Already up-to-date. +Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3) +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) +$ git merge mmc/mmc-next +Already up-to-date. +Merging mmc-uh/next (c83c8737e3ed mmc: dw_mmc: modify the dt-binding for removing slot-node and supports-highspeed) +$ git merge mmc-uh/next +Already up-to-date. +Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. +Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (d66b1b395a59 md: don't allow bitmap file to be added to raid0/linear.) +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-mfd-next (7caa79917ad4 MAINTAINERS: Update MFD repo location) +$ git merge mfd/for-mfd-next +Already up-to-date. +Merging backlight/for-backlight-next (87464cdba2ae backlight: ipaq_micro: Fix sparse non static symbol warning) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/master (5e37195f30cc ipaq_micro_battery: fix sparse non static symbol warning) +$ git merge battery/master +Already up-to-date. +Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path) +$ git merge fbdev/for-next +Already up-to-date. +Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par) +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next (be92abea827b Merge branch '3.17/hdmi-infoframe' into for-next) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (7dfb37059c58 Merge remote-tracking branches 'regulator/topic/sky81452' and 'regulator/topic/tps65910' into regulator-next) +$ git merge regulator/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/regulator/sky81452-regulator.txt | 16 + + .../devicetree/bindings/regulator/tps65090.txt | 4 +- + MAINTAINERS | 1 + + drivers/regulator/Kconfig | 30 +- + drivers/regulator/Makefile | 2 + + drivers/regulator/core.c | 129 ++-- + drivers/regulator/da9211-regulator.c | 97 ++- + drivers/regulator/da9211-regulator.h | 7 +- + drivers/regulator/hi6421-regulator.c | 657 +++++++++++++++++++++ + drivers/regulator/s2mpa01.c | 144 ++--- + drivers/regulator/s2mps11.c | 269 +++------ + drivers/regulator/sky81452-regulator.c | 130 ++++ + drivers/regulator/tps65023-regulator.c | 3 - + drivers/regulator/tps65910-regulator.c | 13 +- + include/linux/mfd/samsung/core.h | 21 + + include/linux/mfd/samsung/s2mpa01.h | 12 - + include/linux/mfd/samsung/s2mps11.h | 9 - + include/linux/mfd/samsung/s2mps14.h | 10 - + include/linux/regulator/da9211.h | 7 +- + include/linux/regulator/driver.h | 8 +- + 20 files changed, 1166 insertions(+), 403 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/sky81452-regulator.txt + create mode 100644 drivers/regulator/hi6421-regulator.c + create mode 100644 drivers/regulator/sky81452-regulator.c +$ git reset --hard HEAD^ +HEAD is now at 1e78c8d216fa Merge remote-tracking branch 'kgdb/kgdb-next' +Merging next-20140815 version of regulator +$ git merge -m next-20140815/regulator 6d2a396099aa2f9db5629f037608bb95c658b5e1 +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/regulator/tps65090.txt | 4 ++-- + drivers/regulator/tps65023-regulator.c | 3 --- + 2 files changed, 2 insertions(+), 5 deletions(-) +Merging security/next (478d085524c5 Merge tag 'keys-next-20140805' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next) +$ git merge security/next +Already up-to-date. +Merging integrity/next (e27319cdf468 ima: provide double buffering for hash calculation) +$ git merge integrity/next +Resolved 'Documentation/kernel-parameters.txt' using previous resolution. +Resolved 'crypto/asymmetric_keys/x509_public_key.c' using previous resolution. +Resolved 'include/linux/key.h' using previous resolution. +Auto-merging include/linux/key.h +CONFLICT (content): Merge conflict in include/linux/key.h +Auto-merging crypto/asymmetric_keys/x509_public_key.c +CONFLICT (content): Merge conflict in crypto/asymmetric_keys/x509_public_key.c +Auto-merging Documentation/kernel-parameters.txt +CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2a490065fbc1] Merge remote-tracking branch 'integrity/next' +$ git diff -M --stat --summary HEAD^.. +Merging selinux/next (aa9e0de81b5b Merge tag 'v3.16' into next) +$ git merge selinux/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging lblnet/next (d8ec26d7f828 Linux 3.13) +$ git merge lblnet/next +Already up-to-date. +Merging watchdog/master (8083baba5e9c wdt: sunxi: Move restart code to the watchdog driver) +$ git merge watchdog/master +Merge made by the 'recursive' strategy. +Merging iommu/next (4c5e9d9f0ddf Merge branches 'x86/vt-d', 'x86/amd', 'arm/omap', 'ppc/pamu', 'arm/smmu', 'arm/exynos' and 'core' into next) +$ git merge iommu/next +Already up-to-date. +Merging dwmw2-iommu/master (1860e379875d Linux 3.15) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (9b936c960f22 drivers/vfio: Enable VFIO if EEH is not supported) +$ git merge vfio/next +Already up-to-date. +Merging osd/linux-next (ce5d36aac26c ore: Support for raid 6) +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (51a7097426f2 doc: fix two typos in watchdog-api.txt) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/master (3efe33f5d2da audit: x86: drop arch from __audit_syscall_entry() interface) +$ git merge audit/master +Resolved 'arch/mips/include/asm/syscall.h' using previous resolution. +Resolved 'arch/mips/kernel/ptrace.c' using previous resolution. +Resolved 'arch/powerpc/Kconfig' using previous resolution. +Resolved 'arch/x86/Kconfig' using previous resolution. +Resolved 'kernel/audit.c' using previous resolution. +Auto-merging kernel/auditsc.c +Auto-merging kernel/audit.c +CONFLICT (content): Merge conflict in kernel/audit.c +Auto-merging include/uapi/linux/audit.h +Auto-merging arch/x86/kernel/ptrace.c +Auto-merging arch/x86/kernel/entry_64.S +Auto-merging arch/x86/kernel/entry_32.S +Auto-merging arch/x86/Kconfig +CONFLICT (content): Merge conflict in arch/x86/Kconfig +Auto-merging arch/um/kernel/ptrace.c +Auto-merging arch/s390/kernel/ptrace.c +Auto-merging arch/powerpc/Kconfig +CONFLICT (content): Merge conflict in arch/powerpc/Kconfig +Auto-merging arch/mips/kernel/ptrace.c +CONFLICT (content): Merge conflict in arch/mips/kernel/ptrace.c +Auto-merging arch/mips/include/asm/syscall.h +CONFLICT (content): Merge conflict in arch/mips/include/asm/syscall.h +Auto-merging arch/arm/kernel/ptrace.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a5781c9a2463] Merge remote-tracking branch 'audit/master' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/include/asm/syscall.h | 11 +++++++++++ + arch/alpha/kernel/ptrace.c | 2 +- + arch/arm/kernel/ptrace.c | 4 ++-- + arch/ia64/include/asm/syscall.h | 6 ++++++ + arch/ia64/kernel/ptrace.c | 2 +- + arch/microblaze/include/asm/syscall.h | 5 +++++ + arch/microblaze/kernel/ptrace.c | 3 +-- + arch/mips/include/asm/syscall.h | 2 +- + arch/mips/kernel/ptrace.c | 4 +--- + arch/openrisc/include/asm/syscall.h | 5 +++++ + arch/openrisc/kernel/ptrace.c | 3 +-- + arch/parisc/include/asm/syscall.h | 11 +++++++++++ + arch/parisc/kernel/ptrace.c | 9 +++------ + arch/powerpc/include/asm/syscall.h | 6 ++++++ + arch/powerpc/kernel/ptrace.c | 7 ++----- + arch/s390/kernel/ptrace.c | 4 +--- + arch/sh/include/asm/syscall_32.h | 10 ++++++++++ + arch/sh/include/asm/syscall_64.h | 14 ++++++++++++++ + arch/sh/kernel/ptrace_32.c | 14 +------------- + arch/sh/kernel/ptrace_64.c | 17 +---------------- + arch/sparc/include/asm/syscall.h | 7 +++++++ + arch/sparc/include/asm/thread_info_32.h | 2 ++ + arch/sparc/include/asm/thread_info_64.h | 2 ++ + arch/sparc/kernel/ptrace_64.c | 9 ++------- + arch/um/kernel/ptrace.c | 3 +-- + arch/x86/ia32/ia32entry.S | 12 ++++++------ + arch/x86/kernel/entry_32.S | 11 +++++------ + arch/x86/kernel/entry_64.S | 11 +++++------ + arch/x86/kernel/ptrace.c | 8 ++------ + arch/x86/um/asm/ptrace.h | 4 ---- + arch/x86/um/asm/syscall.h | 15 +++++++++++++++ + arch/xtensa/kernel/ptrace.c | 2 +- + include/asm-generic/syscall.h | 2 +- + include/linux/audit.h | 11 ++++++----- + include/uapi/linux/audit.h | 14 +------------- + kernel/auditsc.c | 17 +++++++---------- + 36 files changed, 147 insertions(+), 122 deletions(-) + create mode 100644 arch/alpha/include/asm/syscall.h + create mode 100644 arch/x86/um/asm/syscall.h +Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) +$ git merge fsnotify/for-next +Already up-to-date. +Merging devicetree/devicetree/next (a9ecdc0fdc54 of/irq: Fix lookup to use 'interrupts-extended' property first) +$ git merge devicetree/devicetree/next +Merge made by the 'recursive' strategy. + .../bindings/interrupt-controller/interrupts.txt | 12 ++++--- + drivers/of/fdt.c | 2 +- + drivers/of/irq.c | 17 ++++----- + drivers/of/selftest.c | 40 +++++++++++++++++----- + 4 files changed, 48 insertions(+), 23 deletions(-) +Merging dt-rh/for-next (99de64984c3a OF: fix of_find_node_by_path() assumption that of_allnodes is root) +$ git merge dt-rh/for-next +Already up-to-date. +Merging spi/for-next (a58bfa1599ce Merge remote-tracking branches 'spi/topic/sh-msiof' and 'spi/topic/xilinx' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/sh-msiof.txt | 17 ++- + Documentation/devicetree/bindings/spi/spi-rspi.txt | 5 + + drivers/spi/Kconfig | 2 +- + drivers/spi/spi-cadence.c | 1 - + drivers/spi/spi-omap-100k.c | 4 - + drivers/spi/spi-omap2-mcspi.c | 3 +- + drivers/spi/spi-pxa2xx-pci.c | 21 ++- + drivers/spi/spi-rspi.c | 147 +++++++++++++-------- + drivers/spi/spi-sh-msiof.c | 100 ++++++++------ + drivers/spi/spi-xilinx.c | 1 - + drivers/spi/spi.c | 1 + + include/linux/spi/spi.h | 7 + + 12 files changed, 197 insertions(+), 112 deletions(-) +Merging tip/auto-latest (bcf5fb46e1ee Merge branch 'x86/xsave') +$ git merge tip/auto-latest +Resolved 'arch/x86/kernel/cpu/perf_event_intel_uncore.c' using previous resolution. +Resolved 'kernel/trace/trace.c' using previous resolution. +Auto-merging lib/Kconfig.debug +Auto-merging kernel/trace/trace.c +CONFLICT (content): Merge conflict in kernel/trace/trace.c +Auto-merging kernel/sched/core.c +Auto-merging arch/x86/kernel/cpu/perf_event_intel_uncore.c +CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/perf_event_intel_uncore.c +Auto-merging arch/sparc/kernel/smp_64.c +Auto-merging MAINTAINERS +Auto-merging Documentation/locking/spinlocks.txt +Auto-merging Documentation/locking/mutex-design.txt +Auto-merging Documentation/locking/lockstat.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2e3e25e40d79] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/00-INDEX | 2 + + Documentation/DocBook/kernel-locking.tmpl | 2 +- + Documentation/{ => locking}/lockdep-design.txt | 0 + Documentation/{ => locking}/lockstat.txt | 2 +- + Documentation/{ => locking}/mutex-design.txt | 6 +- + Documentation/{ => locking}/rt-mutex-design.txt | 0 + Documentation/{ => locking}/rt-mutex.txt | 0 + Documentation/{ => locking}/spinlocks.txt | 14 +- + Documentation/{ => locking}/ww-mutex-design.txt | 0 + Documentation/x86/tlb.txt | 2 +- + MAINTAINERS | 4 +- + arch/alpha/include/asm/atomic.h | 213 +- + arch/arc/include/asm/atomic.h | 184 +- + arch/arm/include/asm/atomic.h | 305 +- + arch/arm64/include/asm/atomic.h | 197 +- + arch/avr32/include/asm/atomic.h | 123 +- + arch/cris/include/asm/atomic.h | 57 +- + arch/hexagon/include/asm/atomic.h | 68 +- + arch/ia64/include/asm/atomic.h | 188 +- + arch/m32r/include/asm/atomic.h | 143 +- + arch/m68k/include/asm/atomic.h | 109 +- + arch/metag/include/asm/atomic_lnkget.h | 121 +- + arch/metag/include/asm/atomic_lock1.h | 76 +- + arch/mips/include/asm/atomic.h | 557 ++-- + arch/mn10300/include/asm/atomic.h | 125 +- + arch/parisc/include/asm/atomic.h | 113 +- + arch/powerpc/include/asm/atomic.h | 198 +- + arch/sh/include/asm/atomic-grb.h | 119 +- + arch/sh/include/asm/atomic-irq.h | 62 +- + arch/sh/include/asm/atomic-llsc.h | 101 +- + arch/sparc/include/asm/atomic_32.h | 17 +- + arch/sparc/include/asm/atomic_64.h | 45 +- + arch/sparc/kernel/smp_64.c | 2 +- + arch/sparc/lib/atomic32.c | 29 +- + arch/sparc/lib/atomic_64.S | 163 +- + arch/sparc/lib/ksyms.c | 25 +- + arch/x86/include/asm/atomic.h | 15 - + arch/x86/include/asm/perf_event.h | 8 + + arch/x86/kernel/cpu/Makefile | 4 +- + arch/x86/kernel/cpu/perf_event.c | 2 +- + arch/x86/kernel/cpu/perf_event.h | 48 +- + arch/x86/kernel/cpu/perf_event_intel.c | 53 +- + arch/x86/kernel/cpu/perf_event_intel_ds.c | 183 +- + arch/x86/kernel/cpu/perf_event_intel_uncore.c | 3269 +------------------- + arch/x86/kernel/cpu/perf_event_intel_uncore.h | 437 +-- + .../x86/kernel/cpu/perf_event_intel_uncore_nhmex.c | 1221 ++++++++ + arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c | 603 ++++ + .../x86/kernel/cpu/perf_event_intel_uncore_snbep.c | 1645 ++++++++++ + arch/x86/mm/tlb.c | 10 +- + arch/xtensa/include/asm/atomic.h | 233 +- + drivers/gpu/drm/drm_modeset_lock.c | 2 +- + include/asm-generic/atomic.h | 192 +- + include/asm-generic/atomic64.h | 20 +- + include/linux/atomic.h | 36 - + include/linux/bitops.h | 20 - + include/linux/jump_label.h | 17 +- + include/linux/lockdep.h | 12 +- + include/linux/mutex.h | 4 +- + include/linux/perf_event.h | 13 +- + include/linux/rwsem.h | 2 +- + include/linux/spinlock.h | 8 +- + kernel/events/core.c | 123 +- + kernel/kprobes.c | 13 +- + kernel/locking/lockdep.c | 6 + + kernel/locking/mcs_spinlock.h | 3 - + kernel/locking/mutex.c | 416 +-- + kernel/locking/mutex.h | 2 +- + kernel/locking/rtmutex.c | 2 +- + kernel/sched/core.c | 29 +- + kernel/sched/fair.c | 71 +- + lib/Kconfig.debug | 4 +- + lib/atomic64.c | 83 +- + lib/locking-selftest.c | 56 +- + tools/perf/Documentation/perf-report.txt | 2 +- + tools/perf/Documentation/perf-top.txt | 6 + + tools/perf/Makefile.perf | 2 + + tools/perf/arch/arm64/include/perf_regs.h | 2 + + tools/perf/builtin-annotate.c | 77 +- + tools/perf/builtin-buildid-cache.c | 37 +- + tools/perf/builtin-diff.c | 4 +- + tools/perf/builtin-inject.c | 33 +- + tools/perf/builtin-kmem.c | 56 +- + tools/perf/builtin-kvm.c | 40 +- + tools/perf/builtin-lock.c | 5 +- + tools/perf/builtin-mem.c | 4 +- + tools/perf/builtin-record.c | 3 +- + tools/perf/builtin-report.c | 19 +- + tools/perf/builtin-sched.c | 5 +- + tools/perf/builtin-script.c | 59 +- + tools/perf/builtin-timechart.c | 6 +- + tools/perf/builtin-top.c | 62 +- + tools/perf/builtin-trace.c | 36 +- + tools/perf/config/Makefile | 40 +- + tools/perf/config/feature-checks/Makefile | 18 +- + tools/perf/tests/builtin-test.c | 2 +- + tools/perf/ui/browsers/hists.c | 44 +- + tools/perf/ui/gtk/hists.c | 18 +- + tools/perf/ui/hist.c | 280 +- + tools/perf/ui/stdio/hist.c | 4 +- + tools/perf/util/annotate.c | 9 +- + tools/perf/util/cache.h | 1 + + tools/perf/util/cloexec.c | 29 +- + tools/perf/util/color.c | 16 + + tools/perf/util/color.h | 1 + + tools/perf/util/comm.c | 7 +- + tools/perf/util/comm.h | 6 +- + tools/perf/util/config.c | 24 + + tools/perf/util/debug.c | 36 +- + tools/perf/util/debug.h | 8 + + tools/perf/util/dso.c | 28 +- + tools/perf/util/event.h | 2 + + tools/perf/util/evlist.c | 129 +- + tools/perf/util/evlist.h | 5 + + tools/perf/util/evsel.c | 49 +- + tools/perf/util/evsel.h | 2 + + tools/perf/util/hist.c | 22 + + tools/perf/util/hist.h | 18 +- + tools/perf/util/machine.c | 30 +- + tools/perf/util/machine.h | 4 + + tools/perf/util/ordered-events.c | 245 ++ + tools/perf/util/ordered-events.h | 51 + + tools/perf/util/probe-event.c | 98 +- + tools/perf/util/record.c | 40 +- + .../util/scripting-engines/trace-event-python.c | 114 +- + tools/perf/util/session.c | 298 +- + tools/perf/util/session.h | 30 +- + tools/perf/util/sort.c | 58 +- + tools/perf/util/symbol-elf.c | 9 +- + tools/perf/util/symbol.c | 34 +- + tools/perf/util/symbol.h | 13 +- + tools/perf/util/thread.c | 24 +- + tools/perf/util/thread.h | 10 +- + tools/perf/util/tool.h | 2 +- + tools/perf/util/util.c | 49 + + tools/perf/util/util.h | 19 + + 135 files changed, 7552 insertions(+), 7069 deletions(-) + rename Documentation/{ => locking}/lockdep-design.txt (100%) + rename Documentation/{ => locking}/lockstat.txt (99%) + rename Documentation/{ => locking}/mutex-design.txt (97%) + rename Documentation/{ => locking}/rt-mutex-design.txt (100%) + rename Documentation/{ => locking}/rt-mutex.txt (100%) + rename Documentation/{ => locking}/spinlocks.txt (98%) + rename Documentation/{ => locking}/ww-mutex-design.txt (100%) + create mode 100644 arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c + create mode 100644 arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c + create mode 100644 arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c + create mode 100644 tools/perf/util/ordered-events.c + create mode 100644 tools/perf/util/ordered-events.h +$ git am -3 ../patches/0001-perf-x86-uncore-fix-for-DEFINE_PCI_DEVICE_TABLE-remo.patch +Applying: perf/x86/uncore: fix for DEFINE_PCI_DEVICE_TABLE removal +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c +M arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c +$ git add -A . +$ git commit -v -a --amend +[master 06c4a9e6d705] Merge remote-tracking branch 'tip/auto-latest' + Date: Mon Aug 18 06:48:39 2014 +1000 +Merging clockevents/clockevents/next (3252a646aa2c clocksource: exynos_mct: Only use 32-bits where possible) +$ git merge clockevents/clockevents/next +Already up-to-date. +Merging edac/linux_next (50d1bb93672f sb_edac: add support for Haswell based systems) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (eba4bfb34d45 EDAC, MCE, AMD: Add MCE decoding for F15h M60h) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (2180614e1cdc irqchip: gic: Allow gic_arch_extn hooks to call into scheduler) +$ git merge irqchip/irqchip/for-next +Merge made by the 'recursive' strategy. + drivers/irqchip/irq-crossbar.c | 4 ++-- + drivers/irqchip/irq-gic-v3.c | 36 ++++++++++++++++++------------------ + drivers/irqchip/irq-gic.c | 23 +++++++++++++++++++++-- + 3 files changed, 41 insertions(+), 22 deletions(-) +Merging ftrace/for-next (45ed695ac10a ARM64: add IPI tracepoints) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (1c91efb24799 rcutorture: Specify CONFIG_CPUMASK_OFFSTACK=y for TREE07) +$ git merge rcu/rcu/next +Auto-merging kernel/rcu/rcutorture.c +Auto-merging init/main.c +Merge made by the 'recursive' strategy. + Documentation/memory-barriers.txt | 20 +- + include/linux/rcupdate.h | 46 +--- + init/main.c | 1 + + kernel/rcu/rcutorture.c | 2 +- + kernel/rcu/tiny.c | 4 +- + kernel/rcu/tree.c | 38 ++- + kernel/rcu/tree.h | 5 +- + kernel/rcu/tree_plugin.h | 273 ++++++++++++++------- + kernel/rcu/update.c | 32 +++ + .../selftests/rcutorture/bin/config2frag.sh | 4 +- + .../selftests/rcutorture/bin/configcheck.sh | 4 +- + .../testing/selftests/rcutorture/bin/configinit.sh | 4 +- + .../testing/selftests/rcutorture/bin/functions.sh | 20 ++ + .../testing/selftests/rcutorture/bin/kvm-build.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck-lock.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 3 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 6 +- + .../selftests/rcutorture/bin/parse-build.sh | 5 +- + .../selftests/rcutorture/bin/parse-console.sh | 5 +- + .../selftests/rcutorture/bin/parse-torture.sh | 5 +- + .../selftests/rcutorture/configs/rcu/TREE01 | 4 +- + .../selftests/rcutorture/configs/rcu/TREE01.boot | 2 +- + .../selftests/rcutorture/configs/rcu/TREE07 | 3 +- + .../selftests/rcutorture/configs/rcu/TREE07.boot | 1 + + tools/testing/selftests/rcutorture/doc/initrd.txt | 1 + + 27 files changed, 326 insertions(+), 170 deletions(-) + mode change 100644 => 100755 tools/testing/selftests/rcutorture/bin/config2frag.sh + mode change 100644 => 100755 tools/testing/selftests/rcutorture/bin/kvm.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE07.boot +Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) +$ git merge uprobes/for-next +Already up-to-date. +Merging kvm/linux-next (c77dcacb3975 KVM: Move more code under CONFIG_HAVE_KVM_IRQFD) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (dedf97e8ff2c arm64: KVM: fix 64bit CP15 VM access for 32bit guests) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (c77dcacb3975 KVM: Move more code under CONFIG_HAVE_KVM_IRQFD) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1) +$ git merge oprofile/for-next +Already up-to-date. +Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work) +$ git merge fw-nohz/nohz/next +Already up-to-date. +Merging xen-tip/linux-next (e38230eb3789 xen/pciback: Remove tons of dereferences) +$ git merge xen-tip/linux-next +Auto-merging include/linux/device.h +Auto-merging drivers/xen/xen-pciback/pci_stub.c +Merge made by the 'recursive' strategy. + drivers/xen/xen-pciback/passthrough.c | 14 +++++++++--- + drivers/xen/xen-pciback/pci_stub.c | 42 +++++++++++++++++++---------------- + drivers/xen/xen-pciback/pciback.h | 7 +++--- + drivers/xen/xen-pciback/vpci.c | 14 +++++++++--- + drivers/xen/xen-pciback/xenbus.c | 4 ++-- + include/linux/device.h | 5 +++++ + 6 files changed, 56 insertions(+), 30 deletions(-) +Merging percpu/for-next (3189eddbcafc percpu: free percpu allocation info for uniprocessor system) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + mm/percpu-vm.c | 22 ++++++++++++++++------ + mm/percpu.c | 2 ++ + 2 files changed, 18 insertions(+), 6 deletions(-) +Merging workqueues/for-next (ebb48ccd98d1 Merge branch 'for-3.17' into for-next) +$ git merge workqueues/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/linux-next (770235f68ab6 platform/x86: Enable build support for toshiba_haps) +$ git merge drivers-x86/linux-next +Merge made by the 'recursive' strategy. +Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries) +$ git merge chrome-platform/for-next +Already up-to-date. +Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away) +$ git merge sysctl/master +Already up-to-date. +Merging regmap/for-next (22b96a67aa6c Merge remote-tracking branch 'regmap/topic/dt-endian' into regmap-next) +$ git merge regmap/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regmap/regmap.txt | 47 +++++++++ + MAINTAINERS | 1 + + drivers/base/regmap/Kconfig | 3 + + drivers/base/regmap/regmap-i2c.c | 2 + + drivers/base/regmap/regmap-spi.c | 2 + + drivers/base/regmap/regmap.c | 117 +++++++++++++++++++-- + 6 files changed, 161 insertions(+), 11 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regmap/regmap.txt +Merging hsi/for-next (3fd276e9c0d7 HSI: omap_ssi: Fix return value check in ssi_debug_add_ctrl()) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (45384ea0add3 leds: lp3944: fix sparse warning) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + drivers/leds/led-class.c | 16 ++++++++-------- + drivers/leds/led-core.c | 2 +- + drivers/leds/leds-lp3944.c | 3 ++- + include/linux/leds.h | 6 +++--- + 4 files changed, 14 insertions(+), 13 deletions(-) +Merging driver-core/driver-core-next (7d1311b93e58 Linux 3.17-rc1) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (7d1311b93e58 Linux 3.17-rc1) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (7d1311b93e58 Linux 3.17-rc1) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (8346b33fad01 Documentation: DocBook: elieminate doc build break) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (7d1311b93e58 Linux 3.17-rc1) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging staging/staging-next (ed7f92da59f2 staging: dgnc: Remove unnecessary dgnc_Major_Control_Registered variable) +$ git merge staging/staging-next +Removing drivers/staging/unisys/include/commontypes.h +Removing drivers/staging/rtl8188eu/include/odm_RegConfig8188E.h +Removing drivers/staging/rtl8188eu/include/HalHWImg8188E_RF.h +Removing drivers/staging/rtl8188eu/include/HalHWImg8188E_MAC.h +Removing drivers/staging/rtl8188eu/include/HalHWImg8188E_BB.h +Removing drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c +Merge made by the 'recursive' strategy. + drivers/staging/android/ion/ion.c | 2 +- + drivers/staging/android/ion/ion_carveout_heap.c | 1 - + drivers/staging/android/ion/ion_chunk_heap.c | 1 - + drivers/staging/android/ion/ion_dummy_driver.c | 4 +- + drivers/staging/android/ion/ion_system_heap.c | 1 - + drivers/staging/android/sw_sync.c | 2 + + drivers/staging/android/uapi/binder.h | 2 +- + drivers/staging/bcm/Bcmchar.c | 537 ++++++++--------- + drivers/staging/bcm/vendorspecificextn.c | 19 +- + drivers/staging/comedi/Kconfig | 11 + + drivers/staging/comedi/drivers/8255.c | 198 +++--- + drivers/staging/comedi/drivers/8255.h | 31 +- + drivers/staging/comedi/drivers/8255_pci.c | 29 +- + drivers/staging/comedi/drivers/Makefile | 1 + + .../comedi/drivers/addi-data/hwdrv_apci1564.c | 158 ++--- + drivers/staging/comedi/drivers/addi_apci_1564.c | 20 +- + drivers/staging/comedi/drivers/adv_pci_dio.c | 4 +- + drivers/staging/comedi/drivers/aio_aio12_8.c | 3 +- + drivers/staging/comedi/drivers/amplc_dio200.c | 121 ++-- + drivers/staging/comedi/drivers/amplc_dio200.h | 34 +- + .../staging/comedi/drivers/amplc_dio200_common.c | 414 ++++--------- + drivers/staging/comedi/drivers/amplc_dio200_pci.c | 162 +++-- + .../staging/comedi/drivers/amplc_pc236_common.c | 2 +- + drivers/staging/comedi/drivers/amplc_pci224.c | 661 ++++++++------------- + drivers/staging/comedi/drivers/amplc_pci230.c | 162 +++-- + drivers/staging/comedi/drivers/cb_pcidas.c | 10 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 29 +- + drivers/staging/comedi/drivers/cb_pcidda.c | 27 +- + drivers/staging/comedi/drivers/cb_pcimdas.c | 16 +- + drivers/staging/comedi/drivers/cb_pcimdda.c | 3 +- + drivers/staging/comedi/drivers/comedi_test.c | 8 +- + drivers/staging/comedi/drivers/daqboard2000.c | 13 +- + drivers/staging/comedi/drivers/das08.c | 3 +- + drivers/staging/comedi/drivers/das16.c | 3 +- + drivers/staging/comedi/drivers/das16m1.c | 2 +- + drivers/staging/comedi/drivers/ni_atmio16d.c | 2 +- + drivers/staging/comedi/drivers/ni_daq_dio24.c | 2 +- + drivers/staging/comedi/drivers/ni_labpc.c | 18 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 12 +- + drivers/staging/comedi/drivers/ni_usb6501.c | 425 +++++++++++++ + drivers/staging/comedi/drivers/pcl724.c | 10 +- + drivers/staging/comedi/drivers/pcm3724.c | 27 +- + drivers/staging/dgap/dgap.c | 561 +++++++---------- + drivers/staging/dgap/dgap.h | 6 - + drivers/staging/dgnc/Makefile | 3 +- + drivers/staging/dgnc/TODO | 5 - + drivers/staging/dgnc/dgnc_cls.c | 9 +- + drivers/staging/dgnc/dgnc_driver.c | 304 +++------- + drivers/staging/dgnc/dgnc_driver.h | 13 - + drivers/staging/dgnc/dgnc_neo.c | 17 +- + drivers/staging/dgnc/dgnc_sysfs.c | 19 - + drivers/staging/dgnc/dgnc_tty.c | 17 +- + drivers/staging/dgnc/dgnc_utils.c | 70 +++ + drivers/staging/dgnc/dgnc_utils.h | 7 + + drivers/staging/imx-drm/imx-drm-core.c | 5 +- + drivers/staging/imx-drm/imx-tve.c | 2 + + drivers/staging/imx-drm/parallel-display.c | 2 + + drivers/staging/lustre/lnet/lnet/config.c | 59 +- + drivers/staging/lustre/lustre/fid/fid_request.c | 6 +- + drivers/staging/lustre/lustre/fld/fld_cache.c | 16 +- + drivers/staging/lustre/lustre/fld/fld_internal.h | 2 +- + drivers/staging/lustre/lustre/fld/fld_request.c | 9 +- + drivers/staging/lustre/lustre/include/cl_object.h | 4 +- + drivers/staging/lustre/lustre/include/lclient.h | 2 +- + .../lustre/lustre/include/linux/obd_class.h | 6 +- + drivers/staging/lustre/lustre/include/lu_object.h | 6 +- + .../lustre/lustre/include/lustre/lustre_idl.h | 124 ++-- + .../lustre/lustre/include/lustre/lustre_user.h | 23 +- + drivers/staging/lustre/lustre/include/lustre_fid.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_fld.h | 5 +- + drivers/staging/lustre/lustre/include/lustre_lib.h | 8 +- + .../staging/lustre/lustre/include/lustre_lite.h | 2 +- + drivers/staging/lustre/lustre/include/md_object.h | 2 +- + drivers/staging/lustre/lustre/include/obd.h | 50 +- + drivers/staging/lustre/lustre/include/obd_cksum.h | 6 +- + drivers/staging/lustre/lustre/include/obd_class.h | 24 +- + drivers/staging/lustre/lustre/include/obd_ost.h | 2 +- + .../staging/lustre/lustre/include/obd_support.h | 1 + + drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 4 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 50 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 15 +- + drivers/staging/lustre/lustre/libcfs/debug.c | 11 +- + drivers/staging/lustre/lustre/llite/dir.c | 4 +- + drivers/staging/lustre/lustre/llite/file.c | 48 +- + .../staging/lustre/lustre/llite/llite_internal.h | 10 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 2 +- + drivers/staging/lustre/lustre/llite/llite_mmap.c | 8 +- + drivers/staging/lustre/lustre/llite/llite_rmtacl.c | 2 +- + drivers/staging/lustre/lustre/llite/lloop.c | 2 +- + drivers/staging/lustre/lustre/llite/remote_perm.c | 2 +- + drivers/staging/lustre/lustre/llite/vvp_io.c | 1 + + drivers/staging/lustre/lustre/lmv/lmv_fld.c | 2 +- + drivers/staging/lustre/lustre/lmv/lmv_internal.h | 10 +- + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 16 +- + .../staging/lustre/lustre/lov/lov_cl_internal.h | 4 +- + drivers/staging/lustre/lustre/lov/lov_ea.c | 8 +- + drivers/staging/lustre/lustre/lov/lov_internal.h | 28 +- + drivers/staging/lustre/lustre/lov/lov_io.c | 8 +- + drivers/staging/lustre/lustre/lov/lov_lock.c | 24 +- + drivers/staging/lustre/lustre/lov/lov_merge.c | 14 +- + drivers/staging/lustre/lustre/lov/lov_obd.c | 44 +- + drivers/staging/lustre/lustre/lov/lov_offset.c | 29 +- + drivers/staging/lustre/lustre/lov/lov_pack.c | 4 +- + drivers/staging/lustre/lustre/lov/lov_page.c | 2 +- + drivers/staging/lustre/lustre/lov/lov_request.c | 18 +- + drivers/staging/lustre/lustre/lov/lovsub_dev.c | 2 +- + drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 10 +- + drivers/staging/lustre/lustre/mdc/mdc_internal.h | 4 +- + drivers/staging/lustre/lustre/mdc/mdc_lib.c | 48 +- + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 71 ++- + drivers/staging/lustre/lustre/mdc/mdc_reint.c | 8 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 97 +-- + drivers/staging/lustre/lustre/mgc/mgc_request.c | 4 +- + drivers/staging/lustre/lustre/obdclass/cl_io.c | 9 +- + .../lustre/lustre/obdclass/linux/linux-obdo.c | 8 +- + drivers/staging/lustre/lustre/obdclass/llog_swab.c | 52 +- + .../staging/lustre/lustre/obdclass/local_storage.c | 2 +- + drivers/staging/lustre/lustre/obdclass/obdo.c | 12 +- + drivers/staging/lustre/lustre/obdecho/echo.c | 21 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 58 +- + drivers/staging/lustre/lustre/osc/lproc_osc.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 2 +- + .../staging/lustre/lustre/osc/osc_cl_internal.h | 2 +- + drivers/staging/lustre/lustre/osc/osc_internal.h | 6 +- + drivers/staging/lustre/lustre/osc/osc_io.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_quota.c | 8 +- + drivers/staging/lustre/lustre/osc/osc_request.c | 46 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 14 +- + drivers/staging/lustre/lustre/ptlrpc/connection.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/import.c | 15 +- + drivers/staging/lustre/lustre/ptlrpc/layout.c | 4 +- + .../staging/lustre/lustre/ptlrpc/pack_generic.c | 6 +- + drivers/staging/mt29f_spinand/mt29f_spinand.c | 26 +- + drivers/staging/nokia_h4p/nokia_core.c | 2 +- + drivers/staging/nokia_h4p/nokia_fw.c | 2 - + drivers/staging/ozwpan/ozcdev.c | 31 +- + drivers/staging/ozwpan/ozeltbuf.c | 129 +--- + drivers/staging/ozwpan/ozeltbuf.h | 7 +- + drivers/staging/ozwpan/ozhcd.c | 166 ++---- + drivers/staging/ozwpan/ozmain.c | 4 +- + drivers/staging/ozwpan/ozpd.c | 305 +++------- + drivers/staging/ozwpan/ozpd.h | 9 +- + drivers/staging/ozwpan/ozproto.c | 36 +- + drivers/staging/ozwpan/ozproto.h | 8 +- + drivers/staging/ozwpan/ozprotocol.h | 2 - + drivers/staging/ozwpan/ozusbsvc.c | 30 +- + drivers/staging/ozwpan/ozusbsvc1.c | 12 +- + drivers/staging/rtl8188eu/Makefile | 2 +- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_iol.c | 164 ----- + drivers/staging/rtl8188eu/hal/HalHWImg8188E_BB.c | 474 ++++++++------- + drivers/staging/rtl8188eu/hal/HalHWImg8188E_MAC.c | 120 +--- + drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c | 269 +++++---- + drivers/staging/rtl8188eu/hal/fw.c | 236 ++++++++ + drivers/staging/rtl8188eu/hal/hal_intf.c | 10 - + drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 36 -- + drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c | 138 ----- + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 371 ------------ + drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c | 277 --------- + drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c | 96 --- + drivers/staging/rtl8188eu/hal/rtl8188e_xmit.c | 1 + + drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 25 +- + drivers/staging/rtl8188eu/hal/usb_halinit.c | 39 +- + drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h | 14 - + .../staging/rtl8188eu/include/HalHWImg8188E_BB.h | 44 -- + .../staging/rtl8188eu/include/HalHWImg8188E_MAC.h | 30 - + .../staging/rtl8188eu/include/HalHWImg8188E_RF.h | 30 - + drivers/staging/rtl8188eu/include/drv_types.h | 7 - + drivers/staging/rtl8188eu/include/fw.h | 59 ++ + drivers/staging/rtl8188eu/include/hal_intf.h | 7 - + drivers/staging/rtl8188eu/include/odm_HWConfig.h | 6 - + .../staging/rtl8188eu/include/odm_RegConfig8188E.h | 43 -- + drivers/staging/rtl8188eu/include/odm_precomp.h | 5 - + drivers/staging/rtl8188eu/include/phy.h | 3 + + drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 48 +- + drivers/staging/rtl8188eu/include/rtl8188e_rf.h | 1 - + drivers/staging/rtl8188eu/include/rtw_efuse.h | 1 - + drivers/staging/rtl8188eu/include/rtw_iol.h | 54 -- + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 7 +- + drivers/staging/rtl8192ee/base.c | 76 ++- + drivers/staging/rtl8192ee/btcoexist/rtl_btc.c | 9 +- + drivers/staging/rtl8192ee/cam.c | 75 ++- + drivers/staging/rtl8192ee/core.c | 154 +++-- + drivers/staging/rtl8192ee/debug.c | 88 +-- + drivers/staging/rtl8192ee/debug.h | 20 +- + drivers/staging/rtl8192ee/efuse.c | 29 +- + drivers/staging/rtl8192ee/pci.c | 223 ++++--- + drivers/staging/rtl8192ee/ps.c | 61 +- + drivers/staging/rtl8192ee/rc.c | 2 +- + drivers/staging/rtl8192ee/regd.c | 12 +- + drivers/staging/rtl8192ee/rtl8192ee/dm.c | 46 +- + drivers/staging/rtl8192ee/rtl8192ee/fw.c | 128 ++-- + drivers/staging/rtl8192ee/rtl8192ee/hw.c | 180 +++--- + drivers/staging/rtl8192ee/rtl8192ee/led.c | 16 +- + drivers/staging/rtl8192ee/rtl8192ee/phy.c | 279 ++++----- + drivers/staging/rtl8192ee/rtl8192ee/pwrseqcmd.c | 31 +- + drivers/staging/rtl8192ee/rtl8192ee/rf.c | 10 +- + drivers/staging/rtl8192ee/rtl8192ee/sw.c | 9 +- + drivers/staging/rtl8192ee/rtl8192ee/trx.c | 26 +- + drivers/staging/rtl8192u/Makefile | 3 - + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 + + drivers/staging/rtl8192u/r8192U_core.c | 504 +--------------- + drivers/staging/rtl8192u/r8192U_wx.c | 3 +- + drivers/staging/rtl8192u/r819xU_phyreg.h | 189 +++--- + drivers/staging/rtl8723au/core/rtw_efuse.c | 34 +- + drivers/staging/rtl8821ae/pci.c | 6 +- + drivers/staging/rts5208/Kconfig | 7 - + drivers/staging/rts5208/ms.c | 5 +- + drivers/staging/rts5208/rtsx_chip.c | 6 +- + drivers/staging/rts5208/rtsx_scsi.c | 7 +- + drivers/staging/rts5208/sd.c | 11 +- + drivers/staging/rts5208/trace.h | 8 - + drivers/staging/slicoss/slicoss.c | 2 + + drivers/staging/unisys/channels/channel.c | 12 +- + .../unisys/common-spar/include/channels/channel.h | 43 +- + .../include/channels/controlframework.h | 2 +- + .../include/channels/controlvmchannel.h | 4 +- + .../common-spar/include/channels/diagchannel.h | 2 +- + .../common-spar/include/channels/iochannel.h | 43 +- + .../common-spar/include/channels/vbuschannel.h | 1 - + .../include/controlvmcompletionstatus.h | 16 +- + .../unisys/common-spar/include/iovmcall_gnuc.h | 30 +- + .../unisys/common-spar/include/vbusdeviceinfo.h | 3 +- + drivers/staging/unisys/include/commontypes.h | 72 --- + drivers/staging/unisys/include/timskmod.h | 54 +- + drivers/staging/unisys/include/uisqueue.h | 15 - + drivers/staging/unisys/include/uisutils.h | 2 + + drivers/staging/unisys/uislib/uislib.c | 19 +- + drivers/staging/unisys/uislib/uisqueue.c | 6 +- + drivers/staging/unisys/uislib/uisutils.c | 8 +- + drivers/staging/unisys/virtpci/virtpci.c | 4 +- + drivers/staging/unisys/visorchannel/visorchannel.h | 1 - + .../unisys/visorchannel/visorchannel_funcs.c | 4 +- + drivers/staging/unisys/visorchipset/file.c | 2 + + .../unisys/visorchipset/visorchipset_main.c | 16 +- + drivers/staging/vt6655/80211mgr.c | 41 +- + drivers/staging/vt6655/80211mgr.h | 6 +- + drivers/staging/vt6655/baseband.c | 92 +-- + drivers/staging/vt6655/baseband.h | 17 +- + drivers/staging/vt6655/bssdb.c | 99 +-- + drivers/staging/vt6655/bssdb.h | 8 +- + drivers/staging/vt6655/card.c | 290 ++++----- + drivers/staging/vt6655/card.h | 91 ++- + drivers/staging/vt6655/channel.c | 17 +- + drivers/staging/vt6655/datarate.c | 15 +- + drivers/staging/vt6655/desc.h | 11 - + drivers/staging/vt6655/device.h | 30 +- + drivers/staging/vt6655/device_main.c | 399 +++++++------ + drivers/staging/vt6655/dpc.c | 161 ++--- + drivers/staging/vt6655/dpc.h | 2 +- + drivers/staging/vt6655/hostap.c | 146 +++-- + drivers/staging/vt6655/hostap.h | 4 +- + drivers/staging/vt6655/ioctl.c | 84 ++- + drivers/staging/vt6655/ioctl.h | 2 +- + drivers/staging/vt6655/iowpa.h | 4 +- + drivers/staging/vt6655/iwctl.c | 162 ++--- + drivers/staging/vt6655/key.c | 144 ++--- + drivers/staging/vt6655/key.h | 8 +- + drivers/staging/vt6655/mac.c | 65 +- + drivers/staging/vt6655/mib.c | 54 +- + drivers/staging/vt6655/power.c | 28 +- + drivers/staging/vt6655/rf.c | 8 +- + drivers/staging/vt6655/rf.h | 8 +- + drivers/staging/vt6655/rxtx.c | 247 ++++---- + drivers/staging/vt6655/rxtx.h | 39 +- + drivers/staging/vt6655/ttype.h | 27 - + drivers/staging/vt6655/upc.h | 39 +- + drivers/staging/vt6655/wcmd.c | 143 ++--- + drivers/staging/vt6655/wcmd.h | 3 +- + drivers/staging/vt6655/wctl.c | 8 +- + drivers/staging/vt6655/wctl.h | 6 +- + drivers/staging/vt6655/wmgr.c | 366 ++++++------ + drivers/staging/vt6655/wmgr.h | 2 +- + drivers/staging/vt6655/wpa.c | 28 +- + drivers/staging/vt6655/wpa2.c | 20 +- + drivers/staging/vt6655/wpactl.c | 118 ++-- + drivers/staging/vt6655/wpactl.h | 6 +- + drivers/staging/vt6655/wroute.c | 14 +- + drivers/staging/vt6655/wroute.h | 3 +- + drivers/staging/vt6656/rxtx.c | 3 +- + drivers/staging/vt6656/usbpipe.c | 5 +- + drivers/staging/wlan-ng/prism2fw.c | 93 ++- + drivers/staging/wlan-ng/prism2mgmt.c | 19 +- + 283 files changed, 6067 insertions(+), 8602 deletions(-) + create mode 100644 drivers/staging/comedi/drivers/ni_usb6501.c + create mode 100644 drivers/staging/dgnc/dgnc_utils.c + create mode 100644 drivers/staging/dgnc/dgnc_utils.h + create mode 100644 drivers/staging/rtl8188eu/hal/fw.c + delete mode 100644 drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c + delete mode 100644 drivers/staging/rtl8188eu/include/HalHWImg8188E_BB.h + delete mode 100644 drivers/staging/rtl8188eu/include/HalHWImg8188E_MAC.h + delete mode 100644 drivers/staging/rtl8188eu/include/HalHWImg8188E_RF.h + create mode 100644 drivers/staging/rtl8188eu/include/fw.h + delete mode 100644 drivers/staging/rtl8188eu/include/odm_RegConfig8188E.h + create mode 100644 drivers/staging/rtl8188eu/include/phy.h + delete mode 100644 drivers/staging/unisys/include/commontypes.h +Merging char-misc/char-misc-next (7d1311b93e58 Linux 3.17-rc1) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging cgroup/for-next (abdfd21809f2 Merge branch 'for-3.17' into for-next) +$ git merge cgroup/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (a88f152a33ea Merge commit 'ae87e8b212eda02503418657530a266ecb4a7180' into for-next) +$ git merge scsi/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/scsi.c | 12 ++++++++++-- + drivers/scsi/scsi_lib.c | 2 +- + 2 files changed, 11 insertions(+), 3 deletions(-) +Merging target-updates/for-next (4ca7ea3ceeb9 iscsi-target: Ignore ICF_GOT_LAST_DATAOUT during Data-Out ITT lookup) +$ git merge target-updates/for-next +Auto-merging drivers/target/iscsi/iscsi_target_util.c +Merge made by the 'recursive' strategy. + drivers/infiniband/ulp/isert/ib_isert.c | 20 +++++++++++--------- + drivers/target/iscsi/iscsi_target_util.c | 2 ++ + drivers/target/target_core_fabric_configfs.c | 3 +-- + 3 files changed, 14 insertions(+), 11 deletions(-) +Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS) +$ git merge writeback/writeback-for-next +Already up-to-date. +Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries) +$ git merge hwspinlock/linux-next +Already up-to-date. +Merging pinctrl/for-next (4b6fe45a79a9 pinctrl: pinctrl-at91.c: fix decimal printf format specifiers prefixed with 0x) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/nomadik/pinctrl-abx500.c | 3 +-- + drivers/pinctrl/pinctrl-at91.c | 4 ++-- + drivers/pinctrl/pinctrl-rockchip.c | 15 +++++++++------ + drivers/pinctrl/pinctrl-tegra-xusb.c | 5 +++-- + drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 8 ++++---- + 5 files changed, 19 insertions(+), 16 deletions(-) +Merging vhost/linux-next (970379f59d81 vhost: move memory pointer to VQs) +$ git merge vhost/linux-next +Resolved 'drivers/vhost/net.c' using previous resolution. +Auto-merging drivers/vhost/net.c +CONFLICT (content): Merge conflict in drivers/vhost/net.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b1af74fe472c] Merge remote-tracking branch 'vhost/linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6) +$ git merge remoteproc/for-next +Already up-to-date. +Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO) +$ git merge rpmsg/for-next +Already up-to-date. +Merging gpio/for-next (de25de5e1eef Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-pca953x.txt | 39 ++++++++++++++++ + MAINTAINERS | 2 +- + drivers/gpio/devres.c | 2 +- + drivers/gpio/gpio-pca953x.c | 54 ++-------------------- + drivers/gpio/gpio-zynq.c | 36 +++++++++++---- + drivers/gpio/gpiolib-of.c | 4 +- + 6 files changed, 73 insertions(+), 64 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-pca953x.txt +Merging dma-mapping/dma-mapping-next (f70e3c4f8b6a CMA: correct unlock target) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (f6306299080b pwm: rockchip: Added to support for RK3288 SoC) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (101e31050bf1 dma-buf/fence: Fix one more kerneldoc warning) +$ git merge dma-buf/for-next +Merge made by the 'recursive' strategy. + Documentation/dma-buf-sharing.txt | 14 ++++++++------ + drivers/dma-buf/fence.c | 2 +- + include/linux/seqno-fence.h | 1 + + 3 files changed, 10 insertions(+), 7 deletions(-) +Merging userns/for-next (87b47932f40a mnt: Implicitly add MNT_NODEV on remount as we do on mount) +$ git merge userns/for-next +Auto-merging fs/namespace.c +Merge made by the 'recursive' strategy. + fs/namespace.c | 9 ++++ + .../selftests/mount/unprivileged-remount-test.c | 51 ++++++++++++---------- + 2 files changed, 36 insertions(+), 24 deletions(-) +Merging ktest/for-next (4c16b1d6d5e0 ktest: Update documentation on config_bisect) +$ git merge ktest/for-next +Already up-to-date. +Merging signal/for-next (20b4fb485227 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 (b11a6face1b6 clk: Add missing of_clk_set_defaults export) +$ git merge clk/clk-next +Already up-to-date. +Merging random/dev (e02b87659777 hwrng: Pass entropy to add_hwgenerator_randomness() in bits, not bytes) +$ git merge random/dev +Already up-to-date. +Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) +$ git merge lzo-update/lzo-update +Auto-merging lib/lzo/lzo1x_decompress_safe.c +Merge made by the 'recursive' strategy. + lib/lzo/lzo1x_decompress_safe.c | 4 ++++ + lib/lzo/lzodefs.h | 6 ++++++ + 2 files changed, 10 insertions(+) +Merging aio/master (00fefb9cf2b5 aio: use iovec array rather than the single one) +$ git merge aio/master +Already up-to-date. +Merging llvmlinux/for-next (7380100aa7ce arm64: LLVMLinux: Use current_stack_pointer in kernel/traps.c) +$ git merge llvmlinux/for-next +Auto-merging arch/arm64/kernel/traps.c +Auto-merging arch/arm64/include/asm/thread_info.h +Auto-merging arch/arm/kernel/unwind.c +Auto-merging arch/arm/include/asm/thread_info.h +Auto-merging arch/arm/include/asm/ptrace.h +Merge made by the 'recursive' strategy. + arch/arm/include/asm/ptrace.h | 5 ++--- + arch/arm/include/asm/thread_info.h | 9 +++++++-- + arch/arm/kernel/return_address.c | 3 +-- + arch/arm/kernel/stacktrace.c | 4 +--- + arch/arm/kernel/unwind.c | 3 +-- + arch/arm64/include/asm/thread_info.h | 9 +++++++-- + arch/arm64/kernel/stacktrace.c | 3 +-- + arch/arm64/kernel/traps.c | 3 +-- + 8 files changed, 21 insertions(+), 18 deletions(-) +Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Parse device tree to setup idle states) +$ git merge powernv-cpuidle/powernv-cpuidle +Already up-to-date. +Merging rd-docs/master (483ecaf2b002 Fix scripts/kernel-doc to recognize __meminit in a function prototype and to stip it, as done with many other attributes.) +$ git merge rd-docs/master +Merge made by the 'recursive' strategy. + Documentation/this_cpu_ops.txt | 213 +++++++++++++++++++++++++++++++++-------- + scripts/kernel-doc | 1 + + 2 files changed, 172 insertions(+), 42 deletions(-) +Merging signal-cleanup/signal_v4 (b9f0fb2d4a7a powerpc: Use sigsp()) +$ git merge signal-cleanup/signal_v4 +Merge made by the 'recursive' strategy. +$ git revert 7e7292dba215 +[master 1cb293b91da3] Revert "ASoC: fsl: add imx-es8328 machine driver" + 4 files changed, 308 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/imx-audio-es8328.txt + delete mode 100644 sound/soc/fsl/imx-es8328.c +$ git am -3 ../patches/0001-staging-rtl8188eu-using-unique-names-is-good.patch +Applying: staging: rtl8188eu: using unique names is good +Merging akpm-current/current (a7d66c114cee ipc: always handle a new value of auto_msgmni) +$ git merge --no-ff akpm-current/current +Auto-merging lib/Kconfig.debug +Auto-merging fs/cifs/smb2pdu.c +Auto-merging fs/cifs/smb2ops.c +Auto-merging fs/cifs/smb2misc.c +Auto-merging block/bio-integrity.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/metag/mm/hugetlbpage.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-devices-memory | 8 + + Documentation/leds/leds-class.txt | 3 - + Documentation/memory-hotplug.txt | 4 +- + Documentation/printk-formats.txt | 6 + + MAINTAINERS | 5 +- + arch/arm/Kconfig | 2 - + arch/ia64/Kconfig | 2 - + arch/ia64/mm/hugetlbpage.c | 2 +- + arch/m68k/Kconfig | 2 - + arch/m68k/kernel/sys_m68k.c | 21 +- + arch/metag/mm/hugetlbpage.c | 2 +- + arch/mips/Kconfig | 2 - + arch/mips/mm/hugetlbpage.c | 2 +- + arch/powerpc/Kconfig | 2 - + arch/powerpc/mm/hugetlbpage.c | 2 +- + arch/s390/Kconfig | 2 - + arch/s390/mm/hugetlbpage.c | 2 +- + arch/sh/Kconfig | 2 - + arch/sh/mm/hugetlbpage.c | 2 +- + arch/sparc/mm/hugetlbpage.c | 2 +- + arch/tile/Kconfig | 2 - + arch/tile/mm/hugetlbpage.c | 4 +- + arch/x86/Kbuild | 4 +- + arch/x86/Kconfig | 18 +- + arch/x86/Makefile | 5 +- + arch/x86/include/asm/numa.h | 1 - + arch/x86/include/asm/pgtable_64.h | 3 +- + arch/x86/kernel/Makefile | 2 +- + arch/x86/kernel/crash.c | 6 +- + arch/x86/kernel/machine_kexec_64.c | 11 + + arch/x86/mm/fault.c | 2 +- + arch/x86/mm/hugetlbpage.c | 2 +- + arch/x86/mm/init_64.c | 36 ++- + arch/x86/mm/numa.c | 34 +-- + arch/x86/platform/efi/efi-bgrt.c | 36 ++- + arch/x86/purgatory/Makefile | 5 +- + block/bio-integrity.c | 2 - + block/genhd.c | 2 +- + drivers/base/memory.c | 62 +++++ + drivers/block/zram/zram_drv.c | 10 +- + drivers/block/zram/zram_drv.h | 2 +- + drivers/input/Kconfig | 9 + + drivers/input/Makefile | 3 + + drivers/input/input.c | 6 + + drivers/input/leds.c | 249 ++++++++++++++++++ + drivers/leds/Kconfig | 3 - + drivers/misc/ti-st/st_core.c | 2 +- + drivers/tty/Kconfig | 4 + + drivers/tty/vt/keyboard.c | 110 ++++++-- + drivers/video/backlight/backlight.c | 2 - + fs/cifs/cifsacl.c | 2 +- + fs/cifs/cifssmb.c | 20 +- + fs/cifs/file.c | 4 +- + fs/cifs/sess.c | 2 +- + fs/cifs/smb2file.c | 4 +- + fs/cifs/smb2misc.c | 38 +-- + fs/cifs/smb2ops.c | 2 +- + fs/cifs/smb2pdu.c | 2 +- + fs/cifs/smb2pdu.h | 28 +- + fs/ext4/fsync.c | 5 +- + fs/hfsplus/catalog.c | 89 +++++-- + fs/hfsplus/dir.c | 11 +- + fs/hfsplus/hfsplus_fs.h | 4 +- + fs/hfsplus/super.c | 4 +- + fs/mpage.c | 23 +- + fs/ocfs2/alloc.c | 28 +- + fs/ocfs2/alloc.h | 2 +- + fs/ocfs2/aops.c | 37 ++- + fs/ocfs2/cluster/quorum.c | 13 +- + fs/ocfs2/cluster/tcp.c | 45 +++- + fs/ocfs2/cluster/tcp.h | 1 + + fs/ocfs2/dir.c | 2 +- + fs/ocfs2/dlm/dlmast.c | 6 +- + fs/ocfs2/dlm/dlmmaster.c | 22 +- + fs/ocfs2/dlm/dlmthread.c | 10 + + fs/ocfs2/file.c | 2 +- + fs/ocfs2/inode.c | 10 +- + fs/ocfs2/ioctl.c | 129 ++++------ + include/linux/crc64_ecma.h | 56 ++++ + include/linux/hugetlb.h | 11 +- + include/linux/input.h | 21 ++ + include/linux/kernel.h | 32 +-- + include/linux/memory_hotplug.h | 1 + + include/linux/string.h | 1 + + ipc/ipc_sysctl.c | 3 +- + kernel/kexec.c | 11 + + kernel/resource.c | 11 +- + kernel/time/posix-timers.c | 57 +++-- + lib/Kconfig | 7 + + lib/Kconfig.debug | 7 +- + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 +++++++++++++++++++++++++ + lib/vsprintf.c | 20 +- + mm/compaction.c | 17 +- + mm/gup.c | 19 +- + mm/hugetlb.c | 64 ++++- + mm/memblock.c | 3 +- + mm/memory.c | 8 + + mm/memory_hotplug.c | 2 +- + mm/mmap.c | 37 +-- + mm/page_alloc.c | 2 + + mm/pgtable-generic.c | 2 +- + mm/util.c | 30 +++ + mm/vmstat.c | 141 ++++++++-- + mm/zbud.c | 1 + + mm/zpool.c | 2 +- + mm/zsmalloc.c | 1 + + scripts/checkpatch.pl | 4 +- + 108 files changed, 1638 insertions(+), 532 deletions(-) + create mode 100644 drivers/input/leds.c + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 lib/crc64_ecma.c +$ 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: drivers/gpio/gpio-zevio.c: fix build +Applying: x86, vdso: fix vdso2c's special_pages error checking +Applying: include/linux: remove strict_strto* definitions +Applying: mm: replace remap_file_pages() syscall with emulation +Applying: fat: add i_disksize to represent uninitialized size +Applying: fat: add fat_fallocate operation +Applying: fat: zero out seek range on _fat_get_block +Applying: fat: fallback to buffered write in case of fallocated region on direct IO +Applying: fat: permit to return phy block number by fibmap in fallocated region +Applying: Documentation/filesystems/vfat.txt: update the limitation for fat fallocate +Applying: drivers/w1/w1_int.c: call put_device if device_register fails +Applying: mm: add strictlimit knob +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 6ac2407940e9...34b025e21c52 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (34b025e21c52 mm: add strictlimit knob) +$ git merge --no-ff akpm/master +Removing mm/fremap.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-bdi | 8 + + Documentation/filesystems/vfat.txt | 10 ++ + Documentation/vm/remap_file_pages.txt | 7 +- + arch/x86/vdso/vdso2c.h | 12 +- + drivers/gpio/gpio-zevio.c | 4 + + drivers/w1/w1_int.c | 3 +- + fs/fat/cache.c | 70 ++++++-- + fs/fat/fat.h | 6 +- + fs/fat/file.c | 78 +++++++- + fs/fat/inode.c | 87 ++++++++- + include/linux/fs.h | 8 +- + include/linux/kernel.h | 4 - + mm/Makefile | 2 +- + mm/backing-dev.c | 35 ++++ + mm/fremap.c | 283 ------------------------------ + mm/mmap.c | 69 ++++++++ + mm/nommu.c | 8 - + 17 files changed, 363 insertions(+), 331 deletions(-) + delete mode 100644 mm/fremap.c |