diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 2779 |
1 files changed, 2779 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..bc731c5f9449 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2779 @@ +$ date -R +Thu, 24 Mar 2016 09:12:11 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 01cde1538e1d Merge tag 'nfs-for-4.6-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs +Merging origin/master (c13042362033 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge origin/master +Updating 01cde1538e1d..c13042362033 +Fast-forward + .../devicetree/bindings/clock/axi-clkgen.txt | 5 +- + .../bindings/clock/brcm,iproc-clocks.txt | 6 + + .../devicetree/bindings/clock/lpc1850-creg-clk.txt | 52 + + .../devicetree/bindings/clock/qcom,gcc.txt | 1 + + .../devicetree/bindings/clock/renesas,cpg-mssr.txt | 2 +- + Documentation/devicetree/bindings/clock/sunxi.txt | 4 + + .../devicetree/bindings/clock/ti/adpll.txt | 41 + + .../bindings/mailbox/ti,message-manager.txt | 50 + + .../filesystems/ocfs2-online-filecheck.txt | 94 + + Documentation/filesystems/vfat.txt | 7 +- + Documentation/infiniband/sysfs.txt | 3 +- + Documentation/kcov.txt | 111 + + Documentation/rapidio/mport_cdev.txt | 104 + + Documentation/rapidio/tsi721.txt | 9 + + MAINTAINERS | 16 + + Makefile | 11 +- + arch/alpha/include/asm/uaccess.h | 10 +- + arch/alpha/mm/Makefile | 2 +- + arch/alpha/mm/extable.c | 92 - + arch/arm/boot/dts/rk3288-veyron.dtsi | 2 +- + arch/arm/kvm/arm.c | 2 + + arch/arm/mach-mvebu/Kconfig | 3 + + arch/arm/mach-shmobile/pm-rmobile.c | 2 +- + arch/arm/mach-shmobile/setup-r8a7778.c | 2 +- + arch/arm/mach-shmobile/setup-r8a7779.c | 2 +- + arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 +- + arch/arm64/include/asm/kvm_asm.h | 8 +- + arch/arm64/kvm/hyp/Makefile | 4 + + arch/ia64/include/asm/uaccess.h | 8 +- + arch/ia64/mm/extable.c | 97 +- + arch/mips/Kconfig | 2 - + arch/mips/pic32/Kconfig | 1 - + arch/powerpc/kvm/Makefile | 3 +- + arch/powerpc/kvm/book3s_64_vio.c | 52 + + arch/powerpc/kvm/book3s_64_vio_hv.c | 8 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 4 +- + arch/powerpc/kvm/powerpc.c | 3 + + arch/powerpc/sysdev/fsl_rio.c | 19 +- + arch/powerpc/sysdev/fsl_rio.h | 1 + + arch/powerpc/sysdev/fsl_rmu.c | 16 +- + arch/s390/include/asm/uaccess.h | 8 +- + arch/s390/mm/Makefile | 2 +- + arch/s390/mm/extable.c | 85 - + arch/sparc/include/asm/compat.h | 7 + + arch/sparc/include/asm/syscall.h | 9 +- + arch/um/drivers/mconsole_kern.c | 2 +- + arch/x86/Kconfig | 1 + + arch/x86/boot/Makefile | 7 + + arch/x86/boot/compressed/Makefile | 3 + + arch/x86/entry/vdso/Makefile | 3 + + arch/x86/include/asm/compat.h | 3 +- + arch/x86/include/asm/ftrace.h | 2 +- + arch/x86/include/asm/kvm_host.h | 14 +- + arch/x86/include/asm/pgtable.h | 6 + + arch/x86/include/asm/special_insns.h | 16 + + arch/x86/include/asm/uaccess.h | 5 +- + arch/x86/kernel/Makefile | 6 + + arch/x86/kernel/apic/Makefile | 4 + + arch/x86/kernel/cpu/Makefile | 4 + + arch/x86/kernel/kvm.c | 37 +- + arch/x86/kernel/process_64.c | 2 +- + arch/x86/kvm/cpuid.c | 63 +- + arch/x86/kvm/cpuid.h | 8 + + arch/x86/kvm/kvm_cache_regs.h | 5 + + arch/x86/kvm/mmu.c | 102 +- + arch/x86/kvm/mmu.h | 42 +- + arch/x86/kvm/page_track.c | 9 +- + arch/x86/kvm/paging_tmpl.h | 30 +- + arch/x86/kvm/svm.c | 8 + + arch/x86/kvm/vmx.c | 63 +- + arch/x86/kvm/x86.c | 24 +- + arch/x86/kvm/x86.h | 3 +- + arch/x86/lib/Makefile | 3 + + arch/x86/mm/Makefile | 3 + + arch/x86/mm/extable.c | 108 - + arch/x86/realmode/rm/Makefile | 3 + + drivers/base/dma-coherent.c | 25 +- + drivers/char/ipmi/ipmi_watchdog.c | 2 +- + drivers/clk/Kconfig | 22 +- + drivers/clk/Makefile | 5 +- + drivers/clk/at91/clk-generated.c | 4 +- + drivers/clk/at91/clk-main.c | 6 +- + drivers/clk/at91/clk-master.c | 4 +- + drivers/clk/at91/clk-programmable.c | 4 +- + drivers/clk/at91/clk-slow.c | 8 +- + drivers/clk/at91/clk-smd.c | 4 +- + drivers/clk/at91/clk-usb.c | 4 +- + drivers/clk/bcm/clk-bcm2835-aux.c | 4 +- + drivers/clk/bcm/clk-bcm2835.c | 47 +- + drivers/clk/bcm/clk-cygnus.c | 59 + + drivers/clk/bcm/clk-iproc-pll.c | 41 +- + drivers/clk/bcm/clk-iproc.h | 43 +- + drivers/clk/clk-axi-clkgen.c | 170 +- + drivers/clk/clk-divider.c | 5 +- + drivers/clk/clk-efm32gg.c | 2 +- + drivers/clk/clk-fixed-factor.c | 13 + + drivers/clk/clk-fixed-rate.c | 16 +- + drivers/clk/clk-gpio.c | 161 +- + drivers/clk/clk-max77686.c | 3 - + drivers/clk/clk-max77802.c | 2 - + drivers/clk/clk-mb86s7x.c | 4 +- + drivers/clk/clk-palmas.c | 16 +- + drivers/clk/clk-pwm.c | 2 +- + drivers/clk/clk-s2mps11.c | 3 - + drivers/clk/clk-scpi.c | 2 +- + drivers/clk/clk-si514.c | 2 +- + drivers/clk/clk-si5351.c | 2 +- + drivers/clk/clk-si570.c | 2 +- + drivers/clk/clk-vt8500.c | 100 +- + drivers/clk/clk-xgene.c | 4 +- + drivers/clk/clk.c | 221 +- + drivers/clk/h8300/clk-div.c | 6 +- + drivers/clk/h8300/clk-h8s2678.c | 4 +- + drivers/clk/hisilicon/clk-hi3620.c | 18 +- + drivers/clk/hisilicon/clk-hi6220-stub.c | 2 +- + drivers/clk/hisilicon/clk-hi6220.c | 26 +- + drivers/clk/hisilicon/clk-hip04.c | 6 +- + drivers/clk/hisilicon/clk-hix5hd2.c | 60 +- + drivers/clk/imx/clk-imx6q.c | 132 +- + drivers/clk/imx/clk-imx6ul.c | 65 +- + drivers/clk/imx/clk.h | 2 +- + drivers/clk/mediatek/clk-mtk.c | 4 +- + drivers/clk/meson/clkc.c | 2 +- + drivers/clk/mvebu/Kconfig | 2 - + drivers/clk/mvebu/common.c | 11 +- + drivers/clk/mvebu/dove-divider.c | 3 +- + drivers/clk/mxs/clk.h | 2 +- + drivers/clk/nxp/Makefile | 1 + + drivers/clk/nxp/clk-lpc18xx-cgu.c | 2 +- + drivers/clk/nxp/clk-lpc18xx-creg.c | 226 + + drivers/clk/nxp/clk-lpc32xx.c | 15 +- + drivers/clk/pxa/clk-pxa25x.c | 8 +- + drivers/clk/pxa/clk-pxa27x.c | 6 +- + drivers/clk/pxa/clk-pxa3xx.c | 8 +- + drivers/clk/qcom/Kconfig | 8 + + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/clk-rcg.c | 4 +- + drivers/clk/qcom/common.c | 30 +- + drivers/clk/qcom/gcc-ipq4019.c | 1354 ++++++ + drivers/clk/qcom/gcc-ipq806x.c | 37 - + drivers/clk/qcom/gcc-msm8660.c | 32 - + drivers/clk/qcom/gcc-msm8916.c | 18 + + drivers/clk/qcom/gcc-msm8960.c | 46 +- + drivers/clk/qcom/gcc-msm8974.c | 1 - + drivers/clk/qcom/gcc-msm8996.c | 98 +- + drivers/clk/qcom/gdsc.c | 89 +- + drivers/clk/qcom/gdsc.h | 34 +- + drivers/clk/qcom/mmcc-msm8960.c | 35 - + drivers/clk/qcom/mmcc-msm8974.c | 15 +- + drivers/clk/qcom/mmcc-msm8996.c | 157 + + drivers/clk/{shmobile => renesas}/Makefile | 0 + drivers/clk/{shmobile => renesas}/clk-div6.c | 3 +- + drivers/clk/{shmobile => renesas}/clk-div6.h | 4 +- + drivers/clk/{shmobile => renesas}/clk-emev2.c | 0 + drivers/clk/{shmobile => renesas}/clk-mstp.c | 2 +- + drivers/clk/{shmobile => renesas}/clk-r8a73a4.c | 2 +- + drivers/clk/{shmobile => renesas}/clk-r8a7740.c | 2 +- + drivers/clk/{shmobile => renesas}/clk-r8a7778.c | 2 +- + drivers/clk/{shmobile => renesas}/clk-r8a7779.c | 2 +- + drivers/clk/{shmobile => renesas}/clk-rcar-gen2.c | 2 +- + drivers/clk/{shmobile => renesas}/clk-rz.c | 2 +- + drivers/clk/{shmobile => renesas}/clk-sh73a0.c | 2 +- + .../clk/{shmobile => renesas}/r8a7795-cpg-mssr.c | 255 ++ + .../clk/{shmobile => renesas}/renesas-cpg-mssr.c | 7 +- + .../clk/{shmobile => renesas}/renesas-cpg-mssr.h | 2 + + drivers/clk/rockchip/clk-cpu.c | 8 +- + drivers/clk/rockchip/clk-inverter.c | 8 +- + drivers/clk/rockchip/clk-mmc-phase.c | 8 +- + drivers/clk/rockchip/clk-pll.c | 5 + + drivers/clk/rockchip/clk-rk3036.c | 33 +- + drivers/clk/rockchip/clk-rk3188.c | 27 +- + drivers/clk/rockchip/clk-rk3228.c | 56 +- + drivers/clk/rockchip/clk-rk3288.c | 38 +- + drivers/clk/rockchip/clk-rk3368.c | 175 +- + drivers/clk/rockchip/clk.c | 64 +- + drivers/clk/rockchip/clk.h | 28 + + drivers/clk/samsung/clk-exynos4.c | 12 +- + drivers/clk/samsung/clk-exynos4415.c | 2 +- + drivers/clk/samsung/clk-exynos5250.c | 10 +- + drivers/clk/samsung/clk-exynos5260.c | 36 +- + drivers/clk/samsung/clk-exynos5420.c | 12 +- + drivers/clk/samsung/clk-exynos5433.c | 208 +- + drivers/clk/samsung/clk-exynos5440.c | 12 +- + drivers/clk/samsung/clk-exynos7.c | 12 +- + drivers/clk/samsung/clk-s3c2410.c | 2 +- + drivers/clk/samsung/clk-s3c2412.c | 4 +- + drivers/clk/samsung/clk-s3c2443.c | 8 +- + drivers/clk/samsung/clk-s3c64xx.c | 8 +- + drivers/clk/samsung/clk-s5pv210.c | 10 +- + drivers/clk/socfpga/clk-gate-a10.c | 6 +- + drivers/clk/socfpga/clk-periph-a10.c | 7 +- + drivers/clk/socfpga/clk-pll-a10.c | 2 +- + drivers/clk/spear/spear1310_clock.c | 21 +- + drivers/clk/spear/spear1340_clock.c | 16 +- + drivers/clk/spear/spear3xx_clock.c | 8 +- + drivers/clk/spear/spear6xx_clock.c | 6 +- + drivers/clk/st/clk-flexgen.c | 4 +- + drivers/clk/st/clkgen-fsyn.c | 8 +- + drivers/clk/st/clkgen-mux.c | 4 +- + drivers/clk/sunxi/clk-a10-hosc.c | 3 +- + drivers/clk/sunxi/clk-a20-gmac.c | 2 - + drivers/clk/sunxi/clk-factors.c | 123 +- + drivers/clk/sunxi/clk-factors.h | 26 +- + drivers/clk/sunxi/clk-mod0.c | 23 +- + drivers/clk/sunxi/clk-simple-gates.c | 4 + + drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 2 - + drivers/clk/sunxi/clk-sun6i-ar100.c | 235 +- + drivers/clk/sunxi/clk-sun8i-apb0.c | 2 +- + drivers/clk/sunxi/clk-sun8i-bus-gates.c | 3 +- + drivers/clk/sunxi/clk-sun8i-mbus.c | 132 +- + drivers/clk/sunxi/clk-sun9i-core.c | 86 +- + drivers/clk/sunxi/clk-sunxi.c | 863 ++-- + drivers/clk/sunxi/clk-usb.c | 24 +- + drivers/clk/tegra/clk-audio-sync.c | 2 +- + drivers/clk/tegra/clk-dfll.c | 1 - + drivers/clk/tegra/clk-tegra-fixed.c | 6 +- + drivers/clk/tegra/clk-tegra114.c | 3 +- + drivers/clk/tegra/clk-tegra20.c | 10 +- + drivers/clk/ti/Kconfig | 6 + + drivers/clk/ti/Makefile | 6 + + drivers/clk/ti/adpll.c | 983 ++++ + drivers/clk/ti/apll.c | 20 +- + drivers/clk/ti/clk-814x.c | 53 + + drivers/clk/ti/clk.c | 4 +- + drivers/clk/ti/clkt_dpll.c | 6 +- + drivers/clk/ti/clockdomain.c | 2 +- + drivers/clk/ti/composite.c | 8 +- + drivers/clk/ti/dpll.c | 27 +- + drivers/clk/ti/dpll3xxx.c | 17 +- + drivers/clk/ti/dpll44xx.c | 8 +- + drivers/clk/ti/mux.c | 4 +- + drivers/clk/ux500/abx500-clk.c | 5 +- + drivers/clk/ux500/u8500_of_clk.c | 74 +- + drivers/clk/ux500/u8540_clk.c | 80 +- + drivers/clk/versatile/clk-icst.c | 2 +- + drivers/clk/versatile/clk-impd1.c | 3 +- + drivers/clk/versatile/clk-realview.c | 8 +- + drivers/clk/versatile/clk-sp810.c | 4 +- + drivers/clk/versatile/clk-vexpress-osc.c | 2 +- + drivers/clk/x86/clk-lpt.c | 4 +- + drivers/clk/zynq/clkc.c | 3 +- + drivers/crypto/ccp/ccp-dev.c | 6 +- + drivers/crypto/marvell/cesa.c | 2 +- + drivers/crypto/marvell/cesa.h | 3 +- + drivers/crypto/marvell/hash.c | 106 +- + drivers/firewire/core-cdev.c | 4 +- + drivers/firmware/efi/efivars.c | 2 +- + drivers/firmware/efi/libstub/Makefile | 3 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 +- + drivers/hid/uhid.c | 2 +- + drivers/infiniband/Kconfig | 3 + + drivers/infiniband/Makefile | 1 + + drivers/infiniband/core/device.c | 15 +- + drivers/infiniband/core/sa_query.c | 5 + + drivers/infiniband/core/uverbs_cmd.c | 17 +- + drivers/infiniband/core/verbs.c | 40 + + drivers/infiniband/hw/Makefile | 1 + + drivers/infiniband/hw/i40iw/Kconfig | 7 + + drivers/infiniband/hw/i40iw/Makefile | 9 + + drivers/infiniband/hw/i40iw/i40iw.h | 570 +++ + drivers/infiniband/hw/i40iw/i40iw_cm.c | 4141 +++++++++++++++++ + drivers/infiniband/hw/i40iw/i40iw_cm.h | 456 ++ + drivers/infiniband/hw/i40iw/i40iw_ctrl.c | 4743 ++++++++++++++++++++ + drivers/infiniband/hw/i40iw/i40iw_d.h | 1713 +++++++ + drivers/infiniband/hw/i40iw/i40iw_hmc.c | 821 ++++ + drivers/infiniband/hw/i40iw/i40iw_hmc.h | 241 + + drivers/infiniband/hw/i40iw/i40iw_hw.c | 730 +++ + drivers/infiniband/hw/i40iw/i40iw_main.c | 1910 ++++++++ + drivers/infiniband/hw/i40iw/i40iw_osdep.h | 215 + + drivers/infiniband/hw/i40iw/i40iw_p.h | 106 + + drivers/infiniband/hw/i40iw/i40iw_pble.c | 618 +++ + drivers/infiniband/hw/i40iw/i40iw_pble.h | 131 + + drivers/infiniband/hw/i40iw/i40iw_puda.c | 1436 ++++++ + drivers/infiniband/hw/i40iw/i40iw_puda.h | 183 + + drivers/infiniband/hw/i40iw/i40iw_register.h | 1030 +++++ + drivers/infiniband/hw/i40iw/i40iw_status.h | 100 + + drivers/infiniband/hw/i40iw/i40iw_type.h | 1312 ++++++ + drivers/infiniband/hw/i40iw/i40iw_ucontext.h | 107 + + drivers/infiniband/hw/i40iw/i40iw_uk.c | 1204 +++++ + drivers/infiniband/hw/i40iw/i40iw_user.h | 442 ++ + drivers/infiniband/hw/i40iw/i40iw_utils.c | 1270 ++++++ + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 2437 ++++++++++ + drivers/infiniband/hw/i40iw/i40iw_verbs.h | 173 + + drivers/infiniband/hw/i40iw/i40iw_vf.c | 85 + + drivers/infiniband/hw/i40iw/i40iw_vf.h | 62 + + drivers/infiniband/hw/i40iw/i40iw_virtchnl.c | 748 +++ + drivers/infiniband/hw/i40iw/i40iw_virtchnl.h | 124 + + drivers/infiniband/hw/mlx5/Makefile | 2 +- + drivers/infiniband/hw/mlx5/ib_virt.c | 194 + + drivers/infiniband/hw/mlx5/mad.c | 2 +- + drivers/infiniband/hw/mlx5/main.c | 12 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 8 + + drivers/infiniband/hw/qib/Kconfig | 2 +- + drivers/infiniband/hw/qib/Makefile | 10 +- + drivers/infiniband/hw/qib/qib.h | 33 +- + drivers/infiniband/hw/qib/qib_common.h | 3 - + drivers/infiniband/hw/qib/qib_cq.c | 545 --- + drivers/infiniband/hw/qib/qib_driver.c | 71 +- + drivers/infiniband/hw/qib/qib_iba6120.c | 8 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 6 +- + drivers/infiniband/hw/qib/qib_init.c | 25 +- + drivers/infiniband/hw/qib/qib_intr.c | 2 +- + drivers/infiniband/hw/qib/qib_keys.c | 186 +- + drivers/infiniband/hw/qib/qib_mad.c | 338 +- + drivers/infiniband/hw/qib/qib_mmap.c | 174 - + drivers/infiniband/hw/qib/qib_mr.c | 490 -- + drivers/infiniband/hw/qib/qib_qp.c | 1178 +---- + drivers/infiniband/hw/qib/qib_rc.c | 409 +- + drivers/infiniband/hw/qib/qib_ruc.c | 191 +- + drivers/infiniband/hw/qib/qib_sdma.c | 41 +- + drivers/infiniband/hw/qib/qib_srq.c | 380 -- + drivers/infiniband/hw/qib/qib_sysfs.c | 85 +- + drivers/infiniband/hw/qib/qib_uc.c | 79 +- + drivers/infiniband/hw/qib/qib_ud.c | 142 +- + drivers/infiniband/hw/qib/qib_verbs.c | 1223 ++--- + drivers/infiniband/hw/qib/qib_verbs.h | 812 +--- + drivers/infiniband/hw/qib/qib_verbs_mcast.c | 363 -- + drivers/infiniband/sw/Makefile | 1 + + drivers/infiniband/sw/rdmavt/Kconfig | 6 + + drivers/infiniband/sw/rdmavt/Makefile | 13 + + drivers/infiniband/sw/rdmavt/ah.c | 196 + + drivers/infiniband/sw/rdmavt/ah.h | 59 + + .../rdma/hfi1 => infiniband/sw/rdmavt}/cq.c | 325 +- + drivers/infiniband/sw/rdmavt/cq.h | 64 + + drivers/infiniband/sw/rdmavt/dma.c | 184 + + drivers/infiniband/sw/rdmavt/dma.h | 53 + + drivers/infiniband/sw/rdmavt/mad.c | 171 + + drivers/infiniband/sw/rdmavt/mad.h | 60 + + .../verbs_mcast.c => infiniband/sw/rdmavt/mcast.c} | 262 +- + drivers/infiniband/sw/rdmavt/mcast.h | 58 + + .../rdma/hfi1 => infiniband/sw/rdmavt}/mmap.c | 142 +- + drivers/infiniband/sw/rdmavt/mmap.h | 63 + + drivers/infiniband/sw/rdmavt/mr.c | 830 ++++ + drivers/infiniband/sw/rdmavt/mr.h | 92 + + drivers/infiniband/sw/rdmavt/pd.c | 119 + + drivers/infiniband/sw/rdmavt/pd.h | 58 + + drivers/infiniband/sw/rdmavt/qp.c | 1696 +++++++ + drivers/infiniband/sw/rdmavt/qp.h | 69 + + .../rdma/hfi1 => infiniband/sw/rdmavt}/srq.c | 204 +- + drivers/infiniband/sw/rdmavt/srq.h | 62 + + drivers/infiniband/sw/rdmavt/trace.c | 49 + + drivers/infiniband/sw/rdmavt/trace.h | 187 + + drivers/infiniband/sw/rdmavt/vt.c | 873 ++++ + drivers/infiniband/sw/rdmavt/vt.h | 104 + + drivers/infiniband/ulp/ipoib/ipoib.h | 2 +- + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 27 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 65 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +- + drivers/input/input-compat.h | 12 +- + drivers/mailbox/Kconfig | 11 + + drivers/mailbox/Makefile | 2 + + drivers/mailbox/ti-msgmgr.c | 639 +++ + drivers/net/ethernet/intel/i40e/Makefile | 1 + + drivers/net/ethernet/intel/i40e/i40e.h | 22 + + drivers/net/ethernet/intel/i40e/i40e_client.c | 1012 +++++ + drivers/net/ethernet/intel/i40e/i40e_client.h | 232 + + drivers/net/ethernet/intel/i40e/i40e_main.c | 115 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 3 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl.h | 34 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 247 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 4 + + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 6 + + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 57 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 24 +- + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 72 +- + drivers/net/rionet.c | 277 +- + drivers/rapidio/Kconfig | 8 + + drivers/rapidio/devices/Makefile | 1 + + drivers/rapidio/devices/rio_mport_cdev.c | 2720 +++++++++++ + drivers/rapidio/devices/tsi721.c | 1034 +++-- + drivers/rapidio/devices/tsi721.h | 87 +- + drivers/rapidio/devices/tsi721_dma.c | 397 +- + drivers/rapidio/rio-driver.c | 12 + + drivers/rapidio/rio-scan.c | 135 +- + drivers/rapidio/rio.c | 433 +- + drivers/rapidio/rio.h | 5 + + .../staging/lustre/lustre/llite/llite_internal.h | 2 +- + drivers/staging/rdma/hfi1/Kconfig | 13 +- + drivers/staging/rdma/hfi1/Makefile | 10 +- + drivers/staging/rdma/hfi1/affinity.c | 430 ++ + drivers/staging/rdma/hfi1/affinity.h | 91 + + drivers/staging/rdma/hfi1/aspm.h | 309 ++ + drivers/staging/rdma/hfi1/chip.c | 2456 +++++----- + drivers/staging/rdma/hfi1/chip.h | 151 +- + drivers/staging/rdma/hfi1/chip_registers.h | 9 +- + drivers/staging/rdma/hfi1/common.h | 12 +- + drivers/staging/rdma/hfi1/debugfs.c | 332 +- + drivers/staging/rdma/hfi1/debugfs.h | 5 +- + drivers/staging/rdma/hfi1/device.c | 5 +- + drivers/staging/rdma/hfi1/device.h | 5 +- + drivers/staging/rdma/hfi1/diag.c | 103 +- + drivers/staging/rdma/hfi1/dma.c | 17 +- + drivers/staging/rdma/hfi1/driver.c | 344 +- + drivers/staging/rdma/hfi1/efivar.c | 5 +- + drivers/staging/rdma/hfi1/efivar.h | 5 +- + drivers/staging/rdma/hfi1/eprom.c | 117 +- + drivers/staging/rdma/hfi1/eprom.h | 7 +- + drivers/staging/rdma/hfi1/file_ops.c | 552 +-- + drivers/staging/rdma/hfi1/firmware.c | 587 ++- + drivers/staging/rdma/hfi1/hfi.h | 251 +- + drivers/staging/rdma/hfi1/init.c | 183 +- + drivers/staging/rdma/hfi1/intr.c | 29 +- + drivers/staging/rdma/hfi1/iowait.h | 126 +- + drivers/staging/rdma/hfi1/keys.c | 356 -- + drivers/staging/rdma/hfi1/mad.c | 1005 +++-- + drivers/staging/rdma/hfi1/mad.h | 14 +- + drivers/staging/rdma/hfi1/mmu_rb.c | 292 ++ + drivers/staging/rdma/hfi1/mmu_rb.h | 73 + + drivers/staging/rdma/hfi1/mr.c | 473 -- + drivers/staging/rdma/hfi1/opa_compat.h | 20 +- + drivers/staging/rdma/hfi1/pcie.c | 192 +- + drivers/staging/rdma/hfi1/pio.c | 365 +- + drivers/staging/rdma/hfi1/pio.h | 118 +- + drivers/staging/rdma/hfi1/pio_copy.c | 67 +- + drivers/staging/rdma/hfi1/platform.c | 893 ++++ + .../rdma/hfi1/{platform_config.h => platform.h} | 58 +- + drivers/staging/rdma/hfi1/qp.c | 1642 ++----- + drivers/staging/rdma/hfi1/qp.h | 198 +- + drivers/staging/rdma/hfi1/qsfp.c | 270 +- + drivers/staging/rdma/hfi1/qsfp.h | 57 +- + drivers/staging/rdma/hfi1/rc.c | 765 ++-- + drivers/staging/rdma/hfi1/ruc.c | 373 +- + drivers/staging/rdma/hfi1/sdma.c | 365 +- + drivers/staging/rdma/hfi1/sdma.h | 116 +- + drivers/staging/rdma/hfi1/sdma_txreq.h | 135 + + drivers/staging/rdma/hfi1/sysfs.c | 136 +- + drivers/staging/rdma/hfi1/trace.c | 53 +- + drivers/staging/rdma/hfi1/trace.h | 1477 +++--- + drivers/staging/rdma/hfi1/twsi.c | 205 +- + drivers/staging/rdma/hfi1/twsi.h | 9 +- + drivers/staging/rdma/hfi1/uc.c | 164 +- + drivers/staging/rdma/hfi1/ud.c | 248 +- + drivers/staging/rdma/hfi1/user_exp_rcv.c | 1044 +++++ + drivers/staging/rdma/hfi1/user_exp_rcv.h | 13 +- + drivers/staging/rdma/hfi1/user_pages.c | 74 +- + drivers/staging/rdma/hfi1/user_sdma.c | 621 +-- + drivers/staging/rdma/hfi1/user_sdma.h | 11 +- + drivers/staging/rdma/hfi1/verbs.c | 1663 +++---- + drivers/staging/rdma/hfi1/verbs.h | 824 +--- + drivers/staging/rdma/hfi1/verbs_txreq.c | 149 + + drivers/staging/rdma/hfi1/verbs_txreq.h | 116 + + drivers/usb/dwc3/dwc3-of-simple.c | 9 +- + drivers/video/fbdev/simplefb.c | 4 +- + drivers/watchdog/hpwdt.c | 11 +- + fs/coredump.c | 30 +- + fs/ecryptfs/keystore.c | 6 +- + fs/eventfd.c | 42 +- + fs/ext4/dir.c | 2 +- + fs/fat/Kconfig | 18 +- + fs/fat/inode.c | 4 +- + fs/fhandle.c | 2 +- + fs/ocfs2/Makefile | 3 +- + fs/ocfs2/filecheck.c | 606 +++ + fs/ocfs2/filecheck.h | 49 + + fs/ocfs2/inode.c | 225 +- + fs/ocfs2/inode.h | 3 + + fs/ocfs2/ocfs2_trace.h | 2 + + fs/ocfs2/stackglue.c | 3 +- + fs/ocfs2/stackglue.h | 2 + + fs/ocfs2/super.c | 5 + + fs/open.c | 6 +- + include/dt-bindings/clock/bcm-cygnus.h | 6 + + include/dt-bindings/clock/exynos5433.h | 9 +- + include/dt-bindings/clock/imx6qdl-clock.h | 16 +- + include/dt-bindings/clock/imx6ul-clock.h | 149 +- + include/dt-bindings/clock/lpc32xx-clock.h | 1 + + include/dt-bindings/clock/qcom,gcc-ipq4019.h | 158 + + include/dt-bindings/clock/qcom,gcc-msm8916.h | 1 + + include/dt-bindings/clock/qcom,gcc-msm8996.h | 11 + + include/dt-bindings/clock/qcom,mmcc-msm8996.h | 17 + + include/dt-bindings/clock/rk3228-cru.h | 12 + + include/linux/capability.h | 2 - + include/linux/clk-provider.h | 11 +- + include/linux/clk/{shmobile.h => renesas.h} | 4 +- + include/linux/clk/ti.h | 8 +- + include/linux/compat.h | 15 + + include/linux/cpumask.h | 2 - + include/linux/cred.h | 5 +- + include/linux/device.h | 12 + + include/linux/fs.h | 2 +- + include/linux/io.h | 1 + + include/linux/kcov.h | 29 + + include/linux/kernel.h | 21 +- + include/linux/kfifo.h | 2 +- + include/linux/mlx5/device.h | 6 + + include/linux/mlx5/driver.h | 8 +- + include/linux/mlx5/mlx5_ifc.h | 37 +- + include/linux/mlx5/vport.h | 7 +- + include/linux/netdevice.h | 3 + + include/linux/rio.h | 98 +- + include/linux/rio_drv.h | 15 +- + include/linux/rio_mport_cdev.h | 271 ++ + include/linux/rio_regs.h | 3 + + include/linux/sched.h | 11 + + include/linux/soc/ti/ti-msgmgr.h | 35 + + include/rdma/ib_verbs.h | 29 +- + include/rdma/opa_port_info.h | 2 +- + include/rdma/rdma_vt.h | 481 ++ + include/rdma/rdmavt_cq.h | 99 + + include/rdma/rdmavt_mr.h | 139 + + include/rdma/rdmavt_qp.h | 446 ++ + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/if_link.h | 7 + + include/uapi/linux/kcov.h | 10 + + include/uapi/rdma/hfi/hfi1_user.h | 14 +- + include/uapi/rdma/rdma_netlink.h | 1 + + ipc/sem.c | 13 +- + kernel/Makefile | 12 + + kernel/auditsc.c | 4 +- + kernel/exit.c | 2 + + kernel/fork.c | 3 + + kernel/hung_task.c | 21 +- + kernel/irq/manage.c | 4 +- + kernel/kcov.c | 273 ++ + kernel/locking/Makefile | 3 + + kernel/memremap.c | 27 +- + kernel/panic.c | 20 + + kernel/power/suspend.c | 3 +- + kernel/profile.c | 4 +- + kernel/ptrace.c | 5 +- + kernel/rcu/Makefile | 4 + + kernel/sched/Makefile | 4 + + kernel/seccomp.c | 4 +- + kernel/signal.c | 4 + + kernel/sysctl_binary.c | 2 +- + kernel/time/tick-sched.c | 8 +- + kernel/trace/blktrace.c | 4 +- + kernel/trace/ftrace.c | 7 +- + kernel/trace/trace.c | 40 +- + kernel/trace/trace_functions_graph.c | 6 +- + kernel/trace/trace_kprobe.c | 27 +- + kernel/trace/trace_mmiotrace.c | 2 +- + kernel/trace/trace_probe.c | 4 +- + kernel/trace/trace_stat.c | 3 +- + kernel/trace/trace_uprobe.c | 2 +- + kernel/tracepoint.c | 2 +- + lib/Kconfig.debug | 21 + + lib/Kconfig.ubsan | 5 + + lib/Makefile | 12 + + mm/Makefile | 15 + + mm/kasan/Makefile | 1 + + mm/mprotect.c | 13 +- + mm/page_io.c | 93 +- + net/core/rtnetlink.c | 36 + + net/sctp/socket.c | 2 +- + net/xfrm/xfrm_user.c | 2 +- + scripts/Makefile.lib | 6 + + scripts/Makefile.ubsan | 4 + + scripts/gdb/linux/modules.py | 5 +- + scripts/gdb/linux/proc.py | 41 + + scripts/gdb/linux/symbols.py | 2 +- + scripts/gdb/vmlinux-gdb.py | 1 + + virt/kvm/kvm_main.c | 43 +- + 554 files changed, 62982 insertions(+), 19123 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/lpc1850-creg-clk.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/adpll.txt + create mode 100644 Documentation/devicetree/bindings/mailbox/ti,message-manager.txt + create mode 100644 Documentation/filesystems/ocfs2-online-filecheck.txt + create mode 100644 Documentation/kcov.txt + create mode 100644 Documentation/rapidio/mport_cdev.txt + delete mode 100644 arch/alpha/mm/extable.c + delete mode 100644 arch/s390/mm/extable.c + create mode 100644 drivers/clk/nxp/clk-lpc18xx-creg.c + create mode 100644 drivers/clk/qcom/gcc-ipq4019.c + rename drivers/clk/{shmobile => renesas}/Makefile (100%) + rename drivers/clk/{shmobile => renesas}/clk-div6.c (98%) + rename drivers/clk/{shmobile => renesas}/clk-div6.h (68%) + rename drivers/clk/{shmobile => renesas}/clk-emev2.c (100%) + rename drivers/clk/{shmobile => renesas}/clk-mstp.c (99%) + rename drivers/clk/{shmobile => renesas}/clk-r8a73a4.c (99%) + rename drivers/clk/{shmobile => renesas}/clk-r8a7740.c (99%) + rename drivers/clk/{shmobile => renesas}/clk-r8a7778.c (99%) + rename drivers/clk/{shmobile => renesas}/clk-r8a7779.c (99%) + rename drivers/clk/{shmobile => renesas}/clk-rcar-gen2.c (99%) + rename drivers/clk/{shmobile => renesas}/clk-rz.c (98%) + rename drivers/clk/{shmobile => renesas}/clk-sh73a0.c (99%) + rename drivers/clk/{shmobile => renesas}/r8a7795-cpg-mssr.c (61%) + rename drivers/clk/{shmobile => renesas}/renesas-cpg-mssr.c (99%) + rename drivers/clk/{shmobile => renesas}/renesas-cpg-mssr.h (97%) + create mode 100644 drivers/clk/ti/Kconfig + create mode 100644 drivers/clk/ti/adpll.c + create mode 100644 drivers/infiniband/hw/i40iw/Kconfig + create mode 100644 drivers/infiniband/hw/i40iw/Makefile + create mode 100644 drivers/infiniband/hw/i40iw/i40iw.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_cm.c + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_cm.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_ctrl.c + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_d.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_hmc.c + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_hmc.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_hw.c + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_main.c + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_osdep.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_p.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_pble.c + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_pble.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_puda.c + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_puda.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_register.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_status.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_type.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_ucontext.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_uk.c + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_user.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_utils.c + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_verbs.c + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_verbs.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_vf.c + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_vf.h + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_virtchnl.c + create mode 100644 drivers/infiniband/hw/i40iw/i40iw_virtchnl.h + create mode 100644 drivers/infiniband/hw/mlx5/ib_virt.c + delete mode 100644 drivers/infiniband/hw/qib/qib_cq.c + delete mode 100644 drivers/infiniband/hw/qib/qib_mmap.c + delete mode 100644 drivers/infiniband/hw/qib/qib_mr.c + delete mode 100644 drivers/infiniband/hw/qib/qib_srq.c + delete mode 100644 drivers/infiniband/hw/qib/qib_verbs_mcast.c + create mode 100644 drivers/infiniband/sw/Makefile + create mode 100644 drivers/infiniband/sw/rdmavt/Kconfig + create mode 100644 drivers/infiniband/sw/rdmavt/Makefile + create mode 100644 drivers/infiniband/sw/rdmavt/ah.c + create mode 100644 drivers/infiniband/sw/rdmavt/ah.h + rename drivers/{staging/rdma/hfi1 => infiniband/sw/rdmavt}/cq.c (72%) + create mode 100644 drivers/infiniband/sw/rdmavt/cq.h + create mode 100644 drivers/infiniband/sw/rdmavt/dma.c + create mode 100644 drivers/infiniband/sw/rdmavt/dma.h + create mode 100644 drivers/infiniband/sw/rdmavt/mad.c + create mode 100644 drivers/infiniband/sw/rdmavt/mad.h + rename drivers/{staging/rdma/hfi1/verbs_mcast.c => infiniband/sw/rdmavt/mcast.c} (58%) + create mode 100644 drivers/infiniband/sw/rdmavt/mcast.h + rename drivers/{staging/rdma/hfi1 => infiniband/sw/rdmavt}/mmap.c (55%) + create mode 100644 drivers/infiniband/sw/rdmavt/mmap.h + create mode 100644 drivers/infiniband/sw/rdmavt/mr.c + create mode 100644 drivers/infiniband/sw/rdmavt/mr.h + create mode 100644 drivers/infiniband/sw/rdmavt/pd.c + create mode 100644 drivers/infiniband/sw/rdmavt/pd.h + create mode 100644 drivers/infiniband/sw/rdmavt/qp.c + create mode 100644 drivers/infiniband/sw/rdmavt/qp.h + rename drivers/{staging/rdma/hfi1 => infiniband/sw/rdmavt}/srq.c (64%) + create mode 100644 drivers/infiniband/sw/rdmavt/srq.h + create mode 100644 drivers/infiniband/sw/rdmavt/trace.c + create mode 100644 drivers/infiniband/sw/rdmavt/trace.h + create mode 100644 drivers/infiniband/sw/rdmavt/vt.c + create mode 100644 drivers/infiniband/sw/rdmavt/vt.h + create mode 100644 drivers/mailbox/ti-msgmgr.c + create mode 100644 drivers/net/ethernet/intel/i40e/i40e_client.c + create mode 100644 drivers/net/ethernet/intel/i40e/i40e_client.h + create mode 100644 drivers/rapidio/devices/rio_mport_cdev.c + create mode 100644 drivers/staging/rdma/hfi1/affinity.c + create mode 100644 drivers/staging/rdma/hfi1/affinity.h + create mode 100644 drivers/staging/rdma/hfi1/aspm.h + delete mode 100644 drivers/staging/rdma/hfi1/keys.c + create mode 100644 drivers/staging/rdma/hfi1/mmu_rb.c + create mode 100644 drivers/staging/rdma/hfi1/mmu_rb.h + delete mode 100644 drivers/staging/rdma/hfi1/mr.c + create mode 100644 drivers/staging/rdma/hfi1/platform.c + rename drivers/staging/rdma/hfi1/{platform_config.h => platform.h} (89%) + create mode 100644 drivers/staging/rdma/hfi1/sdma_txreq.h + create mode 100644 drivers/staging/rdma/hfi1/user_exp_rcv.c + create mode 100644 drivers/staging/rdma/hfi1/verbs_txreq.c + create mode 100644 drivers/staging/rdma/hfi1/verbs_txreq.h + create mode 100644 fs/ocfs2/filecheck.c + create mode 100644 fs/ocfs2/filecheck.h + create mode 100644 include/dt-bindings/clock/qcom,gcc-ipq4019.h + rename include/linux/clk/{shmobile.h => renesas.h} (93%) + create mode 100644 include/linux/kcov.h + create mode 100644 include/linux/rio_mport_cdev.h + create mode 100644 include/linux/soc/ti/ti-msgmgr.h + create mode 100644 include/rdma/rdma_vt.h + create mode 100644 include/rdma/rdmavt_cq.h + create mode 100644 include/rdma/rdmavt_mr.h + create mode 100644 include/rdma/rdmavt_qp.h + create mode 100644 include/uapi/linux/kcov.h + create mode 100644 kernel/kcov.c + create mode 100644 scripts/gdb/linux/proc.py +Merging fixes/master (36f90b0a2ddd Linux 4.5-rc2) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (deaf7565eb61 ARCv2: ioremap: Support dynamic peripheral address space) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (f474c8c857d9 ARM: 8544/1: set_memory_xx fixes) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (efbec135f11d m68k: Fix misspellings in comments.) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-fixes/fixes (b562e44f507e Linux 4.5) +$ git merge powerpc-fixes/fixes +Already up-to-date. +Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +Merging sparc/master (9ef595d83aea sparc: Convert naked unsigned uses to unsigned int) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/include/asm/compat_signal.h | 8 ++++---- + arch/sparc/include/asm/obio.h | 32 ++++++++++++++++---------------- + arch/sparc/include/asm/openprom.h | 10 +++++----- + arch/sparc/include/asm/pgtable_64.h | 2 +- + arch/sparc/include/asm/processor_64.h | 2 +- + arch/sparc/include/asm/sigcontext.h | 2 +- + arch/sparc/include/asm/tsb.h | 2 +- + arch/sparc/include/uapi/asm/stat.h | 4 ++-- + arch/sparc/kernel/audit.c | 12 ++++++------ + arch/sparc/kernel/compat_audit.c | 12 ++++++------ + arch/sparc/kernel/entry.S | 2 +- + arch/sparc/kernel/ioport.c | 6 +++--- + arch/sparc/kernel/kernel.h | 12 ++++++------ + arch/sparc/kernel/leon_kernel.c | 2 +- + arch/sparc/kernel/process_64.c | 2 +- + arch/sparc/kernel/setup_32.c | 2 +- + arch/sparc/kernel/setup_64.c | 2 +- + arch/sparc/kernel/signal32.c | 2 +- + arch/sparc/kernel/sys_sparc_64.c | 4 ++-- + arch/sparc/kernel/sysfs.c | 2 +- + arch/sparc/kernel/unaligned_64.c | 4 ++-- + arch/sparc/mm/fault_32.c | 8 ++++---- + arch/sparc/net/bpf_jit_comp.c | 2 +- + 23 files changed, 68 insertions(+), 68 deletions(-) +Merging net/master (5e82b4b2a001 net: Fix typos and whitespace.) +$ git merge net/master +Auto-merging net/sctp/socket.c +Auto-merging net/core/rtnetlink.c +Auto-merging include/uapi/linux/if_link.h +Auto-merging include/linux/netdevice.h +Merge made by the 'recursive' strategy. + Documentation/networking/ip-sysctl.txt | 19 +- + drivers/isdn/mISDN/clock.c | 69 +++---- + drivers/net/ethernet/cadence/macb.c | 4 +- + drivers/net/ethernet/freescale/fman/fman.c | 104 ++++++++-- + drivers/net/ethernet/hisilicon/hns/hnae.h | 3 + + drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 12 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 38 +++- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 15 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h | 6 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 5 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 5 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h | 2 + + drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 2 + + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 32 ++- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 38 ++-- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/mcg.c | 2 - + drivers/net/ethernet/smsc/smc911x.c | 2 + + drivers/net/geneve.c | 11 +- + drivers/net/hyperv/hyperv_net.h | 7 +- + drivers/net/hyperv/netvsc_drv.c | 5 +- + drivers/net/hyperv/rndis_filter.c | 4 +- + drivers/net/phy/at803x.c | 10 +- + drivers/net/phy/mdio-sun4i.c | 4 +- + drivers/net/ppp/ppp_generic.c | 4 +- + drivers/net/usb/lan78xx.c | 49 ----- + drivers/net/vxlan.c | 9 +- + include/linux/mISDNif.h | 2 +- + include/linux/netdevice.h | 225 +++++++++++---------- + include/net/flow.h | 2 +- + include/net/inet6_connection_sock.h | 1 - + include/net/ip_tunnels.h | 16 ++ + include/net/ipv6.h | 6 + + include/net/sctp/sctp.h | 10 +- + include/net/sctp/structs.h | 2 +- + include/net/vxlan.h | 16 +- + include/trace/events/fib6.h | 2 +- + include/uapi/linux/ethtool.h | 6 +- + include/uapi/linux/if_link.h | 2 + + net/Kconfig | 2 +- + net/bridge/br_if.c | 16 ++ + net/core/dev.c | 3 +- + net/core/gen_estimator.c | 2 + + net/core/gen_stats.c | 1 + + net/core/rtnetlink.c | 4 + + net/core/skbuff.c | 2 +- + net/ipv4/af_inet.c | 26 ++- + net/ipv4/fib_frontend.c | 16 +- + net/ipv4/fou.c | 13 +- + net/ipv4/gre_offload.c | 6 + + net/ipv4/ip_tunnel_core.c | 3 +- + net/ipv4/udp.c | 12 +- + net/ipv4/udp_offload.c | 7 +- + net/ipv6/ip6_offload.c | 15 +- + net/ipv6/sit.c | 6 +- + net/netlink/af_netlink.c | 10 +- + net/sctp/associola.c | 3 +- + net/sctp/bind_addr.c | 14 +- + net/sctp/input.c | 3 +- + net/sctp/outqueue.c | 6 +- + net/sctp/protocol.c | 1 + + net/sctp/sm_make_chunk.c | 3 +- + net/sctp/sm_sideeffect.c | 6 +- + net/sctp/socket.c | 4 +- + net/sctp/transport.c | 4 +- + net/vmw_vsock/af_vsock.c | 155 +++++++------- + 66 files changed, 675 insertions(+), 423 deletions(-) +Merging ipsec/master (215276c0147e xfrm: Reset encapsulation field of the skb before transformation) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + include/net/netns/xfrm.h | 1 + + net/core/flow.c | 14 +++++++++++++- + net/xfrm/xfrm_output.c | 3 +++ + 3 files changed, 17 insertions(+), 1 deletion(-) +Merging ipvs/master (7617a24f83b5 ipvs: correct initial offset of Call-ID header search in SIP persistence engine) +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (2acd84648554 rtlwifi: fix gcc-6 indentation warning) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/bcma/main.c | 17 ++++------------- + drivers/net/wireless/broadcom/b43/main.c | 6 ++++-- + drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 6 +++--- + 3 files changed, 11 insertions(+), 18 deletions(-) +Merging mac80211/master (ad8ec957f693 wext: unregister_pernet_subsys() on notifier registration failure) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + net/wireless/wext-core.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging sound-current/for-linus (91d2178e26fd ALSA: timer: fix gparams ioctl compatibility for different architectures) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/core/timer.c | 20 +++++++++++++------- + sound/core/timer_compat.c | 30 +++++++++++++++++++++++++++++- + 2 files changed, 42 insertions(+), 8 deletions(-) +Merging pci-current/for-linus (9188269a2e8e Revert "PCI: dra7xx: Mark driver as broken") +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (18558cae0272 Linux 4.5-rc4) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (18558cae0272 Linux 4.5-rc4) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (6b5f04b6cf8e Merge branch 'for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (3b2435192fe9 MAINTAINERS: drop OMAP USB and MUSB maintainership) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (f6cede5b49e8 Linux 4.5-rc7) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up-to-date. +Merging staging.current/staging-linus (8bb7e27bbb9d staging: delete STE RMI4 hackish driver) +$ git merge staging.current/staging-linus +Removing drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h +Removing drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c +Removing drivers/staging/ste_rmi4/TODO +Removing drivers/staging/ste_rmi4/Makefile +Removing drivers/staging/ste_rmi4/Kconfig +Merge made by the 'recursive' strategy. + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/android/ion/ion_test.c | 4 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 12 +- + drivers/staging/fsl-mc/bus/mc-bus.c | 4 +- + drivers/staging/fsl-mc/bus/mc-sys.c | 6 +- + drivers/staging/lustre/lustre/Kconfig | 2 +- + drivers/staging/lustre/lustre/mgc/mgc_request.c | 2 +- + drivers/staging/most/hdm-dim2/dim2_hdm.c | 2 +- + drivers/staging/rtl8712/TODO | 12 +- + drivers/staging/rtl8723au/TODO | 3 + + drivers/staging/ste_rmi4/Kconfig | 9 - + drivers/staging/ste_rmi4/Makefile | 4 - + drivers/staging/ste_rmi4/TODO | 7 - + drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 1137 --------------------- + drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h | 46 - + drivers/staging/wilc1000/coreconfigurator.c | 8 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 7 + + 18 files changed, 38 insertions(+), 1230 deletions(-) + delete mode 100644 drivers/staging/ste_rmi4/Kconfig + delete mode 100644 drivers/staging/ste_rmi4/Makefile + delete mode 100644 drivers/staging/ste_rmi4/TODO + delete mode 100644 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c + delete mode 100644 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h +Merging char-misc.current/char-misc-linus (5cd0911a9e0e Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (4d2508a55990 ARM: pxa/raumfeld: use PROPERTY_ENTRY_INTEGER to define props) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (e54358915d0a PKCS#7: pkcs7_validate_trust(): initialize the _trusted output argument) +$ git merge crypto-current/master +Auto-merging crypto/asymmetric_keys/pkcs7_trust.c +Merge made by the 'recursive' strategy. + crypto/asymmetric_keys/pkcs7_trust.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging ide/master (0d7ef45cdeeb ide: palm_bk3710: test clock rate to avoid division by 0) +$ git merge ide/master +Merge made by the 'recursive' strategy. + drivers/ide/icside.c | 2 +- + drivers/ide/palm_bk3710.c | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) +Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (92e963f50fc7 Linux 4.5-rc1) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) +$ git merge backlight-fixes/for-backlight-fixes +Already up-to-date. +Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) +$ git merge ftrace-fixes/for-next-urgent +Already up-to-date. +Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error) +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (b562e44f507e Linux 4.5) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging asm-generic/master (a1cbaad75a8f asm-generic: remove old nonatomic-io wrapper files) +$ git merge asm-generic/master +Removing include/asm-generic/io-64-nonatomic-lo-hi.h +Removing include/asm-generic/io-64-nonatomic-hi-lo.h +Auto-merging include/asm-generic/bug.h +Auto-merging drivers/dma/idma64.h +Auto-merging arch/arc/include/asm/page.h +Merge made by the 'recursive' strategy. + arch/arc/include/asm/page.h | 3 --- + arch/arm/include/asm/page-nommu.h | 3 --- + arch/frv/include/asm/page.h | 3 --- + arch/m68k/include/asm/page_mm.h | 3 --- + arch/m68k/include/asm/page_no.h | 3 --- + arch/openrisc/include/asm/page.h | 3 --- + drivers/dma/idma64.h | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 2 +- + drivers/net/ethernet/netronome/nfp/nfp_net.h | 2 +- + include/asm-generic/bug.h | 2 +- + include/asm-generic/io-64-nonatomic-hi-lo.h | 2 -- + include/asm-generic/io-64-nonatomic-lo-hi.h | 2 -- + include/asm-generic/page.h | 3 --- + 13 files changed, 4 insertions(+), 29 deletions(-) + delete mode 100644 include/asm-generic/io-64-nonatomic-hi-lo.h + delete mode 100644 include/asm-generic/io-64-nonatomic-lo-hi.h +Merging arc/for-next (60d77f101c1f ARC: thp: unbork !CONFIG_TRANSPARENT_HUGEPAGE build) +$ git merge arc/for-next +Merge made by the 'recursive' strategy. +Merging arm/for-next (1b3bf847977c Merge branches 'amba', 'fixes', 'misc' and 'tauros2' into for-next) +$ git merge arm/for-next +Already up-to-date. +Merging arm-perf/for-next/perf (fe638401a091 arm64: perf: Extend ARMV8_EVTYPE_MASK to include PMCR.LC) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (35fe688abfcf arm-soc: document merges) +$ git merge arm-soc/for-next +Auto-merging arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi +Auto-merging arch/arm64/boot/dts/socionext/uniphier-ph1-ld20-ref.dts +Auto-merging arch/arm/boot/dts/ls1021a.dtsi +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/vendor-prefixes.txt | 2 + + arch/arm/arm-soc-for-next-contents.txt | 313 ++++ + arch/arm/boot/dts/Makefile | 12 +- + .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 2 +- + arch/arm/boot/dts/imx25.dtsi | 37 +- + arch/arm/boot/dts/imx28-apf28dev.dts | 2 +- + arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi | 4 +- + arch/arm/boot/dts/imx28-tx28.dts | 4 +- + .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 2 +- + arch/arm/boot/dts/imx35.dtsi | 8 +- + arch/arm/boot/dts/imx51-babbage.dts | 2 +- + arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 2 +- + .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 2 +- + arch/arm/boot/dts/imx51-pinfunc.h | 1 - + arch/arm/boot/dts/imx53-ard.dts | 6 +- + arch/arm/boot/dts/imx53-qsb-common.dtsi | 16 +- + arch/arm/boot/dts/imx53-tx53-x03x.dts | 2 +- + arch/arm/boot/dts/imx53-tx53-x13x.dts | 42 +- + arch/arm/boot/dts/imx53-tx53.dtsi | 4 +- + arch/arm/boot/dts/imx6dl-tx6u-811x.dts | 2 +- + arch/arm/boot/dts/imx6dl-wandboard-revb1.dts | 2 +- + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 272 +++ + arch/arm/boot/dts/imx6q-b450v3.dts | 88 + + arch/arm/boot/dts/imx6q-b650v3.dts | 88 + + arch/arm/boot/dts/imx6q-b850v3.dts | 157 ++ + arch/arm/boot/dts/imx6q-ba16.dtsi | 632 +++++++ + arch/arm/boot/dts/imx6q-bx50v3.dtsi | 225 +++ + arch/arm/boot/dts/imx6q-evi.dts | 502 ++++++ + arch/arm/boot/dts/imx6q-gk802.dts | 2 +- + arch/arm/boot/dts/imx6q-icore-rqs.dts | 78 + + arch/arm/boot/dts/imx6q-tbs2910.dts | 318 ++-- + arch/arm/boot/dts/imx6q-tx6q-1110.dts | 2 +- + arch/arm/boot/dts/imx6q-wandboard-revb1.dts | 2 +- + arch/arm/boot/dts/imx6q.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 984 +++++++++++ + arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 15 +- + arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 8 +- + arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 411 +++++ + arch/arm/boot/dts/imx6qdl-microsom.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 7 +- + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 13 +- + arch/arm/boot/dts/imx6qdl-udoo.dtsi | 57 + + arch/arm/boot/dts/imx6qdl.dtsi | 8 +- + arch/arm/boot/dts/imx6qp-sabreauto.dts | 93 + + arch/arm/boot/dts/imx6qp-sabresd.dts | 93 + + arch/arm/boot/dts/imx6qp.dtsi | 86 + + arch/arm/boot/dts/imx6sl-warp.dts | 2 +- + arch/arm/boot/dts/imx6sx-sabreauto.dts | 2 +- + arch/arm/boot/dts/imx6sx-sdb.dtsi | 18 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dts | 5 +- + arch/arm/boot/dts/imx6ul-pinfunc.h | 1836 ++++++++++---------- + arch/arm/boot/dts/imx6ul.dtsi | 220 ++- + arch/arm/boot/dts/imx7d-sbc-imx7.dts | 2 +- + arch/arm/boot/dts/imx7d-sdb.dts | 2 +- + arch/arm/boot/dts/imx7d.dtsi | 9 + + arch/arm/boot/dts/ls1021a.dtsi | 44 + + arch/arm/boot/dts/uniphier-common32.dtsi | 27 +- + arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts | 8 - + arch/arm/boot/dts/uniphier-ph1-ld4.dtsi | 4 + + arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts | 8 - + arch/arm/boot/dts/uniphier-ph1-pro4-ace.dts | 113 ++ + arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts | 8 - + arch/arm/boot/dts/uniphier-ph1-pro4-sanji.dts | 108 ++ + arch/arm/boot/dts/uniphier-ph1-pro4.dtsi | 4 + + arch/arm/boot/dts/uniphier-ph1-pro5.dtsi | 4 + + arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts | 8 - + arch/arm/boot/dts/uniphier-ph1-sld3.dtsi | 26 +- + arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts | 8 - + arch/arm/boot/dts/uniphier-ph1-sld8.dtsi | 4 + + arch/arm/boot/dts/uniphier-pinctrl.dtsi | 5 + + arch/arm/boot/dts/uniphier-proxstream2-gentil.dts | 10 + + arch/arm/boot/dts/uniphier-proxstream2.dtsi | 4 + + arch/arm/boot/dts/uniphier-ref-daughter.dtsi | 2 +- + arch/arm/boot/dts/uniphier-support-card.dtsi | 6 +- + arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 94 +- + arch/arm/boot/dts/vf-colibri.dtsi | 76 +- + arch/arm/boot/dts/vf500-colibri-eval-v3.dts | 40 +- + arch/arm/boot/dts/vf500-colibri.dtsi | 40 +- + arch/arm/boot/dts/vf500.dtsi | 49 +- + arch/arm/boot/dts/vf610-colibri-eval-v3.dts | 42 +- + arch/arm/boot/dts/vf610-colibri.dtsi | 40 +- + arch/arm/boot/dts/vf610-twr.dts | 44 +- + arch/arm/boot/dts/vf610.dtsi | 40 +- + arch/arm/boot/dts/vfxxx.dtsi | 102 +- + arch/arm64/boot/dts/socionext/Makefile | 2 +- + ...-ph1-ld10-ref.dts => uniphier-ph1-ld20-ref.dts} | 16 +- + ...iphier-ph1-ld10.dtsi => uniphier-ph1-ld20.dtsi} | 25 +- + 95 files changed, 6399 insertions(+), 1339 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora.dts + create mode 100644 arch/arm/boot/dts/imx6q-b450v3.dts + create mode 100644 arch/arm/boot/dts/imx6q-b650v3.dts + create mode 100644 arch/arm/boot/dts/imx6q-b850v3.dts + create mode 100644 arch/arm/boot/dts/imx6q-ba16.dtsi + create mode 100644 arch/arm/boot/dts/imx6q-bx50v3.dtsi + create mode 100644 arch/arm/boot/dts/imx6q-evi.dts + create mode 100644 arch/arm/boot/dts/imx6q-icore-rqs.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-apalis.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi + create mode 100644 arch/arm/boot/dts/imx6qp-sabreauto.dts + create mode 100644 arch/arm/boot/dts/imx6qp-sabresd.dts + create mode 100644 arch/arm/boot/dts/imx6qp.dtsi + create mode 100644 arch/arm/boot/dts/uniphier-ph1-pro4-ace.dts + create mode 100644 arch/arm/boot/dts/uniphier-ph1-pro4-sanji.dts + rename arch/arm64/boot/dts/socionext/{uniphier-ph1-ld10-ref.dts => uniphier-ph1-ld20-ref.dts} (88%) + rename arch/arm64/boot/dts/socionext/{uniphier-ph1-ld10.dtsi => uniphier-ph1-ld20.dtsi} (94%) +Merging at91/at91-next (772c75951fa9 Merge tag 'at91-fixes' into at91-next) +$ git merge at91/at91-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 1 + + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 1 + + 2 files changed, 2 insertions(+) +Merging bcm2835-dt/bcm2835-dt-next (1305141d1a72 ARM: bcm2835: add bcm2835-aux-uart support to DT) +$ git merge bcm2835-dt/bcm2835-dt-next +Already up-to-date. +Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1) +$ git merge bcm2835-soc/bcm2835-soc-next +Already up-to-date. +Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1) +$ git merge bcm2835-drivers/bcm2835-drivers-next +Already up-to-date. +Merging bcm2835-defconfig/bcm2835-defconfig-next (0a05d3b71ada ARM: multi_v7_defconfig: Enable BCM283x) +$ git merge bcm2835-defconfig/bcm2835-defconfig-next +Already up-to-date. +Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' 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 (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) +$ git merge cortex-m/for-next +Already up-to-date. +Merging imx-mxs/for-next (9e26d5f485d7 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging keystone/next (1bdd5a9b339c ARM: dts: k2*: Rename the k2* files to keystone-k2* files) +$ git merge keystone/next +Auto-merging arch/arm/boot/dts/keystone-k2l.dtsi +Auto-merging arch/arm/boot/dts/keystone-k2l-evm.dts +Auto-merging arch/arm/boot/dts/keystone-k2hk.dtsi +Auto-merging arch/arm/boot/dts/keystone-k2hk-evm.dts +Auto-merging arch/arm/boot/dts/keystone-k2e.dtsi +Auto-merging arch/arm/boot/dts/keystone-k2e-evm.dts +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + arch/arm/boot/dts/Makefile | 6 +++--- + arch/arm/boot/dts/{k2e-clocks.dtsi => keystone-k2e-clocks.dtsi} | 0 + arch/arm/boot/dts/{k2e-evm.dts => keystone-k2e-evm.dts} | 2 +- + arch/arm/boot/dts/{k2e-netcp.dtsi => keystone-k2e-netcp.dtsi} | 0 + arch/arm/boot/dts/{k2e.dtsi => keystone-k2e.dtsi} | 4 ++-- + arch/arm/boot/dts/{k2hk-clocks.dtsi => keystone-k2hk-clocks.dtsi} | 0 + arch/arm/boot/dts/{k2hk-evm.dts => keystone-k2hk-evm.dts} | 2 +- + arch/arm/boot/dts/{k2hk-netcp.dtsi => keystone-k2hk-netcp.dtsi} | 0 + arch/arm/boot/dts/{k2hk.dtsi => keystone-k2hk.dtsi} | 4 ++-- + arch/arm/boot/dts/{k2l-clocks.dtsi => keystone-k2l-clocks.dtsi} | 0 + arch/arm/boot/dts/{k2l-evm.dts => keystone-k2l-evm.dts} | 2 +- + arch/arm/boot/dts/{k2l-netcp.dtsi => keystone-k2l-netcp.dtsi} | 0 + arch/arm/boot/dts/{k2l.dtsi => keystone-k2l.dtsi} | 4 ++-- + 14 files changed, 13 insertions(+), 13 deletions(-) + rename arch/arm/boot/dts/{k2e-clocks.dtsi => keystone-k2e-clocks.dtsi} (100%) + rename arch/arm/boot/dts/{k2e-evm.dts => keystone-k2e-evm.dts} (98%) + rename arch/arm/boot/dts/{k2e-netcp.dtsi => keystone-k2e-netcp.dtsi} (100%) + rename arch/arm/boot/dts/{k2e.dtsi => keystone-k2e.dtsi} (97%) + rename arch/arm/boot/dts/{k2hk-clocks.dtsi => keystone-k2hk-clocks.dtsi} (100%) + rename arch/arm/boot/dts/{k2hk-evm.dts => keystone-k2hk-evm.dts} (99%) + rename arch/arm/boot/dts/{k2hk-netcp.dtsi => keystone-k2hk-netcp.dtsi} (100%) + rename arch/arm/boot/dts/{k2hk.dtsi => keystone-k2hk.dtsi} (96%) + rename arch/arm/boot/dts/{k2l-clocks.dtsi => keystone-k2l-clocks.dtsi} (100%) + rename arch/arm/boot/dts/{k2l-evm.dts => keystone-k2l-evm.dts} (98%) + rename arch/arm/boot/dts/{k2l-netcp.dtsi => keystone-k2l-netcp.dtsi} (100%) + rename arch/arm/boot/dts/{k2l.dtsi => keystone-k2l.dtsi} (96%) +Merging mvebu/for-next (5be603bdf1a7 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. +Merging omap/for-next (aec24f100558 Merge branch 'omap-for-v4.6/fixes-not-urgent' into for-next) +$ git merge omap/for-next +Resolved 'arch/arm/boot/dts/logicpd-torpedo-som.dtsi' using previous resolution. +Auto-merging arch/arm/boot/dts/logicpd-torpedo-som.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/logicpd-torpedo-som.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0ae8772e6143] Merge remote-tracking branch 'omap/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/boot/dts/dm814x-clocks.dtsi | 243 +++++++++++++++++++++++++---- + arch/arm/boot/dts/dra62x-clocks.dtsi | 26 +++ + arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 2 + + 3 files changed, 240 insertions(+), 31 deletions(-) +Merging omap-pending/for-next (8fe097a3d99e ARM: DRA7: hwmod: Add reset data for PCIe) +$ git merge omap-pending/for-next +Already up-to-date. +Merging qcom/for-next (f17d0d578214 ARM: dts: msm8974: Add SCM firmware node) +$ git merge qcom/for-next +Resolved 'MAINTAINERS' using previous resolution. +Auto-merging arch/arm/Makefile +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1df8db7be95a] Merge remote-tracking branch 'qcom/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/firmware/qcom,scm.txt | 25 ++ + MAINTAINERS | 3 + + arch/arm/Makefile | 3 +- + arch/arm/boot/dts/qcom-msm8974.dtsi | 11 + + arch/arm/mach-qcom/Kconfig | 17 +- + drivers/firmware/qcom_scm-32.c | 82 +++++++ + drivers/firmware/qcom_scm-64.c | 25 ++ + drivers/firmware/qcom_scm.c | 271 ++++++++++++++++++++- + drivers/firmware/qcom_scm.h | 12 + + drivers/soc/qcom/smd.c | 229 ++++++++++++----- + drivers/soc/qcom/smp2p.c | 2 +- + drivers/soc/qcom/spm.c | 8 +- + include/linux/qcom_scm.h | 6 + + include/linux/soc/qcom/smd.h | 8 +- + include/linux/soc/qcom/smem_state.h | 35 +++ + 15 files changed, 655 insertions(+), 82 deletions(-) + create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt +Merging renesas/next (f094c5346231 Merge branch 'heads/sh-drivers-for-v4.6' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + arch/arm/configs/shmobile_defconfig | 3 +++ + drivers/sh/pm_runtime.c | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) +Merging rockchip/for-next (1ee969dbc199 Merge branch 'v4.6-armsoc/dts64-fixes' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + arch/arm/mach-rockchip/platsmp.c | 2 +- + arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (466369e4e14b Merge branch 'next/defconfig' into for-next) +$ git merge samsung-krzk/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging sunxi/sunxi/for-next (73e5379b0442 Merge branches 'sunxi/clocks-for-4.6', 'sunxi/config64-for-4.6' and 'sunxi/dt-for-4.6' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (755f165105b1 Merge branch for-4.6/arm64 into for-next) +$ git merge tegra/for-next +Auto-merging drivers/gpu/drm/tegra/drm.h +Auto-merging arch/arm64/boot/dts/nvidia/tegra210.dtsi +Auto-merging arch/arm64/boot/dts/nvidia/tegra132.dtsi +Auto-merging arch/arm64/boot/dts/nvidia/tegra132-norrin.dts +Merge made by the 'recursive' strategy. + .../bindings/arm/tegra/nvidia,tegra20-pmc.txt | 12 +- + arch/arm/boot/dts/tegra114-dalmore.dts | 2 +- + arch/arm/boot/dts/tegra114-roth.dts | 2 +- + arch/arm/boot/dts/tegra114-tn7.dts | 2 +- + arch/arm/boot/dts/tegra114.dtsi | 4 +- + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 28 +++- + arch/arm/boot/dts/tegra124-nyan.dtsi | 4 +- + arch/arm/boot/dts/tegra124-venice2.dts | 2 +- + arch/arm/boot/dts/tegra124.dtsi | 4 +- + arch/arm/boot/dts/tegra20-harmony.dts | 2 +- + arch/arm/boot/dts/tegra20-paz00.dts | 2 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 4 +- + arch/arm/boot/dts/tegra20-trimslice.dts | 2 +- + arch/arm/boot/dts/tegra20-ventana.dts | 2 +- + arch/arm/boot/dts/tegra20-whistler.dts | 2 +- + arch/arm/boot/dts/tegra20.dtsi | 2 +- + arch/arm/boot/dts/tegra30-apalis-eval.dts | 2 +- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +- + arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +- + arch/arm/boot/dts/tegra30.dtsi | 2 +- + arch/arm/mach-tegra/platsmp.c | 16 +-- + arch/arm64/boot/dts/nvidia/Makefile | 1 + + arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 4 +- + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 26 ++++ + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 126 +++++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 2 +- + drivers/gpu/drm/tegra/drm.h | 2 +- + drivers/soc/tegra/Kconfig | 2 - + drivers/soc/tegra/pmc.c | 150 +++++++++++++-------- + include/soc/tegra/pmc.h | 35 ++--- + 31 files changed, 330 insertions(+), 120 deletions(-) + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-smaug.dts +Merging arm64/for-next/core (f09f1bacfe2b arm64: Split pr_notice("Virtual kernel memory layout...") into multiple pr_cont()) +$ git merge arm64/for-next/core +Resolved 'arch/arm64/mm/init.c' using previous resolution. +Auto-merging arch/arm64/mm/init.c +CONFLICT (content): Merge conflict in arch/arm64/mm/init.c +Auto-merging arch/arm64/kernel/head.S +Auto-merging arch/arm64/include/asm/cacheflush.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 10a05d942995] Merge remote-tracking branch 'arm64/for-next/core' +$ git diff -M --stat --summary HEAD^.. + arch/arm64/include/asm/cacheflush.h | 7 ----- + arch/arm64/kernel/entry.S | 2 +- + arch/arm64/kernel/head.S | 5 ++-- + arch/arm64/mm/init.c | 60 +++++++++++++++++-------------------- + 4 files changed, 32 insertions(+), 42 deletions(-) +Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe) +$ git merge blackfin/for-linus +Recorded preimage for 'arch/blackfin/mach-common/pm.c' +Auto-merging arch/blackfin/mach-common/pm.c +CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/blackfin/mach-common/pm.c'. +[master 608f9b0d8705] Merge remote-tracking branch 'blackfin/for-linus' +$ git diff -M --stat --summary HEAD^.. +Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code) +$ git merge cris/for-next +Already up-to-date. +Merging h8300/h8300-next (7a93665a22d8 Merge remote-tracking branch 'origin' into h8300-next) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. + arch/h8300/boot/dts/edosk2674.dts | 6 +-- + arch/h8300/boot/dts/h8300h_sim.dts | 4 +- + arch/h8300/boot/dts/h8s_sim.dts | 4 +- + arch/h8300/configs/h8300h-sim_defconfig | 2 +- + arch/h8300/kernel/setup.c | 7 ---- + arch/h8300/kernel/sim-console.c | 67 +++++---------------------------- + 6 files changed, 17 insertions(+), 73 deletions(-) +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted()) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (efbec135f11d m68k: Fix misspellings in comments.) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (a3595962d824 m68knommu: remove obsolete 68360 support) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init) +$ git merge metag/for-next +Auto-merging arch/metag/kernel/ftrace.c +Merge made by the 'recursive' strategy. + arch/metag/kernel/ftrace.c | 1 - + 1 file changed, 1 deletion(-) +Merging microblaze/next (10f4b26deb41 microblaze/PCI: export isa_io_base to fix link errors) +$ git merge microblaze/next +Auto-merging arch/microblaze/pci/pci-common.c +Merge made by the 'recursive' strategy. + arch/microblaze/include/asm/unistd.h | 2 +- + arch/microblaze/include/uapi/asm/unistd.h | 3 +++ + arch/microblaze/kernel/syscall_table.S | 3 +++ + arch/microblaze/pci/pci-common.c | 2 ++ + 4 files changed, 9 insertions(+), 1 deletion(-) +Merging mips/mips-for-linux-next (a6cab95ec1ae Merge branch '4.5-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Auto-merging drivers/firmware/broadcom/bcm47xx_sprom.c +Auto-merging arch/mips/include/asm/octeon/cvmx.h +Auto-merging arch/mips/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mips/cavium/ciu3.txt | 27 + + arch/mips/Kconfig | 4 +- + arch/mips/alchemy/common/dbdma.c | 4 +- + arch/mips/ath79/Kconfig | 12 - + arch/mips/ath79/setup.c | 13 +- + arch/mips/bcm47xx/Makefile | 2 +- + arch/mips/bcm47xx/bcm47xx_private.h | 3 - + arch/mips/bcm47xx/setup.c | 2 +- + arch/mips/boot/compressed/Makefile | 12 +- + .../boot/dts/cavium-octeon/dlink_dsr-1000n.dts | 78 +++ + arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts | 205 +------ + arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dtsi | 231 +++++++ + arch/mips/boot/dts/cavium-octeon/ubnt_e100.dts | 59 ++ + arch/mips/boot/dts/qca/Makefile | 3 - + arch/mips/cavium-octeon/csrc-octeon.c | 13 +- + .../executive/cvmx-interrupt-decodes.c | 14 +- + arch/mips/cavium-octeon/executive/cvmx-pko.c | 2 +- + arch/mips/cavium-octeon/executive/cvmx-sysinfo.c | 72 +-- + arch/mips/cavium-octeon/executive/octeon-model.c | 82 ++- + arch/mips/cavium-octeon/octeon-irq.c | 679 ++++++++++++++++++++- + arch/mips/cavium-octeon/octeon-platform.c | 94 ++- + arch/mips/cavium-octeon/setup.c | 86 ++- + arch/mips/cavium-octeon/smp.c | 153 ++++- + arch/mips/configs/ci20_defconfig | 14 +- + arch/mips/dec/int-handler.S | 2 +- + arch/mips/fw/arc/memory.c | 2 +- + arch/mips/include/asm/cpu.h | 2 + + arch/mips/include/asm/highmem.h | 4 +- + arch/mips/include/asm/irq_regs.h | 10 + + .../asm/mach-cavium-octeon/kernel-entry-init.h | 2 +- + .../include/asm/mach-generic/kernel-entry-init.h | 2 +- + arch/mips/include/asm/mach-ip27/irq.h | 2 +- + .../mips/include/asm/mach-ip27/kernel-entry-init.h | 2 +- + arch/mips/include/asm/mach-jz4740/gpio.h | 2 +- + arch/mips/include/asm/mips-cm.h | 2 +- + arch/mips/include/asm/mips-r2-to-r6-emul.h | 2 +- + arch/mips/include/asm/octeon/cvmx-bootinfo.h | 16 +- + arch/mips/include/asm/octeon/cvmx-ciu3-defs.h | 353 +++++++++++ + arch/mips/include/asm/octeon/cvmx-config.h | 2 +- + arch/mips/include/asm/octeon/cvmx-coremask.h | 89 +++ + arch/mips/include/asm/octeon/cvmx-fpa-defs.h | 1 + + arch/mips/include/asm/octeon/cvmx-mio-defs.h | 410 ++++++++++++- + arch/mips/include/asm/octeon/cvmx-sysinfo.h | 37 +- + arch/mips/include/asm/octeon/cvmx.h | 29 +- + arch/mips/include/asm/octeon/octeon-feature.h | 19 +- + arch/mips/include/asm/octeon/octeon-model.h | 5 + + arch/mips/include/asm/octeon/octeon.h | 25 + + arch/mips/include/asm/pci/bridge.h | 18 +- + arch/mips/include/asm/sgi/hpc3.h | 2 +- + arch/mips/include/asm/sgiarcs.h | 4 +- + arch/mips/include/asm/sn/ioc3.h | 2 +- + arch/mips/include/asm/sn/sn0/hubio.h | 2 +- + arch/mips/include/asm/uaccess.h | 2 +- + arch/mips/kernel/cpu-probe.c | 2 + + arch/mips/kernel/mips-cm.c | 2 +- + arch/mips/kernel/mips-r2-to-r6-emul.c | 12 +- + arch/mips/kernel/perf_event_mipsxx.c | 2 +- + arch/mips/kernel/pm-cps.c | 2 +- + arch/mips/kernel/process.c | 2 +- + arch/mips/kernel/traps.c | 25 +- + arch/mips/kvm/tlb.c | 2 +- + arch/mips/kvm/trap_emul.c | 2 +- + arch/mips/lantiq/xway/reset.c | 2 +- + arch/mips/loongson64/loongson-3/smp.c | 1 - + arch/mips/math-emu/ieee754dp.c | 6 +- + arch/mips/math-emu/ieee754sp.c | 6 +- + arch/mips/mm/sc-ip22.c | 2 +- + arch/mips/mm/tlb-r4k.c | 5 + + arch/mips/mm/tlbex.c | 2 +- + arch/mips/pmcs-msp71xx/msp_setup.c | 2 +- + arch/mips/ralink/reset.c | 2 +- + arch/mips/sgi-ip27/ip27-memory.c | 2 +- + arch/mips/vr41xx/common/pmu.c | 2 +- + drivers/firmware/broadcom/Kconfig | 11 + + drivers/firmware/broadcom/Makefile | 1 + + .../firmware/broadcom/bcm47xx_sprom.c | 31 +- + include/linux/bcm47xx_sprom.h | 24 + + 77 files changed, 2531 insertions(+), 533 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mips/cavium/ciu3.txt + create mode 100644 arch/mips/boot/dts/cavium-octeon/dlink_dsr-1000n.dts + create mode 100644 arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dtsi + create mode 100644 arch/mips/boot/dts/cavium-octeon/ubnt_e100.dts + create mode 100644 arch/mips/include/asm/octeon/cvmx-ciu3-defs.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-coremask.h + rename arch/mips/bcm47xx/sprom.c => drivers/firmware/broadcom/bcm47xx_sprom.c (97%) + create mode 100644 include/linux/bcm47xx_sprom.h +Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency) +$ git merge nios2/for-next +Already up-to-date. +Merging parisc-hd/for-next (119a0a3c13ef parisc: Wire up preadv2 and pwritev2 syscalls) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/Kconfig | 1 + + arch/parisc/include/asm/assembly.h | 2 +- + arch/parisc/include/asm/uaccess.h | 7 ++++--- + arch/parisc/include/uapi/asm/unistd.h | 8 +++++--- + arch/parisc/kernel/sys_parisc.c | 10 ---------- + arch/parisc/kernel/syscall_table.S | 6 ++++-- + arch/parisc/kernel/traps.c | 5 +---- + arch/parisc/mm/fault.c | 9 ++------- + include/linux/sched.h | 8 ++++++++ + lib/Kconfig.debug | 2 +- + scripts/sortextable.c | 1 + + 11 files changed, 28 insertions(+), 31 deletions(-) +Merging powerpc/next (6e669f085d59 powerpc: Fix unrecoverable SLB miss during restore_math()) +$ git merge powerpc/next +Already up-to-date. +Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging fsl/next (fba4e9f9898a powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible) +$ git merge fsl/next +Already up-to-date. +Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (37da5234dfa8 s390: wire up preadv2/pwritev2 syscalls) +$ git merge s390/features +Auto-merging arch/s390/mm/gup.c +Auto-merging arch/s390/Kconfig +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 3 + + arch/s390/crypto/prng.c | 2 + + arch/s390/include/asm/cache.h | 3 + + arch/s390/include/uapi/asm/unistd.h | 4 +- + arch/s390/kernel/perf_cpum_cf.c | 1 + + arch/s390/kernel/perf_cpum_sf.c | 2 +- + arch/s390/kernel/syscalls.S | 2 + + arch/s390/mm/gup.c | 8 +- + arch/s390/mm/init.c | 10 +- + arch/s390/pci/pci_clp.c | 3 +- + drivers/s390/block/dasd.c | 56 +++++++++ + drivers/s390/block/dasd_alias.c | 226 +++++++++--------------------------- + drivers/s390/block/dasd_devmap.c | 27 +++++ + drivers/s390/block/dasd_eckd.c | 202 ++++++++++++++++++++++++++++++-- + drivers/s390/block/dasd_eckd.h | 36 +++++- + drivers/s390/block/dasd_int.h | 5 + + 16 files changed, 396 insertions(+), 194 deletions(-) +Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (35b90a2939a5 tile: Fix misspellings in comments.) +$ git merge tile/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 ++-- + arch/tile/include/hv/drv_mpipe_intf.h | 26 +++++++++++++------------- + arch/tile/kernel/kgdb.c | 16 ++++++++-------- + arch/tile/kernel/pci_gx.c | 2 +- + 4 files changed, 24 insertions(+), 24 deletions(-) +Merging uml/linux-next (ad32a1f3c36b um: use %lx format specifiers for unsigned longs) +$ git merge uml/linux-next +Already up-to-date. +Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (bb7ab3b92e46 btrfs: Fix misspellings in comments.) +$ git merge btrfs/next +Already up-to-date. +Merging btrfs-kdave/for-next (46396218bfb5 Merge branch 'for-next-4.6-20160323' into for-next-20160323) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/disk-io.c +Merge made by the 'recursive' strategy. + fs/btrfs/ctree.c | 6 +- + fs/btrfs/ctree.h | 81 +++++------ + fs/btrfs/dev-replace.c | 28 +--- + fs/btrfs/disk-io.c | 53 +++---- + fs/btrfs/extent-tree.c | 64 +++++---- + fs/btrfs/extent_io.c | 39 ++++-- + fs/btrfs/file.c | 9 +- + fs/btrfs/inode-item.c | 2 +- + fs/btrfs/ioctl.c | 66 ++++++++- + fs/btrfs/relocation.c | 3 +- + fs/btrfs/root-tree.c | 4 +- + fs/btrfs/super.c | 22 ++- + fs/btrfs/transaction.c | 2 +- + fs/btrfs/tree-log.c | 8 +- + fs/btrfs/volumes.c | 335 ++++++++++++++++++++++----------------------- + fs/btrfs/volumes.h | 7 +- + include/uapi/linux/btrfs.h | 15 +- + 17 files changed, 409 insertions(+), 335 deletions(-) +Merging ceph/master (cd8140c673d9 libceph: don't spam dmesg with stray reply warnings) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (b562e44f507e Linux 4.5) +$ git merge cifs/for-next +Already up-to-date. +Merging configfs/for-next (1ae1602de028 configfs: switch ->default groups to a linked list) +$ git merge configfs/for-next +Already up-to-date. +Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/main.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/main.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging ext3/for_next (ab73ef46398e quota: Fix possible GPF due to uninitialised pointers) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (ff2ea405b86c ext4: check if in-inode xattr is corrupted in ext4_expand_extra_isize_ea()) +$ git merge ext4/dev +Resolved 'fs/overlayfs/super.c' using previous resolution. +Auto-merging include/linux/fs.h +Auto-merging include/linux/dcache.h +Auto-merging fs/overlayfs/super.c +CONFLICT (content): Merge conflict in fs/overlayfs/super.c +Auto-merging fs/open.c +Auto-merging fs/nfs/nfs4file.c +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfs/dir.c +Auto-merging fs/ext4/file.c +Auto-merging fs/ext4/crypto.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7ff45eeb7911] Merge remote-tracking branch 'ext4/dev' +$ git diff -M --stat --summary HEAD^.. + fs/ext4/crypto.c | 12 ++++++++---- + fs/ext4/file.c | 12 ++++++++---- + fs/ext4/xattr.c | 32 ++++++++++++++++++++++++++++---- + fs/nfs/dir.c | 6 +++--- + fs/nfs/inode.c | 2 +- + fs/nfs/nfs4file.c | 4 ++-- + fs/open.c | 11 +++++++++++ + fs/overlayfs/super.c | 16 ++++++++++++++++ + include/linux/dcache.h | 1 + + include/linux/fs.h | 2 ++ + 10 files changed, 80 insertions(+), 18 deletions(-) +Merging f2fs/dev (d407574e7948 Merge tag 'for-f2fs-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) +$ git merge f2fs/dev +Already up-to-date. +Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed) +$ git merge fscache/fscache +Merge made by the 'recursive' strategy. +Merging fuse/for-next (742f992708df fuse: return patrial success from fuse_direct_io()) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/for-next (9dffdb38d864 Merge tag 'staging-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) +$ git merge gfs2/for-next +Already up-to-date. +Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock) +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (c13042362033 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (ac503e4a309a nfsd: use short read as well as i_size to set eof) +$ git merge nfsd/nfsd-next +Auto-merging fs/xfs/xfs_export.c +Auto-merging fs/nfsd/nfs4recover.c +Auto-merging fs/nfs/blocklayout/extent_tree.c +Auto-merging fs/nfs/blocklayout/blocklayout.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/nfs/pnfs-scsi-server.txt | 23 ++ + fs/nfs/blocklayout/blocklayout.c | 59 ++- + fs/nfs/blocklayout/blocklayout.h | 14 +- + fs/nfs/blocklayout/dev.c | 144 ++++++- + fs/nfs/blocklayout/extent_tree.c | 44 +- + fs/nfs/blocklayout/rpc_pipefs.c | 2 +- + fs/nfsd/Kconfig | 28 +- + fs/nfsd/Makefile | 4 +- + fs/nfsd/blocklayout.c | 298 ++++++++++++-- + fs/nfsd/blocklayoutxdr.c | 77 +++- + fs/nfsd/blocklayoutxdr.h | 14 + + fs/nfsd/nfs3proc.c | 7 +- + fs/nfsd/nfs4layouts.c | 31 +- + fs/nfsd/nfs4proc.c | 9 +- + fs/nfsd/nfs4recover.c | 1 + + fs/nfsd/nfs4state.c | 29 +- + fs/nfsd/nfs4xdr.c | 26 +- + fs/nfsd/pnfs.h | 8 + + fs/nfsd/vfs.h | 19 + + fs/xfs/Makefile | 3 +- + fs/xfs/xfs_export.c | 2 +- + fs/xfs/xfs_pnfs.h | 2 +- + include/linux/nfs4.h | 19 + + include/linux/sunrpc/auth.h | 7 + + include/linux/sunrpc/svc_rdma.h | 20 +- + net/sunrpc/auth_null.c | 4 +- + net/sunrpc/auth_unix.c | 6 +- + net/sunrpc/cache.c | 6 +- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 17 +- + net/sunrpc/xprtrdma/svc_rdma_marshal.c | 64 ++- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 60 ++- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 196 ++++++--- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 445 +++++++-------------- + 33 files changed, 1130 insertions(+), 558 deletions(-) + create mode 100644 Documentation/filesystems/nfs/pnfs-scsi-server.txt +Merging orangefs/for-next (2f83ace37181 orangefs: put register_chrdev immediately before register_filesystem) +$ git merge orangefs/for-next +Auto-merging fs/Makefile +Auto-merging fs/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-fs-orangefs | 87 ++ + Documentation/filesystems/orangefs.txt | 406 +++++++ + MAINTAINERS | 8 + + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/orangefs/Kconfig | 6 + + fs/orangefs/Makefile | 10 + + fs/orangefs/acl.c | 175 +++ + fs/orangefs/dcache.c | 139 +++ + fs/orangefs/devorangefs-req.c | 938 +++++++++++++++ + fs/orangefs/dir.c | 433 +++++++ + fs/orangefs/downcall.h | 133 +++ + fs/orangefs/file.c | 726 ++++++++++++ + fs/orangefs/inode.c | 477 ++++++++ + fs/orangefs/namei.c | 462 ++++++++ + fs/orangefs/orangefs-bufmap.c | 569 +++++++++ + fs/orangefs/orangefs-bufmap.h | 47 + + fs/orangefs/orangefs-cache.c | 161 +++ + fs/orangefs/orangefs-debug.h | 92 ++ + fs/orangefs/orangefs-debugfs.c | 455 +++++++ + fs/orangefs/orangefs-debugfs.h | 3 + + fs/orangefs/orangefs-dev-proto.h | 62 + + fs/orangefs/orangefs-kernel.h | 664 +++++++++++ + fs/orangefs/orangefs-mod.c | 293 +++++ + fs/orangefs/orangefs-sysfs.c | 1772 ++++++++++++++++++++++++++++ + fs/orangefs/orangefs-sysfs.h | 2 + + fs/orangefs/orangefs-utils.c | 1208 +++++++++++++++++++ + fs/orangefs/protocol.h | 452 +++++++ + fs/orangefs/super.c | 544 +++++++++ + fs/orangefs/symlink.c | 19 + + fs/orangefs/upcall.h | 246 ++++ + fs/orangefs/waitqueue.c | 357 ++++++ + fs/orangefs/xattr.c | 545 +++++++++ + 33 files changed, 11493 insertions(+) + create mode 100644 Documentation/ABI/stable/sysfs-fs-orangefs + create mode 100644 Documentation/filesystems/orangefs.txt + create mode 100644 fs/orangefs/Kconfig + create mode 100644 fs/orangefs/Makefile + create mode 100644 fs/orangefs/acl.c + create mode 100644 fs/orangefs/dcache.c + create mode 100644 fs/orangefs/devorangefs-req.c + create mode 100644 fs/orangefs/dir.c + create mode 100644 fs/orangefs/downcall.h + create mode 100644 fs/orangefs/file.c + create mode 100644 fs/orangefs/inode.c + create mode 100644 fs/orangefs/namei.c + create mode 100644 fs/orangefs/orangefs-bufmap.c + create mode 100644 fs/orangefs/orangefs-bufmap.h + create mode 100644 fs/orangefs/orangefs-cache.c + create mode 100644 fs/orangefs/orangefs-debug.h + create mode 100644 fs/orangefs/orangefs-debugfs.c + create mode 100644 fs/orangefs/orangefs-debugfs.h + create mode 100644 fs/orangefs/orangefs-dev-proto.h + create mode 100644 fs/orangefs/orangefs-kernel.h + create mode 100644 fs/orangefs/orangefs-mod.c + create mode 100644 fs/orangefs/orangefs-sysfs.c + create mode 100644 fs/orangefs/orangefs-sysfs.h + create mode 100644 fs/orangefs/orangefs-utils.c + create mode 100644 fs/orangefs/protocol.h + create mode 100644 fs/orangefs/super.c + create mode 100644 fs/orangefs/symlink.c + create mode 100644 fs/orangefs/upcall.h + create mode 100644 fs/orangefs/waitqueue.c + create mode 100644 fs/orangefs/xattr.c +Merging overlayfs/overlayfs-next (e3608e3f68f6 Btrfs: fix crash/invalid memory access on fsync when using overlayfs) +$ git merge overlayfs/overlayfs-next +Recorded preimage for 'fs/overlayfs/super.c' +Recorded preimage for 'include/linux/dcache.h' +Recorded preimage for 'include/linux/fs.h' +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging include/linux/dcache.h +CONFLICT (content): Merge conflict in include/linux/dcache.h +Auto-merging fs/overlayfs/super.c +CONFLICT (content): Merge conflict in fs/overlayfs/super.c +Auto-merging fs/btrfs/file.c +Automatic merge failed; fix conflicts and then commit the result. +$ git merge --abort +$ git commit -v -a +On branch master +nothing to commit, working directory clean +Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (c27cb97218b3 ubifs: Remove unused header) +$ git merge ubifs/linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 ++- + drivers/mtd/ubi/misc.c | 49 +++++++++++++++++++++++++++++++++++++++++++ + drivers/mtd/ubi/ubi.h | 16 ++++++++------ + fs/ubifs/Makefile | 1 + + fs/ubifs/misc.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ + fs/ubifs/ubifs.h | 41 +++++++++++++++--------------------- + fs/ubifs/xattr.c | 1 - + 7 files changed, 136 insertions(+), 32 deletions(-) + create mode 100644 fs/ubifs/misc.c +Merging xfs/for-next (2cdb958aba6a Merge branch 'xfs-misc-fixes-4.6-4' into for-next) +$ git merge xfs/for-next +Already up-to-date. +Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew)) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (8b23a8ce1094 Merge branches 'work.lookups', 'work.misc' and 'work.preadv2' into for-next) +$ git merge vfs/for-next +Already up-to-date. +Merging pci/next (6e6f498b039a Merge branch 'pci/resource' into next) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (c7bc3b24d539 Merge branch 'for-4.6/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/hid-wiimote-modules.c | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) +Merging i2c/i2c/for-next (886f6f8337dd i2c: octeon: Support I2C_M_RECV_LEN) +$ git merge i2c/i2c/for-next +Already up-to-date. +Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440) +$ git merge jdelvare-hwmon/master +Auto-merging Documentation/hwmon/max34440 +Merge made by the 'recursive' strategy. + Documentation/hwmon/max34440 | 6 +++--- + drivers/hwmon/emc2103.c | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots) +$ git merge dmi/master +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (630300d5fcb6 hwmon: Create an NSA320 hardware monitoring driver) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging v4l-dvb/master (0dcdd3ba27cb sound/usb: fix to release stream resources from media_snd_device_delete()) +$ git merge v4l-dvb/master +Auto-merging sound/usb/card.c +Merge made by the 'recursive' strategy. + drivers/media/media-device.c | 143 ++++++++++++++++++++++---------- + drivers/media/media-devnode.c | 3 + + drivers/media/media-entity.c | 16 ++-- + drivers/media/usb/au0828/au0828-cards.c | 4 - + drivers/media/usb/au0828/au0828-core.c | 74 ++++++++++++----- + drivers/media/usb/au0828/au0828-input.c | 4 +- + drivers/media/usb/au0828/au0828-video.c | 63 +++++++------- + drivers/media/usb/au0828/au0828.h | 9 +- + drivers/media/v4l2-core/v4l2-mc.c | 2 +- + include/media/media-device.h | 38 +++++++-- + sound/usb/card.c | 2 +- + sound/usb/media.c | 30 ++++--- + 12 files changed, 247 insertions(+), 141 deletions(-) +Merging libata/for-next (4b3ec0279397 Merge branch 'for-4.6' into for-next) +$ git merge libata/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging pm/linux-next (d2e184689986 Merge branch 'pm-avs' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-devices-system-cpu | 69 ++++++++++++ + .../bindings/power/rockchip-io-domain.txt | 11 ++ + drivers/acpi/acpi_apd.c | 1 + + drivers/acpi/property.c | 1 + + drivers/acpi/resource.c | 14 ++- + drivers/acpi/sleep.c | 1 + + drivers/acpi/utils.c | 2 +- + drivers/base/power/clock_ops.c | 89 +++++++++++++++ + drivers/cpufreq/acpi-cpufreq.c | 18 +-- + drivers/cpufreq/cpufreq.c | 98 ++++++++-------- + drivers/cpufreq/cpufreq_governor.c | 2 +- + drivers/cpufreq/intel_pstate.c | 73 +++++++----- + drivers/cpufreq/powernv-cpufreq.c | 124 +++++++++++++++------ + drivers/cpuidle/governors/menu.c | 50 +++++---- + drivers/devfreq/Kconfig | 2 +- + drivers/power/avs/rockchip-io-domain.c | 58 ++++++++++ + include/linux/pm_clock.h | 9 ++ + kernel/power/hibernate.c | 1 + + tools/power/acpi/tools/acpidbg/acpidbg.c | 3 +- + 19 files changed, 483 insertions(+), 143 deletions(-) + mode change 100644 => 100755 drivers/power/avs/rockchip-io-domain.c +Merging idle/next (31ade3b83e18 Linux 4.4-rc3) +$ git merge idle/next +Already up-to-date. +Merging thermal/next (81ad4276b505 Thermal: Ignore invalid trip points) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/exynos-thermal.txt | 18 +- + .../bindings/thermal/mediatek-thermal.txt | 43 ++ + Documentation/thermal/sysfs-api.txt | 68 +++ + drivers/thermal/Kconfig | 21 +- + drivers/thermal/Makefile | 1 + + drivers/thermal/intel_pch_thermal.c | 6 + + drivers/thermal/mtk_thermal.c | 625 +++++++++++++++++++++ + drivers/thermal/of-thermal.c | 81 +++ + drivers/thermal/rcar_thermal.c | 3 +- + drivers/thermal/rockchip_thermal.c | 239 ++++---- + drivers/thermal/samsung/Kconfig | 1 + + drivers/thermal/samsung/exynos_tmu.c | 19 +- + drivers/thermal/tegra_soctherm.c | 2 +- + drivers/thermal/thermal_core.c | 13 +- + drivers/thermal/ti-soc-thermal/ti-bandgap.c | 10 +- + include/linux/thermal.h | 20 + + include/trace/events/thermal.h | 16 +- + 17 files changed, 1065 insertions(+), 121 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/mediatek-thermal.txt + create mode 100644 drivers/thermal/mtk_thermal.c +Merging thermal-soc/next (44fa372da981 Merge branch 'work-linus' into work-next) +$ git merge thermal-soc/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64) +$ git merge ieee1394/for-next +Merge made by the 'recursive' strategy. + drivers/firewire/nosy.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) +Merging dlm/next (b81171cb6869 DLM: Save and restore socket callbacks properly) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (7ea5d41560d9 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging net-next/master (de06dbfa7861 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) +$ git merge net-next/master +Already up-to-date. +Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error) +$ git merge ipsec-next/master +Already up-to-date. +Merging ipvs-next/master (f6ca9f46f661 netfilter: ipvs: avoid unused variable warnings) +$ git merge ipvs-next/master +Already up-to-date. +Merging wireless-drivers-next/master (ccfe1e853220 rtl8xxxu: Temporarily disable 8192eu device init) +$ git merge wireless-drivers-next/master +Already up-to-date. +Merging bluetooth/master (de06dbfa7861 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) +$ git merge bluetooth/master +Already up-to-date. +Merging mac80211-next/master (0a87cadbb54e nl80211: add feature for BSS selection support) +$ git merge mac80211-next/master +Auto-merging net/wireless/sme.c +Auto-merging net/wireless/nl80211.c +Auto-merging net/wireless/core.c +Auto-merging net/sctp/proc.c +Auto-merging net/netlink/af_netlink.c +Auto-merging net/mac80211/tx.c +Auto-merging net/mac80211/ieee80211_i.h +Auto-merging fs/gfs2/glock.c +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Auto-merging drivers/net/wireless/ath/ath10k/htt_rx.c +Merge made by the 'recursive' strategy. + Documentation/networking/mac80211-injection.txt | 17 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 2 +- + drivers/net/wireless/ath/wcn36xx/txrx.c | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 5 + + fs/gfs2/glock.c | 4 +- + include/linux/rhashtable.h | 3 +- + include/net/cfg80211.h | 36 + + include/net/mac80211.h | 13 +- + include/uapi/linux/nl80211.h | 56 +- + lib/rhashtable.c | 6 +- + lib/test_rhashtable.c | 2 +- + net/ipv6/ila/ila_xlat.c | 3 +- + net/mac80211/cfg.c | 4 +- + net/mac80211/chan.c | 4 +- + net/mac80211/driver-ops.h | 15 + + net/mac80211/ieee80211_i.h | 9 + + net/mac80211/mesh.c | 12 +- + net/mac80211/mesh.h | 38 +- + net/mac80211/mesh_pathtbl.c | 950 ++++++++---------------- + net/mac80211/scan.c | 8 +- + net/mac80211/sta_info.c | 9 +- + net/mac80211/tdls.c | 40 +- + net/mac80211/trace.h | 12 + + net/mac80211/tx.c | 44 +- + net/mac80211/util.c | 5 +- + net/mac80211/vht.c | 30 +- + net/mac80211/wpa.c | 26 +- + net/netfilter/nft_hash.c | 4 +- + net/netlink/af_netlink.c | 3 +- + net/rfkill/core.c | 36 +- + net/sctp/proc.c | 3 +- + net/wireless/core.c | 7 + + net/wireless/nl80211.c | 117 +++ + net/wireless/scan.c | 2 + + net/wireless/sme.c | 2 + + 35 files changed, 792 insertions(+), 737 deletions(-) +Merging rdma/for-next (520a07bff6fb Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6) +$ git merge rdma/for-next +Already up-to-date. +Merging mtd/master (9df4f913eb39 MAINTAINERS: add a maintainer for the NAND subsystem) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (6871c1b96de8 mtd: nand: remove kerneldoc for removed function parameter) +$ git merge l2-mtd/master +Auto-merging fs/jffs2/gc.c +Auto-merging drivers/staging/mt29f_spinand/mt29f_spinand.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/atmel-nand.txt | 31 +- + .../devicetree/bindings/mtd/fsl-quadspi.txt | 5 +- + .../devicetree/bindings/mtd/qcom_nandc.txt | 86 + + arch/arm/plat-samsung/devs.c | 9 - + arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 2 - + drivers/memory/fsl_ifc.c | 2 +- + drivers/mtd/Kconfig | 2 +- + drivers/mtd/bcm47xxpart.c | 42 +- + drivers/mtd/bcm63xxpart.c | 182 +- + drivers/mtd/devices/docg3.c | 5 +- + drivers/mtd/devices/mtdram.c | 5 +- + drivers/mtd/mtdpart.c | 5 +- + drivers/mtd/mtdswap.c | 24 +- + drivers/mtd/nand/Kconfig | 10 + + drivers/mtd/nand/Makefile | 1 + + drivers/mtd/nand/atmel_nand.c | 89 +- + drivers/mtd/nand/atmel_nand_ecc.h | 9 +- + drivers/mtd/nand/atmel_nand_nfc.h | 3 +- + drivers/mtd/nand/brcmnand/brcmnand.c | 42 +- + drivers/mtd/nand/cafe_nand.c | 2 +- + drivers/mtd/nand/diskonchip.c | 2 +- + drivers/mtd/nand/docg4.c | 3 +- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 73 +- + drivers/mtd/nand/hisi504_nand.c | 1 - + drivers/mtd/nand/jz4740_nand.c | 3 - + drivers/mtd/nand/lpc32xx_mlc.c | 2 +- + drivers/mtd/nand/mpc5121_nfc.c | 7 +- + drivers/mtd/nand/nand_base.c | 78 +- + drivers/mtd/nand/nand_bbt.c | 2 - + drivers/mtd/nand/nand_bch.c | 27 +- + drivers/mtd/nand/nand_ids.c | 4 +- + drivers/mtd/nand/nuc900_nand.c | 2 +- + drivers/mtd/nand/omap2.c | 28 +- + drivers/mtd/nand/plat_nand.c | 1 - + drivers/mtd/nand/pxa3xx_nand.c | 191 +- + drivers/mtd/nand/qcom_nandc.c | 2223 ++++++++++++++++++++ + drivers/mtd/nand/s3c2410.c | 3 - + drivers/mtd/nand/sunxi_nand.c | 287 ++- + drivers/mtd/nand/vf610_nfc.c | 2 - + drivers/mtd/onenand/onenand_base.c | 32 +- + drivers/mtd/onenand/onenand_bbt.c | 5 +- + drivers/mtd/spi-nor/Kconfig | 3 +- + drivers/mtd/spi-nor/fsl-quadspi.c | 167 +- + drivers/mtd/spi-nor/mtk-quadspi.c | 4 +- + drivers/mtd/spi-nor/spi-nor.c | 246 ++- + drivers/mtd/tests/oobtest.c | 49 +- + drivers/staging/mt29f_spinand/mt29f_spinand.c | 1 - + drivers/staging/mt29f_spinand/mt29f_spinand.h | 1 - + fs/jffs2/gc.c | 64 +- + fs/jffs2/jffs2_fs_sb.h | 2 +- + fs/jffs2/nodemgmt.c | 4 +- + fs/jffs2/wbuf.c | 6 +- + include/linux/mtd/bbm.h | 1 - + include/linux/mtd/inftl.h | 1 - + include/linux/mtd/map.h | 7 +- + include/linux/mtd/mtd.h | 6 +- + include/linux/mtd/nand.h | 10 +- + include/linux/mtd/nand_bch.h | 8 +- + include/linux/mtd/nftl.h | 1 - + include/linux/mtd/spi-nor.h | 2 + + include/linux/platform_data/mtd-nand-s3c2410.h | 1 - + 61 files changed, 3524 insertions(+), 592 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/qcom_nandc.txt + create mode 100644 drivers/mtd/nand/qcom_nandc.c +Merging crypto/master (34074205bb9f crypto: qat - remove redundant arbiter configuration) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (568d7c764ae0 drm/amdgpu: release_pages requires linux/pagemap.h) +$ git merge drm/drm-next +Already up-to-date. +Merging drm-panel/drm/panel/for-next (c8a3b2ae0713 drm/bridge: Make (pre/post) enable/disable callbacks optional) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (94669e6ba1ad drm/i915: Handle -EDEADLK in drm_atomic_commit from load-detect.) +$ git merge drm-intel/for-linux-next +Already up-to-date. +Merging drm-tegra/drm/tegra/for-next (341917fe2b62 gpu: host1x: Use a signed return type for do_relocs()) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/topic/drm-misc (b47bcb93bbf2 dma-buf/fence: fix fence_is_later v2) +$ git merge drm-misc/topic/drm-misc +Auto-merging include/linux/fence.h +Auto-merging drivers/staging/android/ion/ion.c +Auto-merging drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Auto-merging drivers/gpu/drm/drm_atomic.c +Merge made by the 'recursive' strategy. + Documentation/dma-buf-sharing.txt | 11 ++++++----- + drivers/dma-buf/dma-buf.c | 19 ++++++++++++------- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 2 +- + drivers/gpu/drm/drm_atomic.c | 1 - + drivers/gpu/drm/drm_atomic_helper.c | 14 ++++++++------ + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 15 +++++---------- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 5 +++-- + drivers/gpu/drm/udl/udl_fb.c | 4 ++-- + drivers/staging/android/ion/ion.c | 6 ++++-- + include/linux/dma-buf.h | 6 +++--- + include/linux/fence.h | 2 +- + 11 files changed, 45 insertions(+), 40 deletions(-) +Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid) +$ git merge drm-exynos/exynos-drm/for-next +Already up-to-date. +Merging drm-msm/msm-next (fcda50c8f484 drm/msm: rename hdmi symbols) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging hdlcd/for-upstream/hdlcd (8bb912e606b7 arm64: Juno: Add HDLCD support to the Juno boards.) +$ git merge hdlcd/for-upstream/hdlcd +Resolved 'arch/arm64/boot/dts/arm/juno-base.dtsi' using previous resolution. +Auto-merging arch/arm64/boot/dts/arm/juno-base.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/arm/juno-base.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e7da38c9ca32] Merge remote-tracking branch 'hdlcd/for-upstream/hdlcd' +$ git diff -M --stat --summary HEAD^.. +Merging drm-vc4/drm-vc4-next (90d7116061f8 drm/vc4: Recognize a more specific compatible string for V3D.) +$ git merge drm-vc4/drm-vc4-next +Already up-to-date. +Merging kbuild/for-next (2468fc97cc45 Merge branch 'kbuild/kbuild' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging scripts/link-vmlinux.sh +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 3 + + include/linux/compiler-clang.h | 5 + + scripts/Kbuild.include | 6 +- + scripts/Makefile.dtbinst | 2 - + scripts/basic/fixdep.c | 6 +- + scripts/coccinelle/api/pm_runtime.cocci | 2 +- + scripts/coccinelle/api/setup_timer.cocci | 199 ++++++++++++++++++++++ + scripts/coccinelle/iterators/use_after_iter.cocci | 2 +- + scripts/coccinelle/misc/array_size.cocci | 2 +- + scripts/coccinelle/misc/badty.cocci | 2 +- + scripts/coccinelle/misc/bugon.cocci | 2 +- + scripts/kconfig/Makefile | 4 +- + scripts/kconfig/confdata.c | 12 +- + scripts/link-vmlinux.sh | 7 +- + scripts/package/mkspec | 13 +- + scripts/tags.sh | 2 + + 16 files changed, 245 insertions(+), 24 deletions(-) + create mode 100644 scripts/coccinelle/api/setup_timer.cocci +Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too) +$ git merge kconfig/for-next +Already up-to-date. +Merging regmap/for-next (46a1026cc1a0 Merge remote-tracking branches 'regmap/fix/be' and 'regmap/fix/doc' into regmap-linus) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regmap/regmap.txt | 59 +++++++--------------- + drivers/base/regmap/regmap-mmio.c | 2 +- + 2 files changed, 20 insertions(+), 41 deletions(-) +Merging sound/for-next (91d2178e26fd ALSA: timer: fix gparams ioctl compatibility for different architectures) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (0a63eacf2fab Merge remote-tracking branches 'asoc/fix/cs35l32', 'asoc/fix/rt5616' and 'asoc/fix/rt5640' into asoc-linus) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + sound/hda/ext/hdac_ext_stream.c | 5 ++--- + sound/soc/codecs/Kconfig | 1 + + sound/soc/codecs/cs35l32.c | 17 +++++++++++++---- + sound/soc/codecs/rt5640.c | 2 +- + sound/soc/codecs/rt5640.h | 36 +++++++++++++++++------------------ + sound/soc/intel/Kconfig | 1 - + sound/soc/intel/skylake/skl-sst-dsp.c | 5 +++++ + sound/soc/intel/skylake/skl.c | 17 ++++++++++------- + sound/soc/soc-dapm.c | 7 +++++++ + 9 files changed, 57 insertions(+), 34 deletions(-) +Merging modules/modules-next (b37a05c083c8 Merge branch 'akpm' (patches from Andrew)) +$ git merge modules/modules-next +Already up-to-date. +Merging input/next (82be788c96ed Input: synaptics - handle spurious release of trackstick buttons, again) +$ git merge input/next +Merge made by the 'recursive' strategy. + drivers/input/misc/ims-pcu.c | 4 + + drivers/input/mouse/byd.c | 565 +++++++++++++++++++++----------- + drivers/input/mouse/psmouse-base.c | 2 +- + drivers/input/mouse/synaptics.c | 5 +- + drivers/input/rmi4/rmi_driver.c | 5 +- + drivers/input/touchscreen/melfas_mip4.c | 28 +- + 6 files changed, 405 insertions(+), 204 deletions(-) +Merging block/for-next (258b83ad9930 Merge branch 'for-linus' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. + block/blk-mq-sysfs.c | 6 ++- + block/blk-mq.c | 3 +- + drivers/block/mtip32xx/mtip32xx.c | 4 +- + drivers/block/null_blk.c | 3 +- + drivers/lightnvm/core.c | 7 +++ + drivers/lightnvm/gennvm.c | 84 ++++++++++++++++++++++++++++- + drivers/lightnvm/gennvm.h | 6 +++ + drivers/lightnvm/rrpc.c | 109 +++++++++++++++++++++++++++----------- + drivers/lightnvm/rrpc.h | 1 + + drivers/nvme/host/lightnvm.c | 17 +++++- + drivers/nvme/host/pci.c | 24 +++++---- + fs/fs-writeback.c | 37 ++++++++----- + include/linux/blk-mq.h | 14 ----- + include/linux/lightnvm.h | 14 +++++ + 14 files changed, 251 insertions(+), 78 deletions(-) +Merging device-mapper/for-next (98dbc9c6c616 dm: fix rq_end_stats() NULL pointer in dm_requeue_original_request()) +$ git merge device-mapper/for-next +Already up-to-date. +Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc-uh/next (64e5cd723120 mmc: sdhci-of-at91: fix wake-up issue when using runtime pm) +$ git merge mmc-uh/next +Already up-to-date. +Merging md/for-next (de24075022dc md: fix a trivial typo in comments) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/md.c | 2 +- + drivers/md/raid1.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging mfd/for-mfd-next (0343b2f4e4a5 mfd: intel-lpss: Pass I2C configuration via properties on BXT) +$ git merge mfd/for-mfd-next +Already up-to-date. +Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/master (0df6e32b0e36 power: pm2301-charger: use __maybe_unused to hide pm functions) +$ git merge battery/master +Already up-to-date. +Merging omap_dss2/for-next (32ad61951574 video: fbdev: sis: remove unused variable) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (7e89db5db77f Merge remote-tracking branches 'regulator/fix/constrain' and 'regulator/fix/gpio' into regulator-linus) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/core.c | 32 +++++++++++++++++++++++++------- + drivers/regulator/gpio-regulator.c | 2 ++ + drivers/regulator/of_regulator.c | 6 ++---- + 3 files changed, 29 insertions(+), 11 deletions(-) +Merging security/next (88a1b564a20e Merge tag 'keys-next-20160303' 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 (95ee08fa373b ima: require signed IMA policy) +$ git merge integrity/next +Already up-to-date. +Merging keys/keys-next (88a1b564a20e Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next) +$ git merge keys/keys-next +Already up-to-date. +Merging selinux/next (88a1b564a20e Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next) +$ git merge selinux/next +Already up-to-date. +Merging tpmdd/next (59f95b842ad0 Merge branch 'master' into next) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/st33zp24/Kconfig | 11 +- + drivers/char/tpm/st33zp24/i2c.c | 76 +++++++++--- + drivers/char/tpm/st33zp24/spi.c | 190 +++++++++++++++++------------ + drivers/char/tpm/st33zp24/st33zp24.c | 2 +- + drivers/char/tpm/st33zp24/st33zp24.h | 2 +- + drivers/char/tpm/tpm-chip.c | 214 +++++++++++++++++++++++---------- + drivers/char/tpm/tpm-dev.c | 15 ++- + drivers/char/tpm/tpm-interface.c | 50 ++++---- + drivers/char/tpm/tpm-sysfs.c | 11 +- + drivers/char/tpm/tpm.h | 25 ++-- + drivers/char/tpm/tpm2-cmd.c | 8 +- + drivers/char/tpm/tpm_atmel.c | 14 +-- + drivers/char/tpm/tpm_eventlog.c | 2 +- + drivers/char/tpm/tpm_eventlog.h | 4 +- + drivers/char/tpm/tpm_i2c_atmel.c | 16 +-- + drivers/char/tpm/tpm_i2c_infineon.c | 6 +- + drivers/char/tpm/tpm_i2c_nuvoton.c | 24 ++-- + drivers/char/tpm/tpm_infineon.c | 22 ++-- + drivers/char/tpm/tpm_nsc.c | 20 +-- + drivers/char/tpm/tpm_tis.c | 18 +-- + include/linux/platform_data/st33zp24.h | 2 +- + 21 files changed, 458 insertions(+), 274 deletions(-) +Merging watchdog/master (d1ed3ba4e3d7 watchdog: Ensure that wdd is not dereferenced if NULL) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (70cf769c5ba2 Merge branches 'arm/rockchip', 'arm/exynos', 'arm/smmu', 'arm/mediatek', 'arm/io-pgtable', 'arm/renesas' and 'core' into next) +$ git merge iommu/next +Already up-to-date. +Merging dwmw2-iommu/master (46924008273e iommu/vt-d: Clear PPR bit to ensure we get more page request interrupts) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (c4aec3101319 vfio/pci: return -EFAULT if copy_to_user fails) +$ git merge vfio/next +Already up-to-date. +Merging jc_docs/docs-next (abfa6cd8cda7 modsign: Fix documentation on module signing enforcement parameter.) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (d00cd819d7df drivers/rtc: broken link fix) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (fd97646b0595 audit: Fix typo in comment) +$ git merge audit/next +Already up-to-date. +Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (5027e19db8ce of: Add vendor prefix for eGalax_eMPIA Technology Inc) +$ git merge dt-rh/for-next +Already up-to-date. +Merging mailbox/mailbox-for-next (aace66b170ce mailbox: Introduce TI message manager driver) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (78b5a17c35bd Merge remote-tracking branches 'spi/fix/omap2' and 'spi/fix/rockchip' into spi-linus) +$ git merge spi/for-next +Auto-merging drivers/spi/spi-rockchip.c +Merge made by the 'recursive' strategy. + drivers/spi/spi-imx.c | 16 +++++++++-- + drivers/spi/spi-omap2-mcspi.c | 62 ++++++++++++------------------------------- + drivers/spi/spi-rockchip.c | 2 +- + drivers/spi/spi.c | 4 +-- + 4 files changed, 34 insertions(+), 50 deletions(-) +Merging tip/auto-latest (e05968d2e5ab Merge branch 'sched/urgent') +$ git merge tip/auto-latest +Resolved 'arch/x86/Kconfig' using previous resolution. +Resolved 'kernel/sched/sched.h' using previous resolution. +Auto-merging kernel/sched/sched.h +CONFLICT (content): Merge conflict in kernel/sched/sched.h +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/cpuacct.c +Auto-merging kernel/sched/core.c +Auto-merging include/linux/perf_event.h +Auto-merging arch/x86/xen/xen-head.S +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/mmu.c +Auto-merging arch/x86/kernel/process_64.c +Auto-merging arch/x86/include/asm/ftrace.h +Auto-merging arch/x86/events/core.c +Auto-merging arch/x86/Kconfig +CONFLICT (content): Merge conflict in arch/x86/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fad6ea2fe037] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + .../interrupt-controller/hisilicon,mbigen-v2.txt | 22 +- + Documentation/memory-barriers.txt | 141 +++++-- + arch/x86/Kconfig | 9 + + arch/x86/entry/vdso/vclock_gettime.c | 2 +- + arch/x86/events/Makefile | 1 + + arch/x86/events/amd/ibs.c | 37 +- + arch/x86/events/amd/iommu.c | 5 + + arch/x86/events/amd/power.c | 353 ++++++++++++++++ + arch/x86/events/core.c | 4 +- + arch/x86/events/intel/cqm.c | 454 +++++++++++++++++++-- + arch/x86/events/intel/ds.c | 5 +- + arch/x86/events/intel/lbr.c | 2 +- + arch/x86/events/intel/rapl.c | 2 + + arch/x86/events/intel/uncore_snbep.c | 7 +- + arch/x86/events/perf_event.h | 2 +- + arch/x86/include/asm/apic.h | 2 +- + arch/x86/include/asm/cpufeatures.h | 4 +- + arch/x86/include/asm/ftrace.h | 2 +- + arch/x86/include/asm/hw_irq.h | 15 +- + arch/x86/include/asm/rwsem.h | 2 +- + arch/x86/include/asm/string_64.h | 4 +- + arch/x86/include/asm/xen/hypervisor.h | 2 + + arch/x86/kernel/acpi/boot.c | 4 +- + arch/x86/kernel/apb_timer.c | 2 +- + arch/x86/kernel/apic/apic.c | 2 +- + arch/x86/kernel/apic/vector.c | 88 +++- + arch/x86/kernel/apic/x2apic_uv_x.c | 5 +- + arch/x86/kernel/apm_32.c | 2 +- + arch/x86/kernel/cpu/amd.c | 20 +- + arch/x86/kernel/cpu/common.c | 8 +- + arch/x86/kernel/cpu/mtrr/generic.c | 2 +- + arch/x86/kernel/early_printk.c | 2 +- + arch/x86/kernel/fpu/regset.c | 2 +- + arch/x86/kernel/hpet.c | 2 +- + arch/x86/kernel/ioport.c | 12 +- + arch/x86/kernel/kexec-bzimage64.c | 2 +- + arch/x86/kernel/kgdb.c | 4 +- + arch/x86/kernel/kvmclock.c | 2 +- + arch/x86/kernel/process_64.c | 12 + + arch/x86/kernel/smpboot.c | 27 +- + arch/x86/kernel/tsc.c | 8 +- + arch/x86/kvm/mmu.c | 4 +- + arch/x86/kvm/vmx.c | 4 +- + arch/x86/kvm/x86.c | 2 +- + arch/x86/lib/memcpy_64.S | 7 +- + arch/x86/lib/memset_64.S | 2 +- + arch/x86/mm/mpx.c | 4 +- + arch/x86/mm/pat.c | 2 +- + arch/x86/oprofile/nmi_int.c | 3 +- + .../intel-mid/device_libs/platform_bma023.c | 2 +- + .../intel-mid/device_libs/platform_emc1403.c | 2 +- + .../intel-mid/device_libs/platform_gpio_keys.c | 2 +- + .../intel-mid/device_libs/platform_lis331.c | 2 +- + .../intel-mid/device_libs/platform_max7315.c | 2 +- + .../intel-mid/device_libs/platform_mpu3050.c | 2 +- + .../platform/intel-mid/device_libs/platform_msic.c | 2 +- + .../intel-mid/device_libs/platform_msic_audio.c | 2 +- + .../intel-mid/device_libs/platform_msic_battery.c | 2 +- + .../intel-mid/device_libs/platform_msic_gpio.c | 2 +- + .../intel-mid/device_libs/platform_msic_ocd.c | 2 +- + .../device_libs/platform_msic_power_btn.c | 2 +- + .../intel-mid/device_libs/platform_msic_thermal.c | 2 +- + .../intel-mid/device_libs/platform_pmic_gpio.c | 2 +- + .../intel-mid/device_libs/platform_tc35876x.c | 2 +- + .../intel-mid/device_libs/platform_tca6416.c | 2 +- + arch/x86/purgatory/stack.S | 2 +- + arch/x86/video/fbdev.c | 18 +- + arch/x86/xen/enlighten.c | 2 +- + arch/x86/xen/mmu.c | 8 +- + arch/x86/xen/xen-head.S | 2 +- + drivers/irqchip/irq-mbigen.c | 38 +- + drivers/irqchip/irq-tegra.c | 14 +- + include/asm-generic/bitops/lock.h | 14 +- + include/linux/perf_event.h | 5 + + kernel/events/core.c | 114 ++++-- + kernel/events/ring_buffer.c | 6 +- + kernel/sched/core.c | 36 +- + kernel/sched/cpuacct.c | 35 +- + kernel/sched/cpuacct.h | 4 +- + kernel/sched/fair.c | 39 +- + kernel/sched/sched.h | 13 + + tools/testing/selftests/x86/Makefile | 2 +- + tools/testing/selftests/x86/iopl.c | 135 ++++++ + 83 files changed, 1517 insertions(+), 313 deletions(-) + create mode 100644 arch/x86/events/amd/power.c + create mode 100644 tools/testing/selftests/x86/iopl.c +Merging clockevents/clockevents/next (23cb25d0f407 clocksource/drivers/arm_global_timer: Register delay timer) +$ git merge clockevents/clockevents/next +Resolved 'drivers/clocksource/Kconfig' using previous resolution. +Auto-merging drivers/clocksource/Kconfig +CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 30badb232523] Merge remote-tracking branch 'clockevents/clockevents/next' +$ git diff -M --stat --summary HEAD^.. +Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (7cc5a5d3cd4c ARM: socfpga: Enable OCRAM ECC on startup) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ftrace/for-next (741f3a69f101 tracing: Remove redundant reset per-CPU buff in irqsoff tracer) +$ git merge ftrace/for-next +Auto-merging kernel/trace/trace_syscalls.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/ftrace.c +Auto-merging include/trace/events/kmem.h +Auto-merging include/linux/trace_events.h +Auto-merging arch/x86/kernel/ftrace.c +Merge made by the 'recursive' strategy. + arch/x86/kernel/ftrace.c | 2 +- + include/linux/trace_events.h | 7 ++- + include/trace/events/kmem.h | 42 ++----------- + include/trace/events/tlb.h | 4 +- + include/trace/events/writeback.h | 121 ++++++++++++++---------------------- + kernel/trace/ftrace.c | 41 ++++++------ + kernel/trace/trace.c | 35 ++++++----- + kernel/trace/trace.h | 112 ++++++++++++++++++++++++++------- + kernel/trace/trace_events_filter.c | 12 ---- + kernel/trace/trace_events_trigger.c | 88 +++++++++++++++----------- + kernel/trace/trace_functions.c | 6 ++ + kernel/trace/trace_irqsoff.c | 9 ++- + kernel/trace/trace_nop.c | 4 +- + kernel/trace/trace_syscalls.c | 11 ++++ + 14 files changed, 265 insertions(+), 229 deletions(-) +Merging rcu/rcu/next (7220b7742659 locktorture: Fix nil pointer dereferencing for cleanup paths) +$ git merge rcu/rcu/next +Merge made by the 'recursive' strategy. + kernel/locking/locktorture.c | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) +Merging kvm/linux-next (a6adb106225f KVM: page_track: fix access to NULL slot) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (b40c4892d175 arm64: KVM: vgic-v3: Only wipe LRs on vcpu exit) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvm-ppc-paulus/kvm-ppc-next (58ded4201ff0 KVM: PPC: Add support for 64bit TCE windows) +$ git merge kvm-ppc-paulus/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (c54f0d6ae057 KVM: s390: allocate only one DMA page per VM) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (e01dc539df3a drivers/xen: make platform-pci.c explicitly non-modular) +$ git merge xen-tip/linux-next +Already up-to-date. +Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (22aceb317678 workqueue: Fix comment for work_on_cpu()) +$ git merge workqueues/for-next +Already up-to-date. +Merging drivers-x86/for-next (fffcad87d4e7 hp-wmi: Remove GPS rfkill support via pre-2009 interface) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/intel-hid.c +Auto-merging drivers/leds/Kconfig +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-driver-toshiba_acpi | 16 + + drivers/leds/Kconfig | 1 + + drivers/leds/dell-led.c | 126 +------ + drivers/platform/x86/Kconfig | 15 +- + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/alienware-wmi.c | 286 +++++++++++++--- + drivers/platform/x86/asus-nb-wmi.c | 9 + + drivers/platform/x86/dell-laptop.c | 370 ++++++--------------- + drivers/platform/x86/dell-rbtn.c | 15 + + drivers/platform/x86/dell-smbios.c | 193 +++++++++++ + drivers/platform/x86/dell-smbios.h | 46 +++ + drivers/platform/x86/dell-wmi.c | 238 +++++++++++-- + drivers/platform/x86/fujitsu-laptop.c | 8 +- + drivers/platform/x86/hp-wmi.c | 46 +-- + drivers/platform/x86/ideapad-laptop.c | 14 + + drivers/platform/x86/intel-hid.c | 3 +- + drivers/platform/x86/intel_pmc_ipc.c | 8 +- + drivers/platform/x86/intel_scu_ipc.c | 35 +- + drivers/platform/x86/intel_telemetry_pltdrv.c | 13 +- + drivers/platform/x86/thinkpad_acpi.c | 4 +- + drivers/platform/x86/toshiba_acpi.c | 115 +++++++ + 21 files changed, 1026 insertions(+), 536 deletions(-) + create mode 100644 drivers/platform/x86/dell-smbios.c + create mode 100644 drivers/platform/x86/dell-smbios.h +Merging chrome-platform/for-next (1dc318166a9a platform/chrome: use to_platform_device()) +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. + drivers/platform/chrome/chromeos_laptop.c | 15 ++++++++ + drivers/platform/chrome/chromeos_pstore.c | 55 ++++++++++++++++++++++++++++-- + drivers/platform/chrome/cros_ec_lightbar.c | 3 +- + 3 files changed, 69 insertions(+), 4 deletions(-) +Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (7296c33ed12e leds: triggers: simplify led_trigger_store) +$ git merge leds/for-next +Already up-to-date. +Merging ipmi/for-next (42a018c63aee ipmi: do not probe ACPI devices if si_tryacpi is unset) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. +Merging driver-core/driver-core-next (112d125a8947 Revert "driver-core: platform: probe of-devices only using list of compatibles") +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (a95fc9c8e576 serial: 8250: describe CONFIG_SERIAL_8250_RSA) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (6b5f04b6cf8e Merge branch 'for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (0561f77e2db9 usb: gadget: f_acm: Fix configfs attr name) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (7084fa868b50 USB: serial: cp210x: add new access functions for large registers) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (01b8479400ab usb: chipidea: imx: avoid EPROBE_DEFER printed as error) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. +Merging staging/staging-next (01cde1538e1d Merge tag 'nfs-for-4.6-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs) +$ git merge staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (5cd0911a9e0e Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging extcon/extcon-next (ae64e42cc2b3 extcon: palmas: Drop IRQF_EARLY_RESUME flag) +$ git merge extcon/extcon-next +Already up-to-date. +Merging cgroup/for-next (08fb4e7f8d5f Merge branch 'for-4.6' into for-next) +$ git merge cgroup/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (fd30a352d56b Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/qla2xxx/qla_target.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 3 + + drivers/scsi/device_handler/scsi_dh_alua.c | 2 +- + drivers/scsi/fnic/fnic_scsi.c | 13 +- + drivers/scsi/lpfc/lpfc_init.c | 5 +- + drivers/scsi/megaraid/megaraid_sas.h | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 17 +- + drivers/scsi/qla2xxx/qla_target.c | 16 +- + drivers/scsi/scsi_common.c | 12 +- + drivers/scsi/scsi_sas_internal.h | 2 +- + drivers/scsi/scsi_sysfs.c | 2 +- + drivers/scsi/scsi_transport_sas.c | 2 + + drivers/scsi/ufs/Kconfig | 1 + + drivers/scsi/ufs/ufs-qcom.c | 155 +++- + drivers/scsi/ufs/ufs-qcom.h | 9 + + drivers/scsi/ufs/ufs.h | 33 + + drivers/scsi/ufs/ufs_quirks.h | 151 ++++ + drivers/scsi/ufs/ufshcd-pltfrm.c | 19 + + drivers/scsi/ufs/ufshcd.c | 818 ++++++++++++++++++--- + drivers/scsi/ufs/ufshcd.h | 40 +- + drivers/scsi/ufs/ufshci.h | 4 + + drivers/scsi/ufs/unipro.h | 22 + + include/scsi/scsi_transport_fc.h | 15 +- + 22 files changed, 1177 insertions(+), 166 deletions(-) + create mode 100644 drivers/scsi/ufs/ufs_quirks.h +Merging target-updates/for-next (5e47f1985d71 target: Fix target_release_cmd_kref shutdown comp leak) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) +$ git merge target-merge/for-next-merge +Resolved 'drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h' using previous resolution. +Auto-merging drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h +CONFLICT (content): Merge conflict in drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h +Auto-merging drivers/net/ethernet/chelsio/cxgb4/t4_msg.h +Auto-merging drivers/net/ethernet/chelsio/cxgb4/sge.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a84669b56e94] Merge remote-tracking branch 'target-merge/for-next-merge' +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/hw/cxgb4/t4fw_ri_api.h | 99 ----- + drivers/net/ethernet/chelsio/Kconfig | 11 + + drivers/net/ethernet/chelsio/cxgb4/Makefile | 1 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 27 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 34 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 97 ++++- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ppm.c | 464 +++++++++++++++++++++ + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ppm.h | 310 ++++++++++++++ + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 11 + + drivers/net/ethernet/chelsio/cxgb4/l2t.c | 2 - + drivers/net/ethernet/chelsio/cxgb4/l2t.h | 2 + + drivers/net/ethernet/chelsio/cxgb4/sge.c | 13 +- + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 217 ++++++++++ + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 8 +- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.h | 17 - + 15 files changed, 1174 insertions(+), 139 deletions(-) + create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_ppm.c + create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_ppm.h +Merging pinctrl/for-next (3c177a166253 pinctrl: single: Use a separate lockdep class) +$ git merge pinctrl/for-next +Already up-to-date. +Merging vhost/linux-next (c67f5db82027 virtio_net: replace netdev_alloc_skb_ip_align() with napi_alloc_skb()) +$ git merge vhost/linux-next +Already up-to-date. +Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias) +$ git merge remoteproc/for-next +Merge made by the 'recursive' strategy. +Merging rpmsg/for-next (0f32cd8e8555 remoteproc: st: fix check of syscon_regmap_lookup_by_phandle() return value) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + drivers/remoteproc/st_remoteproc.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging gpio/for-next (968f3e374faf Merge branch 'for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) +$ git merge gpio/for-next +Already up-to-date. +Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (77fe47fbb3b7 pwm: omap-dmtimer: Add debug message for effective period and duty cycle) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + drivers/pwm/Kconfig | 2 +- + drivers/pwm/pwm-brcmstb.c | 4 +-- + drivers/pwm/pwm-img.c | 5 +++ + drivers/pwm/pwm-lpc18xx-sct.c | 5 +++ + drivers/pwm/pwm-omap-dmtimer.c | 74 +++++++++++++++++++++++++++++++++--------- + 5 files changed, 71 insertions(+), 19 deletions(-) +Merging dma-buf/for-next (8f496d3fcc9d dma-buf/fence: fix fence_is_later v2) +$ git merge dma-buf/for-next +Merge made by the 'recursive' strategy. +Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (b953c0d234bc Linux 4.1) +$ git merge ktest/for-next +Already up-to-date. +Merging clk/clk-next (4d3ac6662452 clk: bcm2835: fix check of error code returned by devm_ioremap_resource()) +$ git merge clk/clk-next +Already up-to-date. +Merging aio/master (b562e44f507e Linux 4.5) +$ git merge aio/master +Already up-to-date. +Merging kselftest/next (6accd8e9bf22 selftests: media_dcevice_test fix usage information) +$ git merge kselftest/next +Already up-to-date. +Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval') +$ git merge y2038/y2038 +Merge made by the 'recursive' strategy. + drivers/scsi/qla2xxx/qla_mr.c | 5 ++--- + fs/afs/main.c | 6 ++---- + 2 files changed, 4 insertions(+), 7 deletions(-) +Merging luto-misc/next (afd2ff9b7e1b Linux 4.4) +$ git merge luto-misc/next +Already up-to-date. +Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2) +$ git merge borntraeger/linux-next +Already up-to-date. +Merging livepatching/for-next (fda0b150a173 Merge branch 'for-4.6/notifier-cleanup' into for-next) +$ git merge livepatching/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging coresight/next (f1e2c1b13dfa drivers/hwtracing: make coresight-etm-perf.c explicitly non-modular) +$ git merge coresight/next +Resolved 'drivers/hwtracing/coresight/coresight-etm3x.c' using previous resolution. +Auto-merging drivers/hwtracing/coresight/coresight-etm3x.c +CONFLICT (content): Merge conflict in drivers/hwtracing/coresight/coresight-etm3x.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0332e6fe50f3] Merge remote-tracking branch 'coresight/next' +$ git diff -M --stat --summary HEAD^.. +Merging rtc/rtc-next (f6161793a07f rtc: abx80x: handle the oscillator failure bit) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/maxim,mcp795.txt | 11 + + drivers/rtc/Kconfig | 2 +- + drivers/rtc/rtc-abx80x.c | 252 ++++++++++++++++++++- + drivers/rtc/rtc-asm9260.c | 4 +- + drivers/rtc/rtc-m41t80.c | 6 + + drivers/rtc/rtc-mcp795.c | 10 + + drivers/rtc/rtc-rv8803.c | 28 ++- + drivers/rtc/rtc-s3c.c | 19 +- + 8 files changed, 316 insertions(+), 16 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/maxim,mcp795.txt +Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) +$ git merge hwspinlock/for-next +Already up-to-date. +Merging nvdimm/libnvdimm-for-next (489011652a2d Merge branch 'for-4.6/pfn' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Already up-to-date. +Merging akpm-current/current (7302b9fc6490 ipc/msg.c: use freezable blocking call) +$ git merge --no-ff akpm-current/current +Auto-merging include/linux/sched.h +Merge made by the 'recursive' strategy. + Documentation/kasan.txt | 5 +- + Documentation/vm/ksm.txt | 63 ++ + arch/arm/include/asm/exception.h | 2 +- + arch/arm/include/asm/page.h | 2 + + arch/arm/kernel/vmlinux.lds.S | 1 + + arch/arm64/include/asm/exception.h | 2 +- + arch/arm64/kernel/vmlinux.lds.S | 1 + + arch/blackfin/kernel/vmlinux.lds.S | 1 + + arch/c6x/kernel/vmlinux.lds.S | 1 + + arch/metag/kernel/vmlinux.lds.S | 1 + + arch/microblaze/kernel/vmlinux.lds.S | 1 + + arch/mips/kernel/vmlinux.lds.S | 1 + + arch/nios2/kernel/vmlinux.lds.S | 1 + + arch/openrisc/kernel/vmlinux.lds.S | 1 + + arch/parisc/kernel/vmlinux.lds.S | 1 + + arch/powerpc/kernel/vmlinux.lds.S | 1 + + arch/s390/kernel/vmlinux.lds.S | 1 + + arch/sh/kernel/vmlinux.lds.S | 1 + + arch/sparc/kernel/vmlinux.lds.S | 1 + + arch/tile/kernel/vmlinux.lds.S | 1 + + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/machine_kexec_64.c | 46 ++ + arch/x86/kernel/vmlinux.lds.S | 1 + + block/genhd.c | 2 +- + drivers/input/input-compat.c | 6 +- + drivers/input/input-compat.h | 4 +- + drivers/input/input.c | 2 +- + drivers/input/misc/uinput.c | 4 +- + fs/ext4/fsync.c | 5 +- + fs/ocfs2/alloc.c | 105 ++-- + fs/ocfs2/aops.c | 1146 +++++++++++++++++----------------- + fs/ocfs2/aops.h | 19 +- + fs/ocfs2/cluster/heartbeat.c | 181 +++++- + fs/ocfs2/dlm/dlmconvert.c | 30 +- + fs/ocfs2/dlm/dlmrecovery.c | 1 - + fs/ocfs2/file.c | 165 +---- + fs/ocfs2/inode.c | 3 + + fs/ocfs2/inode.h | 6 +- + fs/ocfs2/journal.c | 8 +- + fs/ocfs2/localalloc.c | 4 +- + fs/ocfs2/mmap.c | 4 +- + fs/ocfs2/ocfs2.h | 8 + + fs/ocfs2/ocfs2_trace.h | 16 +- + fs/ocfs2/quota_global.c | 2 +- + fs/ocfs2/resize.c | 2 +- + fs/ocfs2/super.c | 39 +- + fs/ocfs2/super.h | 2 - + include/asm-generic/vmlinux.lds.h | 12 +- + include/linux/crc64_ecma.h | 56 ++ + include/linux/ftrace.h | 11 - + include/linux/interrupt.h | 20 + + include/linux/kasan.h | 63 +- + include/linux/kexec.h | 4 + + include/linux/mm.h | 2 + + include/linux/oom.h | 2 +- + include/linux/sched.h | 6 + + include/linux/sem.h | 1 + + include/linux/slab.h | 10 +- + include/linux/slab_def.h | 14 + + include/linux/slub_def.h | 11 + + include/linux/stackdepot.h | 32 + + include/linux/string.h | 1 + + include/linux/swap.h | 1 + + include/trace/events/huge_memory.h | 38 +- + ipc/msg.c | 5 +- + ipc/sem.c | 124 ++-- + kernel/exit.c | 2 +- + kernel/kexec.c | 119 ++-- + kernel/kexec_core.c | 6 + + kernel/kexec_file.c | 8 +- + kernel/softirq.c | 2 +- + kernel/time/timer.c | 11 + + kernel/trace/trace_functions_graph.c | 1 + + lib/Kconfig | 11 + + lib/Kconfig.kasan | 5 +- + lib/Makefile | 4 + + lib/crc64_ecma.c | 341 ++++++++++ + lib/stackdepot.c | 278 +++++++++ + lib/test_kasan.c | 59 +- + mm/Makefile | 1 + + mm/backing-dev.c | 20 +- + mm/huge_memory.c | 88 ++- + mm/internal.h | 9 + + mm/kasan/Makefile | 4 + + mm/kasan/kasan.c | 219 ++++++- + mm/kasan/kasan.h | 44 ++ + mm/kasan/quarantine.c | 289 +++++++++ + mm/kasan/report.c | 63 +- + mm/ksm.c | 733 ++++++++++++++++++++-- + mm/memblock.c | 3 + + mm/memory.c | 19 +- + mm/mempool.c | 23 +- + mm/oom_kill.c | 196 +++++- + mm/page_alloc.c | 124 +++- + mm/slab.c | 53 +- + mm/slab.h | 4 +- + mm/slab_common.c | 8 +- + mm/slub.c | 19 +- + mm/util.c | 30 + + mm/vmscan.c | 25 +- + 100 files changed, 3940 insertions(+), 1195 deletions(-) + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 include/linux/stackdepot.h + create mode 100644 lib/crc64_ecma.c + create mode 100644 lib/stackdepot.c + create mode 100644 mm/kasan/quarantine.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/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression +Applying: staging/goldfish: use 6-arg get_user_pages() +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 6fd8a6dadf7c...4ee0fe566b96 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (4ee0fe566b96 staging/goldfish: use 6-arg get_user_pages()) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +-- + drivers/platform/goldfish/goldfish_pipe.c | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) |