Merge tag 'v4.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
[email protected] Mon, 25 Sep 2017 10:18:04 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23990488AbdIYISIx67kP/[email protected]> |
Author: Ralf Baechle <[email protected]> Mon Sep 25 10:11:42 2017 +0200 Commit: 9b8ae8a0a63b6634453079d65a304791904e39d6 Gitweb: https://git.linux-mips.org/g/ralf/linux/9b8ae8a0a63b Branch: master --- .../devicetree/bindings/clock/st,stm32h7-rcc.txt | 2 .../devicetree/bindings/security/tpm/tpm-i2c.txt | 6 .../devicetree/bindings/vendor-prefixes.txt | 2 Documentation/driver-api/pm/devices.rst | 2 Documentation/networking/filter.txt | 2 Documentation/networking/ip-sysctl.txt | 18 - Documentation/networking/switchdev.txt | 68 +- Documentation/sysctl/kernel.txt | 1 Documentation/userspace-api/seccomp_filter.rst | 52 + MAINTAINERS | 18 - Makefile | 2 arch/arc/include/asm/processor.h | 3 arch/arm/include/asm/thread_info.h | 15 arch/arm/include/asm/uaccess.h | 2 arch/arm/kernel/entry-common.S | 20 - arch/arm/kernel/signal.c | 10 arch/arm64/Makefile | 5 arch/arm64/include/asm/linkage.h | 4 arch/arm64/kernel/fpsimd.c | 4 arch/arm64/kernel/signal.c | 6 arch/c6x/include/asm/processor.h | 3 arch/frv/include/asm/processor.h | 4 arch/m32r/include/asm/processor.h | 8 arch/metag/include/asm/processor.h | 3 arch/mips/ath79/pci.c | 12 arch/mips/include/asm/mipsregs.h | 15 arch/mips/kernel/perf_event_mipsxx.c | 3 arch/mips/pci/fixup-capcella.c | 4 arch/mips/pci/fixup-cobalt.c | 8 arch/mips/pci/fixup-emma2rh.c | 4 arch/mips/pci/fixup-fuloong2e.c | 2 arch/mips/pci/fixup-ip32.c | 4 arch/mips/pci/fixup-jmr3927.c | 2 arch/mips/pci/fixup-lantiq.c | 2 arch/mips/pci/fixup-lemote2f.c | 4 arch/mips/pci/fixup-loongson3.c | 2 arch/mips/pci/fixup-malta.c | 4 arch/mips/pci/fixup-mpc30x.c | 6 arch/mips/pci/fixup-pmcmsp.c | 8 arch/mips/pci/fixup-rbtx4927.c | 2 arch/mips/pci/fixup-rbtx4938.c | 2 arch/mips/pci/fixup-sni.c | 12 arch/mips/pci/fixup-tb0219.c | 2 arch/mips/pci/fixup-tb0226.c | 2 arch/mips/pci/fixup-tb0287.c | 2 arch/mips/pci/pci-alchemy.c | 2 arch/mips/pci/pci-bcm47xx.c | 2 arch/mips/pci/pci-lasat.c | 2 arch/mips/pci/pci-mt7620.c | 2 arch/mips/pci/pci-octeon.c | 5 arch/mips/pci/pci-rt2880.c | 2 arch/mips/pci/pci-rt3883.c | 2 arch/mips/pci/pci-tx4938.c | 2 arch/mips/pci/pci-tx4939.c | 4 arch/mips/pci/pci-xlp.c | 2 arch/mips/pci/pci-xlr.c | 2 arch/mips/pci/pcie-octeon.c | 3 arch/mips/pmcs-msp71xx/msp_smp.c | 2 arch/mips/txx9/generic/pci.c | 8 arch/mn10300/kernel/process.c | 12 arch/parisc/Kconfig | 12 arch/parisc/Makefile | 5 arch/parisc/boot/compressed/Makefile | 2 arch/parisc/boot/compressed/misc.c | 3 arch/parisc/include/asm/pdc.h | 1 arch/parisc/include/asm/smp.h | 1 arch/parisc/kernel/firmware.c | 20 + arch/parisc/kernel/pdt.c | 9 arch/parisc/kernel/processor.c | 2 arch/parisc/kernel/setup.c | 6 arch/parisc/kernel/smp.c | 3 arch/parisc/kernel/traps.c | 10 arch/parisc/kernel/unwind.c | 12 arch/parisc/mm/fault.c | 33 + arch/powerpc/configs/g5_defconfig | 5 arch/powerpc/configs/gamecube_defconfig | 5 arch/powerpc/configs/pasemi_defconfig | 3 arch/powerpc/configs/pmac32_defconfig | 7 arch/powerpc/configs/ppc64_defconfig | 7 arch/powerpc/configs/ppc64e_defconfig | 7 arch/powerpc/configs/ppc6xx_defconfig | 7 arch/powerpc/configs/wii_defconfig | 5 arch/powerpc/kernel/eeh.c | 4 arch/powerpc/kernel/eeh_dev.c | 18 - arch/powerpc/kernel/optprobes.c | 4 arch/powerpc/kernel/ptrace.c | 2 arch/powerpc/kernel/traps.c | 12 arch/powerpc/lib/sstep.c | 23 - arch/powerpc/perf/core-book3s.c | 5 arch/powerpc/platforms/powernv/idle.c | 8 arch/powerpc/platforms/pseries/dlpar.c | 1 arch/powerpc/platforms/pseries/hotplug-cpu.c | 6 arch/powerpc/platforms/pseries/mobility.c | 4 arch/s390/include/asm/pgtable.h | 4 arch/s390/kernel/early.c | 12 arch/s390/kernel/perf_cpum_sf.c | 9 arch/s390/kernel/topology.c | 148 ++++ arch/s390/mm/gup.c | 7 arch/sh/include/asm/processor_32.h | 4 arch/sh/include/asm/processor_64.h | 4 arch/tile/configs/tilegx_defconfig | 1 arch/tile/configs/tilepro_defconfig | 2 arch/tile/kernel/setup.c | 2 arch/um/include/asm/processor-generic.h | 5 arch/x86/crypto/blowfish-x86_64-asm_64.S | 48 + arch/x86/crypto/camellia-x86_64-asm_64.S | 26 - arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 47 + arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 50 + arch/x86/crypto/des3_ede-asm_64.S | 15 arch/x86/crypto/sha1_avx2_x86_64_asm.S | 4 arch/x86/crypto/sha1_ssse3_asm.S | 11 arch/x86/crypto/sha256-avx-asm.S | 15 arch/x86/crypto/sha256-avx2-asm.S | 22 - arch/x86/crypto/sha256-ssse3-asm.S | 15 arch/x86/crypto/sha512-avx2-asm.S | 75 +- arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 12 arch/x86/include/asm/alternative.h | 3 arch/x86/include/asm/asm.h | 11 arch/x86/include/asm/mmu_context.h | 32 + arch/x86/include/asm/mshyperv.h | 10 arch/x86/include/asm/paravirt_types.h | 14 arch/x86/include/asm/preempt.h | 15 arch/x86/include/asm/processor.h | 6 arch/x86/include/asm/rwsem.h | 4 arch/x86/include/asm/uaccess.h | 4 arch/x86/include/asm/xen/hypercall.h | 5 arch/x86/kernel/cpu/bugs.c | 8 arch/x86/kernel/cpu/common.c | 8 arch/x86/kernel/smpboot.c | 13 arch/x86/kvm/emulate.c | 3 arch/x86/kvm/vmx.c | 3 arch/x86/mm/fault.c | 3 arch/x86/mm/tlb.c | 11 arch/x86/xen/mmu_pv.c | 2 arch/xtensa/include/asm/processor.h | 5 crypto/af_alg.c | 4 crypto/drbg.c | 8 drivers/acpi/acpi_watchdog.c | 2 drivers/acpi/property.c | 24 + drivers/base/power/main.c | 9 drivers/base/power/qos.c | 10 drivers/char/tpm/tpm-interface.c | 10 drivers/char/tpm/tpm.h | 9 drivers/char/tpm/tpm2-cmd.c | 2 drivers/char/tpm/tpm_crb.c | 2 drivers/char/tpm/tpm_ibmvtpm.c | 98 ++- drivers/char/tpm/tpm_infineon.c | 6 drivers/char/tpm/tpm_tis_core.c | 8 drivers/clocksource/timer-integrator-ap.c | 4 drivers/cpufreq/cpufreq-dt-platdev.c | 12 drivers/cpufreq/ti-cpufreq.c | 2 drivers/cpuidle/cpuidle-arm.c | 6 drivers/crypto/caam/Kconfig | 5 drivers/crypto/caam/ctrl.c | 19 - drivers/crypto/caam/regs.h | 59 +- drivers/crypto/inside-secure/safexcel_cipher.c | 2 drivers/crypto/inside-secure/safexcel_hash.c | 2 drivers/crypto/talitos.c | 9 drivers/infiniband/core/verbs.c | 4 drivers/infiniband/hw/bnxt_re/bnxt_re.h | 14 drivers/infiniband/hw/bnxt_re/ib_verbs.c | 107 ++- drivers/infiniband/hw/bnxt_re/main.c | 28 + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 4 drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 3 drivers/infiniband/hw/cxgb4/cm.c | 9 drivers/infiniband/hw/i40iw/i40iw.h | 1 drivers/infiniband/hw/i40iw/i40iw_cm.c | 154 ++-- drivers/infiniband/hw/i40iw/i40iw_cm.h | 5 drivers/infiniband/hw/i40iw/i40iw_main.c | 39 + drivers/infiniband/hw/i40iw/i40iw_utils.c | 6 drivers/infiniband/hw/i40iw/i40iw_verbs.c | 12 drivers/infiniband/hw/mlx5/main.c | 6 drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 3 drivers/infiniband/hw/vmw_pvrdma/pvrdma.h | 31 + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 16 drivers/input/ff-core.c | 13 drivers/input/misc/uinput.c | 57 +- drivers/input/mouse/elan_i2c_i2c.c | 2 drivers/iommu/Kconfig | 5 drivers/iommu/dmar.c | 2 drivers/iommu/of_iommu.c | 5 drivers/irqchip/irq-gic-v3.c | 8 drivers/irqchip/irq-gic-v4.c | 12 drivers/irqchip/irq-mips-gic.c | 6 drivers/isdn/i4l/isdn_ppp.c | 37 + drivers/net/ethernet/broadcom/bcmsysport.c | 52 + drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 4 drivers/net/ethernet/freescale/fec.h | 4 drivers/net/ethernet/freescale/fec_main.c | 8 drivers/net/ethernet/hisilicon/hns3/hnae3.c | 43 - drivers/net/ethernet/hisilicon/hns3/hnae3.h | 15 .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 12 .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 183 +++-- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 3 .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 41 + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 4 .../net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c | 23 - drivers/net/ethernet/ibm/emac/mal.c | 3 drivers/net/ethernet/qualcomm/emac/emac-ethtool.c | 30 + drivers/net/ethernet/qualcomm/emac/emac-mac.c | 22 + drivers/net/ethernet/qualcomm/emac/emac.c | 3 drivers/net/ethernet/qualcomm/emac/emac.h | 3 drivers/net/ethernet/realtek/8139too.c | 5 .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 1 drivers/net/hyperv/hyperv_net.h | 2 drivers/net/hyperv/netvsc.c | 7 drivers/net/hyperv/netvsc_drv.c | 8 drivers/net/phy/Kconfig | 18 - drivers/net/phy/phy.c | 3 drivers/net/phy/phy_device.c | 2 drivers/net/phy/xilinx_gmii2rgmii.c | 2 drivers/net/usb/lan78xx.c | 34 + drivers/pci/endpoint/functions/pci-epf-test.c | 13 drivers/perf/arm_pmu_acpi.c | 1 drivers/s390/block/dasd.c | 12 drivers/s390/block/scm_blk.c | 6 drivers/s390/cio/device.c | 12 drivers/s390/cio/device.h | 1 drivers/s390/cio/device_fsm.c | 12 drivers/s390/cio/io_sch.h | 2 drivers/xen/xenbus/xenbus_client.c | 130 ++-- fs/ceph/mds_client.c | 7 fs/ceph/mds_client.h | 3 fs/cifs/cifs_debug.c | 9 fs/cifs/cifsfs.c | 4 fs/cifs/connect.c | 8 fs/cifs/file.c | 19 - fs/cifs/inode.c | 15 fs/cifs/smb2pdu.c | 26 + include/acpi/acpi_bus.h | 18 - include/linux/audit.h | 6 include/linux/device.h | 2 include/linux/input.h | 1 include/linux/irq.h | 5 include/linux/of_platform.h | 7 include/linux/seccomp.h | 3 include/linux/syscalls.h | 12 include/linux/trace_events.h | 1 include/net/dst.h | 22 - include/net/route.h | 2 include/net/sock.h | 2 include/net/tcp.h | 1 include/uapi/linux/ethtool.h | 6 include/uapi/linux/seccomp.h | 23 - include/xen/arm/page.h | 10 kernel/bpf/devmap.c | 6 kernel/bpf/syscall.c | 6 kernel/bpf/verifier.c | 7 kernel/events/core.c | 3 kernel/seccomp.c | 321 +++++++++ lib/Kconfig.debug | 3 lib/rhashtable.c | 9 net/ceph/osdmap.c | 35 + net/compat.c | 7 net/core/dev.c | 9 net/core/ethtool.c | 2 net/core/filter.c | 24 - net/ipv4/inet_connection_sock.c | 6 net/ipv4/tcp_output.c | 43 - net/ipv6/addrconf.c | 32 + net/ipv6/ip6_gre.c | 21 - net/ipv6/ip6_tunnel.c | 3 net/ipv6/udp.c | 1 net/netfilter/ipset/ip_set_hash_gen.h | 14 net/netfilter/nf_nat_core.c | 12 net/packet/af_packet.c | 16 net/sched/cls_flower.c | 15 net/sched/cls_matchall.c | 1 net/sched/sch_generic.c | 1 net/sched/sch_hfsc.c | 23 + net/smc/af_smc.c | 16 net/smc/smc.h | 2 net/smc/smc_clc.c | 10 net/smc/smc_clc.h | 3 net/smc/smc_close.c | 27 - net/smc/smc_core.c | 16 net/smc/smc_ib.c | 1 net/smc/smc_pnet.c | 4 net/smc/smc_rx.c | 2 net/smc/smc_tx.c | 12 net/smc/smc_wr.c | 2 net/wireless/nl80211.c | 6 scripts/dtc/dtx_diff | 22 - security/apparmor/.gitignore | 1 security/apparmor/Makefile | 43 + security/apparmor/apparmorfs.c | 45 + security/apparmor/domain.c | 4 security/apparmor/file.c | 30 + security/apparmor/include/apparmor.h | 2 security/apparmor/include/audit.h | 39 + security/apparmor/include/domain.h | 5 security/apparmor/include/ipc.h | 6 security/apparmor/include/label.h | 1 security/apparmor/include/mount.h | 54 ++ security/apparmor/include/net.h | 114 +++ security/apparmor/include/perms.h | 5 security/apparmor/include/policy.h | 13 security/apparmor/include/sig_names.h | 98 +++ security/apparmor/ipc.c | 99 +++ security/apparmor/label.c | 36 + security/apparmor/lib.c | 5 security/apparmor/lsm.c | 472 ++++++++++++++ security/apparmor/mount.c | 696 ++++++++++++++++++++ security/apparmor/net.c | 184 +++++ security/apparmor/policy.c | 166 +++-- security/apparmor/policy_ns.c | 2 security/apparmor/policy_unpack.c | 105 +++ security/commoncap.c | 6 tools/objtool/Documentation/stack-validation.txt | 6 tools/objtool/arch/x86/decode.c | 6 tools/objtool/check.c | 43 + tools/testing/selftests/seccomp/Makefile | 18 - .../testing/selftests/seccomp/seccomp_benchmark.c | 99 +++ tools/testing/selftests/seccomp/seccomp_bpf.c | 610 +++++++++++++++--- 314 files changed, 5294 insertions(+), 1663 deletions(-)