Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23992123AbcLWNRPX-ult/[email protected]> |
Author: Ralf Baechle <[email protected]> Thu Dec 22 11:15:06 2016 +0100 Commit: e3787f16f781756112eee3b1a2c7baa73159d203 Gitweb: https://git.linux-mips.org/g/ralf/linux/e3787f16f781 Branch: master --- Documentation/admin-guide/kernel-parameters.txt | 4 .../devicetree/bindings/mfd/altera-a10sr.txt | 46 + .../devicetree/bindings/mfd/qcom-pm8xxx.txt | 1 Documentation/devicetree/bindings/mfd/rn5t618.txt | 16 .../bindings/net/hisilicon-hix5hd2-gmac.txt | 13 Documentation/devicetree/bindings/net/phy.txt | 10 .../devicetree/bindings/regulator/tps65218.txt | 87 + .../features/io/dma-api-debug/arch-support.txt | 2 .../features/io/dma-contiguous/arch-support.txt | 2 Documentation/sphinx/rstFlatTable.py | 5 Documentation/virtual/kvm/locking.txt | 8 arch/Kconfig | 3 arch/arm/boot/dts/hisi-x5hd2.dtsi | 4 arch/arm64/include/asm/memory.h | 5 arch/arm64/kernel/setup.c | 8 arch/microblaze/include/asm/unistd.h | 2 arch/microblaze/include/uapi/asm/unistd.h | 6 arch/microblaze/kernel/cpu/cpuinfo.c | 6 arch/microblaze/kernel/syscall_table.S | 6 arch/microblaze/kernel/timer.c | 2 arch/parisc/Kconfig | 1 arch/parisc/include/asm/elf.h | 7 arch/parisc/include/asm/pdcpat.h | 2 arch/parisc/include/asm/processor.h | 4 arch/parisc/kernel/entry.S | 12 arch/parisc/kernel/firmware.c | 2 arch/parisc/kernel/inventory.c | 8 arch/parisc/kernel/perf.c | 5 arch/parisc/kernel/process.c | 6 arch/parisc/kernel/processor.c | 29 arch/parisc/kernel/sys_parisc.c | 18 arch/parisc/kernel/time.c | 112 -- arch/powerpc/Kconfig | 1 arch/powerpc/include/asm/ima.h | 29 arch/powerpc/include/asm/kexec.h | 15 arch/powerpc/kernel/Makefile | 4 arch/powerpc/kernel/ima_kexec.c | 223 +++ arch/powerpc/kernel/kexec_elf_64.c | 2 arch/powerpc/kernel/machine_kexec_file_64.c | 15 arch/powerpc/platforms/85xx/corenet_generic.c | 3 arch/x86/include/asm/kvm_host.h | 1 arch/x86/kvm/cpuid.c | 9 arch/x86/kvm/hyperv.c | 24 arch/x86/kvm/vmx.c | 13 arch/x86/kvm/x86.c | 18 arch/xtensa/Kconfig | 1 arch/xtensa/boot/dts/kc705.dts | 16 arch/xtensa/include/asm/Kbuild | 1 arch/xtensa/kernel/Makefile | 1 arch/xtensa/kernel/pci-dma.c | 21 arch/xtensa/kernel/s32c1i_selftest.c | 128 ++ arch/xtensa/kernel/setup.c | 137 -- arch/xtensa/mm/init.c | 2 drivers/firmware/dmi_scan.c | 4 drivers/gpio/gpio-tps65218.c | 3 drivers/i2c/busses/i2c-designware-platdrv.c | 31 drivers/i2c/busses/i2c-octeon-core.c | 4 drivers/i2c/busses/i2c-octeon-core.h | 21 drivers/i2c/busses/i2c-xgene-slimpro.c | 1 drivers/i2c/muxes/i2c-mux-mlxcpld.c | 24 drivers/i2c/muxes/i2c-mux-pca954x.c | 5 drivers/input/misc/tps65218-pwrbutton.c | 8 drivers/mailbox/bcm-pdc-mailbox.c | 548 +++++--- drivers/mailbox/mailbox-sti.c | 1 drivers/mailbox/mailbox-test.c | 92 + drivers/mfd/Kconfig | 26 drivers/mfd/Makefile | 1 drivers/mfd/ab3100-core.c | 39 - drivers/mfd/ab8500-core.c | 37 - drivers/mfd/ab8500-debugfs.c | 21 drivers/mfd/ab8500-gpadc.c | 19 drivers/mfd/ab8500-sysctrl.c | 9 drivers/mfd/abx500-core.c | 7 drivers/mfd/arizona-core.c | 1 drivers/mfd/arizona-irq.c | 8 drivers/mfd/axp20x-i2c.c | 7 drivers/mfd/axp20x.c | 4 drivers/mfd/bcm590xx.c | 2 drivers/mfd/cs47l24-tables.c | 6 drivers/mfd/davinci_voicecodec.c | 1 drivers/mfd/fsl-imx25-tsadc.c | 1 drivers/mfd/hi655x-pmic.c | 1 drivers/mfd/intel-lpss-pci.c | 1 drivers/mfd/intel_soc_pmic_bxtwc.c | 2 drivers/mfd/lpc_ich.c | 2 drivers/mfd/palmas.c | 3 drivers/mfd/qcom-pm8xxx.c | 231 +++ drivers/mfd/rk808.c | 23 drivers/mfd/rn5t618.c | 1 drivers/mfd/si476x-i2c.c | 2 drivers/mfd/sun4i-gpadc.c | 181 +++ drivers/mfd/tc3589x.c | 4 drivers/mfd/tps65217.c | 71 - drivers/mfd/tps65218.c | 34 drivers/mfd/tps65912-core.c | 17 drivers/mfd/wm5102-tables.c | 1412 ++++++++++---------- drivers/mfd/wm8994-core.c | 6 drivers/net/ethernet/Kconfig | 1 drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 6 drivers/net/ethernet/freescale/fman/Kconfig | 2 drivers/net/ethernet/freescale/fman/fman.c | 15 drivers/net/ethernet/freescale/fman/mac.c | 1 drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 13 .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 2 drivers/net/ethernet/sfc/Kconfig | 21 drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 4 drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 2 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 8 drivers/net/ethernet/ti/netcp_ethss.c | 24 drivers/net/phy/phy_device.c | 22 drivers/regulator/tps65218-regulator.c | 153 +- drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 1 drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.h | 1 drivers/scsi/qla2xxx/qla_isr.c | 1 drivers/target/iscsi/cxgbit/cxgbit_target.c | 1 drivers/target/iscsi/iscsi_target.c | 2 drivers/target/iscsi/iscsi_target.h | 12 drivers/target/iscsi/iscsi_target_auth.c | 2 drivers/target/iscsi/iscsi_target_auth.h | 5 drivers/target/iscsi/iscsi_target_configfs.c | 7 drivers/target/iscsi/iscsi_target_datain_values.c | 2 drivers/target/iscsi/iscsi_target_datain_values.h | 3 drivers/target/iscsi/iscsi_target_device.h | 3 drivers/target/iscsi/iscsi_target_erl0.h | 6 drivers/target/iscsi/iscsi_target_erl1.c | 1 drivers/target/iscsi/iscsi_target_erl1.h | 10 drivers/target/iscsi/iscsi_target_erl2.c | 1 drivers/target/iscsi/iscsi_target_erl2.h | 7 drivers/target/iscsi/iscsi_target_login.c | 2 drivers/target/iscsi/iscsi_target_login.h | 7 drivers/target/iscsi/iscsi_target_nego.c | 2 drivers/target/iscsi/iscsi_target_nego.h | 4 drivers/target/iscsi/iscsi_target_nodeattrib.h | 5 drivers/target/iscsi/iscsi_target_parameters.c | 2 drivers/target/iscsi/iscsi_target_parameters.h | 6 drivers/target/iscsi/iscsi_target_seq_pdu_list.h | 5 drivers/target/iscsi/iscsi_target_tmr.h | 6 drivers/target/iscsi/iscsi_target_tpg.c | 3 drivers/target/iscsi/iscsi_target_tpg.h | 9 drivers/target/iscsi/iscsi_target_transport.c | 1 drivers/target/iscsi/iscsi_target_util.c | 1 drivers/target/iscsi/iscsi_target_util.h | 8 drivers/target/loopback/tcm_loop.h | 4 drivers/target/sbp/sbp_target.c | 3 drivers/target/target_core_alua.c | 3 drivers/target/target_core_alua.h | 2 drivers/target/target_core_configfs.c | 4 drivers/target/target_core_device.c | 1 drivers/target/target_core_file.c | 1 drivers/target/target_core_file.h | 2 drivers/target/target_core_iblock.h | 3 drivers/target/target_core_internal.h | 5 drivers/target/target_core_pr.c | 5 drivers/target/target_core_pr.h | 4 drivers/target/target_core_pscsi.h | 7 drivers/target/target_core_rd.c | 2 drivers/target/target_core_rd.h | 4 drivers/target/target_core_sbc.c | 1 drivers/target/target_core_ua.h | 2 drivers/target/target_core_user.c | 5 drivers/target/target_core_xcopy.c | 1 drivers/target/target_core_xcopy.h | 2 drivers/target/tcm_fc/tcm_fc.h | 3 drivers/usb/gadget/function/f_tcm.c | 2 fs/ext2/inode.c | 4 fs/nfs/dir.c | 23 fs/nfs/file.c | 12 fs/nfs/filelayout/filelayoutdev.c | 3 fs/nfs/flexfilelayout/flexfilelayout.c | 6 fs/nfs/flexfilelayout/flexfilelayoutdev.c | 2 fs/nfs/inode.c | 75 + fs/nfs/internal.h | 1 fs/nfs/nfs4proc.c | 43 - fs/nfs/nfs4state.c | 57 - fs/nfs/nfs4xdr.c | 37 - fs/nfs/pnfs.c | 16 fs/notify/inode_mark.c | 45 - fs/ocfs2/quota_global.c | 10 fs/ocfs2/quota_local.c | 11 fs/ocfs2/super.c | 1 fs/quota/dquot.c | 136 +- fs/quota/quota.c | 22 fs/splice.c | 9 fs/super.c | 81 + include/dt-bindings/net/mdio.h | 19 include/linux/configfs.h | 13 include/linux/fs.h | 2 include/linux/ima.h | 12 include/linux/mfd/axp20x.h | 6 include/linux/mfd/davinci_voicecodec.h | 4 include/linux/mfd/rk808.h | 1 include/linux/mfd/rn5t618.h | 9 include/linux/mfd/sun4i-gpadc.h | 94 + include/linux/mfd/tps65217.h | 4 include/linux/mfd/tps65218.h | 3 include/linux/mfd/tps65912.h | 16 include/linux/nfs_fs.h | 2 include/linux/quota.h | 1 include/linux/ratelimit.h | 7 include/target/iscsi/iscsi_target_core.h | 14 include/target/iscsi/iscsi_target_stat.h | 4 include/target/iscsi/iscsi_transport.h | 6 include/target/target_core_backend.h | 6 include/target/target_core_base.h | 12 include/target/target_core_fabric.h | 4 kernel/kcov.c | 8 kernel/kexec_file.c | 4 lib/Kconfig.debug | 2 mm/fadvise.c | 15 net/ipv4/ip_output.c | 2 net/openvswitch/flow_netlink.c | 1 net/rds/rdma.c | 2 net/sched/sch_fq.c | 14 net/sched/sch_netem.c | 2 net/sctp/bind_addr.c | 3 net/sctp/protocol.c | 40 - security/integrity/ima/Kconfig | 12 security/integrity/ima/Makefile | 1 security/integrity/ima/ima.h | 31 security/integrity/ima/ima_crypto.c | 6 security/integrity/ima/ima_fs.c | 30 security/integrity/ima/ima_init.c | 2 security/integrity/ima/ima_kexec.c | 168 ++ security/integrity/ima/ima_main.c | 1 security/integrity/ima/ima_queue.c | 77 + security/integrity/ima/ima_template.c | 297 ++++ security/integrity/ima/ima_template_lib.c | 7 sound/usb/endpoint.c | 12 228 files changed, 3997 insertions(+), 2067 deletions(-)