Merge tag 'v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994840AbdEMXQD01MrF/[email protected]> |
Author: Ralf Baechle <[email protected]> Thu May 11 21:25:20 2017 +0200 Commit: d1917ae0dac7c0d7509815aad39c3aa6c87dfe60 Gitweb: https://git.linux-mips.org/g/ralf/linux/d1917ae0dac7 Branch: master --- Makefile | 2 arch/arc/Kconfig | 8 ++ arch/arc/include/asm/atomic.h | 3 - arch/arc/include/asm/entry-arcv2.h | 10 ++ arch/arc/include/asm/ptrace.h | 4 + arch/arc/kernel/setup.c | 30 +++++-- arch/mips/Makefile | 6 + arch/mips/include/asm/asm-prototypes.h | 1 arch/mips/kernel/cevt-r4k.c | 2 arch/mips/kernel/elf.c | 2 arch/mips/kernel/perf_event_mipsxx.c | 9 +- arch/mips/kernel/relocate.c | 2 arch/mips/kernel/smp-cps.c | 3 - arch/mips/mti-malta/malta-int.c | 11 +++ arch/mips/pci/pci-legacy.c | 2 arch/sparc/Kconfig | 1 arch/sparc/include/asm/ptrace.h | 3 - arch/sparc/include/uapi/asm/unistd.h | 8 ++ arch/sparc/kernel/ptrace_64.c | 36 ++++++++ arch/sparc/kernel/systbls_32.S | 1 arch/sparc/kernel/systbls_64.S | 2 arch/x86/Makefile | 8 ++ arch/x86/kernel/ftrace.c | 18 +++- arch/x86/lib/delay.c | 7 ++ drivers/clk/sunxi-ng/Kconfig | 2 drivers/input/serio/i8042-x86ia64io.h | 7 ++ drivers/net/bonding/bond_main.c | 2 drivers/net/can/usb/Kconfig | 2 drivers/net/can/usb/gs_usb.c | 17 +++- drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 drivers/net/can/usb/peak_usb/pcan_usb_core.h | 2 drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 72 +++++++++++++++++ drivers/net/dsa/b53/b53_common.c | 37 ++++++++- drivers/net/dsa/b53/b53_regs.h | 5 + drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 1 drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 4 - drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 87 +++++++++++--------- .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 36 ++++++-- drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 drivers/net/ethernet/mellanox/mlx5/core/uar.c | 1 drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 10 +- drivers/net/ethernet/renesas/ravb_main.c | 7 +- drivers/net/ethernet/sfc/efx.h | 5 + drivers/net/ethernet/sfc/workarounds.h | 1 drivers/net/ethernet/ti/Kconfig | 4 + drivers/net/ethernet/toshiba/tc35815.c | 2 drivers/net/hyperv/hyperv_net.h | 1 drivers/net/hyperv/netvsc.c | 9 +- drivers/net/macsec.c | 27 +++++- drivers/net/macvlan.c | 11 ++- drivers/net/phy/micrel.c | 11 --- drivers/net/phy/phy.c | 40 ++++++++- drivers/net/team/team.c | 8 +- drivers/net/usb/Kconfig | 2 drivers/net/usb/hso.c | 16 ++-- drivers/net/usb/plusb.c | 15 +++ drivers/scsi/scsi_lib.c | 4 - fs/btrfs/qgroup.c | 11 ++- fs/ceph/inode.c | 22 ++--- fs/nfs/direct.c | 27 ++++-- fs/nfsd/nfs3xdr.c | 13 ++- fs/nfsd/nfssvc.c | 36 ++++++++ fs/nfsd/nfsxdr.c | 10 +- fs/orangefs/orangefs-bufmap.c | 4 - fs/stat.c | 11 +-- include/linux/phy.h | 1 include/uapi/linux/stat.h | 8 -- kernel/sched/cputime.c | 27 ++++-- kernel/sched/sched.h | 9 ++ lib/iov_iter.c | 2 net/9p/client.c | 4 + net/bridge/br_device.c | 1 net/bridge/br_if.c | 1 net/core/dev.c | 3 + net/core/skbuff.c | 2 net/ipv4/af_inet.c | 3 + net/ipv4/route.c | 3 - net/ipv4/tcp_cong.c | 11 +-- net/ipv4/tcp_output.c | 19 +++- net/ipv4/udp_offload.c | 3 + net/ipv6/addrconf.c | 14 +++ net/ipv6/af_inet6.c | 6 + net/ipv6/exthdrs.c | 4 + net/ipv6/ip6_tunnel.c | 34 ++++---- net/ipv6/ndisc.c | 3 - net/ipv6/raw.c | 3 - net/packet/af_packet.c | 2 net/tipc/socket.c | 40 ++++++++- net/xfrm/xfrm_input.c | 2 net/xfrm/xfrm_policy.c | 4 + sound/core/seq/seq_lock.c | 9 +- sound/firewire/lib.h | 2 sound/firewire/oxfw/oxfw.c | 4 - sound/soc/intel/boards/bytcr_rt5640.c | 4 - sound/soc/intel/boards/bytcr_rt5651.c | 2 sound/soc/soc-topology.c | 1 sound/soc/sti/uniperif.h | 1 sound/soc/sti/uniperif_player.c | 35 ++++++-- sound/soc/sti/uniperif_reader.c | 24 +++++- 100 files changed, 769 insertions(+), 289 deletions(-)