Merge tag 'v4.4.133' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.4-stable
[email protected] Sat, 16 Jun 2018 06:26:21 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994712AbeFPE0XTUUzJ/[email protected]> |
Author: Ralf Baechle <[email protected]> Fri Jun 15 01:29:45 2018 +0200 Commit: 87ef598c99e67a6fb212cedad3f46ea7c5680e5f Gitweb: https://git.linux-mips.org/g/ralf/linux/87ef598c99e6 Branch: linux-4.4-stable --- Makefile | 2 arch/alpha/include/asm/futex.h | 26 +-- arch/arc/include/asm/futex.h | 40 +--- arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 1 arch/arm/include/asm/assembler.h | 10 + arch/arm/include/asm/futex.h | 26 --- arch/arm/kernel/traps.c | 5 - arch/arm/lib/getuser.S | 10 + arch/arm/probes/kprobes/opt-arm.c | 4 arch/arm64/Kconfig | 14 + arch/arm64/include/asm/assembler.h | 60 ++++++ arch/arm64/include/asm/cputype.h | 11 + arch/arm64/include/asm/futex.h | 26 --- arch/arm64/mm/proc.S | 5 + arch/frv/include/asm/futex.h | 3 arch/frv/kernel/futex.c | 27 --- arch/hexagon/include/asm/futex.h | 38 ---- arch/ia64/include/asm/futex.h | 25 --- arch/microblaze/include/asm/futex.h | 38 ---- arch/mips/include/asm/futex.h | 25 --- arch/parisc/include/asm/futex.h | 25 --- arch/powerpc/include/asm/firmware.h | 5 - arch/powerpc/include/asm/futex.h | 26 +-- arch/powerpc/kernel/setup-common.c | 11 - arch/powerpc/platforms/powernv/eeh-powernv.c | 4 arch/powerpc/platforms/powernv/idle.c | 2 arch/powerpc/platforms/powernv/opal-nvram.c | 14 + arch/powerpc/platforms/powernv/opal-xscom.c | 2 arch/powerpc/platforms/powernv/opal.c | 36 +--- arch/powerpc/platforms/powernv/pci-ioda.c | 2 arch/powerpc/platforms/powernv/setup.c | 12 - arch/powerpc/platforms/powernv/smp.c | 74 +++----- arch/s390/include/asm/alternative-asm.h | 108 +++++++++++ arch/s390/include/asm/futex.h | 23 +- arch/s390/include/asm/nospec-insn.h | 182 +++++++++++++++++++ arch/s390/kernel/Makefile | 1 arch/s390/kernel/base.S | 24 +-- arch/s390/kernel/entry.S | 105 +++-------- arch/s390/kernel/irq.c | 5 - arch/s390/kernel/nospec-branch.c | 43 ++-- arch/s390/kernel/nospec-sysfs.c | 21 ++ arch/s390/kernel/perf_cpum_sf.c | 4 arch/s390/kernel/reipl.S | 5 - arch/s390/kernel/swsusp.S | 10 + arch/s390/lib/mem.S | 9 + arch/s390/net/bpf_jit.S | 16 +- arch/s390/net/bpf_jit_comp.c | 63 ++++++- arch/sh/include/asm/futex.h | 26 --- arch/sparc/include/asm/futex_64.h | 26 +-- arch/tile/include/asm/futex.h | 40 +--- arch/x86/boot/compressed/eboot.c | 6 - arch/x86/include/asm/futex.h | 40 +--- arch/x86/kernel/machine_kexec_32.c | 6 + arch/x86/kernel/machine_kexec_64.c | 4 arch/x86/xen/mmu.c | 4 arch/xtensa/include/asm/futex.h | 27 +-- drivers/cpufreq/intel_pstate.c | 34 ++-- drivers/cpufreq/powernv-cpufreq.c | 2 drivers/cpuidle/coupled.c | 1 drivers/cpuidle/cpuidle-powernv.c | 2 drivers/gpio/gpio-rcar.c | 46 +++++ drivers/net/bonding/bond_alb.c | 2 drivers/net/ethernet/broadcom/tg3.c | 9 + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 16 ++ drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 7 + drivers/net/ethernet/realtek/8139too.c | 2 drivers/net/ethernet/realtek/r8169.c | 3 drivers/net/ethernet/sun/niu.c | 5 - drivers/net/usb/qmi_wwan.c | 12 + drivers/s390/cio/qdio_setup.c | 12 - drivers/s390/scsi/zfcp_dbf.c | 23 ++ drivers/s390/scsi/zfcp_ext.h | 5 - drivers/s390/scsi/zfcp_scsi.c | 14 + drivers/scsi/libsas/sas_scsi_host.c | 33 +-- drivers/scsi/sg.c | 2 drivers/spi/spi-pxa2xx.h | 2 drivers/usb/usbip/stub.h | 2 drivers/usb/usbip/stub_dev.c | 43 +++- drivers/usb/usbip/stub_main.c | 105 ++++++++++- fs/btrfs/ctree.c | 6 - fs/btrfs/tree-log.c | 7 + fs/btrfs/volumes.c | 9 + fs/ext2/inode.c | 10 - fs/hfsplus/super.c | 1 fs/lockd/svc.c | 2 fs/pipe.c | 3 fs/proc/base.c | 55 +++++- fs/proc/meminfo.c | 5 - include/asm-generic/futex.h | 50 +---- include/linux/dmaengine.h | 20 ++ include/linux/efi.h | 8 - include/linux/signal.h | 17 ++ include/linux/timekeeper_internal.h | 4 include/trace/events/xen.h | 16 -- include/uapi/linux/nl80211.h | 2 kernel/auditsc.c | 7 - kernel/exit.c | 4 kernel/futex.c | 44 ++++- kernel/signal.c | 7 + kernel/time/tick-broadcast.c | 8 + kernel/time/timekeeping.c | 20 +- mm/Kconfig | 1 mm/filemap.c | 90 ++++++--- mm/util.c | 16 +- mm/vmscan.c | 12 + net/bridge/br_if.c | 4 net/compat.c | 6 - net/core/sock.c | 2 net/dccp/ccids/ccid2.c | 14 + net/dccp/timer.c | 2 net/ipv4/ip_output.c | 3 net/ipv4/ping.c | 7 + net/ipv4/tcp.c | 2 net/ipv4/tcp_output.c | 7 + net/ipv4/udp.c | 7 + net/ipv6/ip6_output.c | 3 net/l2tp/l2tp_netlink.c | 2 net/llc/af_llc.c | 3 net/openvswitch/flow_netlink.c | 9 - net/packet/af_packet.c | 4 net/sched/sch_fq.c | 37 +++- net/sctp/associola.c | 30 +++ net/sctp/inqueue.c | 2 net/sctp/ipv6.c | 3 net/sctp/sm_statefuns.c | 89 +++++---- net/wireless/core.c | 3 net/xfrm/xfrm_state.c | 1 sound/core/control_compat.c | 3 sound/core/timer.c | 220 +++++++++++------------ sound/pci/hda/hda_intel.c | 2 sound/usb/mixer.c | 8 + 131 files changed, 1583 insertions(+), 1103 deletions(-)