Merge tag 'v4.14.57' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.14-stable
[email protected] Fri, 31 Aug 2018 03:24:13 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994619AbeHaBYQFozxR/[email protected]> |
Author: Ralf Baechle <[email protected]> Fri Aug 31 02:15:32 2018 +0200 Commit: c00f9edb2028790432ff68bada39228ff4d63b50 Gitweb: https://git.linux-mips.org/g/ralf/linux/c00f9edb2028 Branch: linux-4.14-stable --- Documentation/admin-guide/kernel-parameters.txt | 17 ++ Makefile | 2 arch/arm/include/asm/kvm_host.h | 12 + arch/arm/include/asm/kvm_mmu.h | 12 + arch/arm64/Kconfig | 9 + arch/arm64/include/asm/alternative.h | 43 ++++- arch/arm64/include/asm/assembler.h | 8 + arch/arm64/include/asm/cpucaps.h | 3 arch/arm64/include/asm/cpufeature.h | 22 ++ arch/arm64/include/asm/kvm_asm.h | 41 +++++ arch/arm64/include/asm/kvm_host.h | 43 +++++ arch/arm64/include/asm/kvm_mmu.h | 44 +++++ arch/arm64/include/asm/percpu.h | 11 + arch/arm64/include/asm/thread_info.h | 1 arch/arm64/kernel/Makefile | 1 arch/arm64/kernel/alternative.c | 52 ++++-- arch/arm64/kernel/asm-offsets.c | 2 arch/arm64/kernel/cpu_errata.c | 180 ++++++++++++++++++++ arch/arm64/kernel/cpufeature.c | 17 ++ arch/arm64/kernel/entry.S | 30 +++ arch/arm64/kernel/hibernate.c | 11 + arch/arm64/kernel/ssbd.c | 108 ++++++++++++ arch/arm64/kernel/suspend.c | 8 + arch/arm64/kvm/hyp-init.S | 4 arch/arm64/kvm/hyp/entry.S | 12 + arch/arm64/kvm/hyp/hyp-entry.S | 62 ++++++- arch/arm64/kvm/hyp/switch.c | 64 ++++++- arch/arm64/kvm/hyp/sysreg-sr.c | 21 +- arch/arm64/kvm/reset.c | 4 arch/arm64/mm/proc.S | 8 + arch/x86/include/asm/asm.h | 59 +++++++ arch/x86/include/asm/irqflags.h | 2 arch/x86/kernel/Makefile | 1 arch/x86/kernel/irqflags.S | 26 +++ block/blk-core.c | 9 - crypto/af_alg.c | 4 drivers/atm/zatm.c | 2 drivers/cpufreq/cppc_cpufreq.c | 46 +++++ drivers/crypto/amcc/crypto4xx_core.c | 23 +-- drivers/media/rc/rc-main.c | 4 drivers/mtd/nand/denali_dt.c | 6 + drivers/net/ethernet/atheros/alx/main.c | 8 + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 34 +++- drivers/net/ethernet/cadence/macb_ptp.c | 5 - drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 24 ++- drivers/net/ethernet/marvell/mvneta.c | 2 drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 8 - drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 12 + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 8 + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 2 drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 2 .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 4 drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 3 drivers/net/ethernet/mellanox/mlx5/core/fw.c | 5 - drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c | 9 + drivers/net/ethernet/mellanox/mlx5/core/port.c | 4 drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 7 + drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 8 - drivers/net/ethernet/qlogic/qed/qed_dev.c | 2 drivers/net/ethernet/qlogic/qed/qed_main.c | 8 + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 19 ++ drivers/net/ethernet/qlogic/qede/qede_ptp.c | 10 + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 10 + drivers/net/ethernet/sun/sungem.c | 22 +- drivers/net/geneve.c | 2 drivers/net/hyperv/hyperv_net.h | 2 drivers/net/hyperv/netvsc.c | 37 ++++ drivers/net/hyperv/netvsc_drv.c | 17 ++ drivers/net/hyperv/rndis_filter.c | 61 +------ drivers/net/ipvlan/ipvlan_main.c | 3 drivers/net/usb/lan78xx.c | 5 - drivers/net/usb/qmi_wwan.c | 1 drivers/net/usb/r8152.c | 3 drivers/net/vxlan.c | 4 drivers/net/wireless/realtek/rtlwifi/base.c | 17 +- drivers/net/wireless/realtek/rtlwifi/base.h | 2 drivers/net/wireless/realtek/rtlwifi/core.c | 3 drivers/net/wireless/realtek/rtlwifi/pci.c | 2 drivers/net/wireless/realtek/rtlwifi/ps.c | 4 drivers/net/wireless/realtek/rtlwifi/usb.c | 2 drivers/pci/dwc/pci-exynos.c | 3 drivers/pci/host/pci-hyperv.c | 8 + drivers/usb/host/xhci-hub.c | 2 drivers/vhost/net.c | 3 fs/autofs4/dev-ioctl.c | 22 +- fs/btrfs/tree-log.c | 137 ++++++++++++--- fs/ocfs2/aops.c | 26 ++- fs/ocfs2/cluster/nodemanager.c | 63 ++++++- fs/reiserfs/prints.c | 141 +++++++++------- include/linux/arm-smccc.h | 10 + include/linux/atmdev.h | 15 ++ include/linux/backing-dev-defs.h | 2 include/linux/compiler-gcc.h | 29 ++- include/linux/mlx5/mlx5_ifc.h | 2 include/linux/netdevice.h | 20 ++ include/linux/string.h | 2 kernel/time/clocksource.c | 2 mm/backing-dev.c | 20 +- net/8021q/vlan.c | 2 net/atm/br2684.c | 3 net/atm/clip.c | 3 net/atm/common.c | 3 net/atm/lec.c | 3 net/atm/mpc.c | 3 net/atm/pppoatm.c | 3 net/atm/raw.c | 4 net/bridge/netfilter/ebtables.c | 13 + net/dccp/ccids/ccid3.c | 16 +- net/dns_resolver/dns_key.c | 28 ++- net/ipv4/fou.c | 4 net/ipv4/gre_offload.c | 2 net/ipv4/inet_hashtables.c | 4 net/ipv4/sysctl_net_ipv4.c | 18 +- net/ipv4/tcp_input.c | 9 + net/ipv4/udp_offload.c | 2 net/ipv6/inet6_hashtables.c | 4 net/ipv6/netfilter/nf_conntrack_reasm.c | 2 net/ipv6/seg6_hmac.c | 2 net/nfc/llcp_commands.c | 9 + net/nsh/nsh.c | 2 net/packet/af_packet.c | 16 +- net/rds/loop.c | 1 net/rds/rds.h | 5 + net/rds/recv.c | 5 + net/sched/sch_blackhole.c | 2 net/strparser/strparser.c | 17 -- net/sunrpc/xprtrdma/verbs.c | 13 + net/tls/tls_sw.c | 2 net/vmw_vsock/virtio_transport.c | 2 virt/kvm/arm/arm.c | 22 +- virt/kvm/arm/hyp/vgic-v2-sr.c | 2 virt/kvm/arm/psci.c | 18 ++ 133 files changed, 1697 insertions(+), 471 deletions(-)