Merge tag 'v4.12.14' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.12-stable
[email protected] Fri, 22 Sep 2017 10:23:55 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994814AbdIVIX6ruANo/[email protected]> |
Author: Ralf Baechle <[email protected]> Thu Sep 21 00:22:51 2017 +0200 Commit: d10eddbc2d27584e0696d1c564a6faec320e9abb Gitweb: https://git.linux-mips.org/g/ralf/linux/d10eddbc2d27 Branch: linux-4.12-stable --- Makefile | 2 arch/x86/include/asm/elf.h | 5 arch/x86/kernel/process_64.c | 236 +++++++++++--------- drivers/md/raid1.c | 19 ++ drivers/md/raid10.c | 35 +++ drivers/md/raid5.c | 4 drivers/net/dsa/bcm_sf2.c | 4 drivers/net/dsa/bcm_sf2.h | 1 drivers/net/dsa/bcm_sf2_cfp.c | 8 - drivers/net/ethernet/broadcom/bcmsysport.c | 4 drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 6 - drivers/net/ethernet/freescale/fec_main.c | 8 - drivers/net/ethernet/freescale/fman/mac.c | 2 drivers/net/ethernet/freescale/gianfar.c | 2 drivers/net/ethernet/marvell/mvpp2.c | 2 drivers/net/ethernet/mellanox/mlx5/core/en.h | 1 drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 24 +- .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 6 - drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 2 drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 8 - drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 17 + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 2 drivers/net/ethernet/mellanox/mlx5/core/srq.c | 12 + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 6 + drivers/net/ethernet/qlogic/qlge/qlge_dbg.c | 2 drivers/net/hyperv/netvsc_drv.c | 7 + drivers/net/macsec.c | 1 drivers/net/phy/phy.c | 3 drivers/vhost/net.c | 7 + fs/f2fs/recovery.c | 4 fs/fuse/dev.c | 13 + fs/fuse/file.c | 3 include/linux/netdevice.h | 2 include/net/inet_frag.h | 35 +-- include/net/ip6_fib.h | 31 ++- include/net/udp.h | 2 kernel/bpf/hashtab.c | 30 +-- lib/idr.c | 2 net/bridge/br_device.c | 3 net/core/datagram.c | 2 net/core/dev.c | 3 net/ieee802154/6lowpan/reassembly.c | 11 - net/ipv4/inet_fragment.c | 4 net/ipv4/ip_fragment.c | 12 - net/ipv4/udp.c | 3 net/ipv6/addrconf.c | 2 net/ipv6/ip6_fib.c | 60 ++++- net/ipv6/ip6_gre.c | 4 net/ipv6/ipv6_sockglue.c | 1 net/ipv6/netfilter/nf_conntrack_reasm.c | 12 - net/ipv6/output_core.c | 6 - net/ipv6/reassembly.c | 12 - net/ipv6/route.c | 20 +- net/ipv6/udp.c | 11 + net/kcm/kcmsock.c | 4 net/packet/af_packet.c | 12 + net/sctp/sctp_diag.c | 7 - net/sctp/socket.c | 3 net/sctp/ulpqueue.c | 3 net/tipc/socket.c | 6 - 62 files changed, 465 insertions(+), 299 deletions(-)