Merge tag 'v4.12.7' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.12-stable

Author: Ralf Baechle <[email protected]> Thu Sep 21 00:19:13 2017 +0200
Commit: e406e9d529a309f92dcc0691cc0b33fffd506ba9
Gitweb: https://git.linux-mips.org/g/ralf/linux/e406e9d529a3
Branch: linux-4.12-stable

---

 Makefile                                   |    2 +
 arch/s390/net/bpf_jit_comp.c               |    3 +-
 drivers/net/ethernet/mellanox/mlx4/en_rx.c |   29 +++++++++++-------
 drivers/net/ppp/ppp_generic.c              |   44 ++++++++++++++++++----------
 drivers/net/usb/qmi_wwan.c                 |    6 +++-
 drivers/scsi/sg.c                          |   25 +---------------
 fs/btrfs/extent_io.c                       |   28 ++++++++----------
 net/core/dev.c                             |    2 +
 net/ipv4/af_inet.c                         |    7 ++++
 net/ipv4/igmp.c                            |    6 ----
 net/ipv4/ip_output.c                       |    8 +++--
 net/ipv4/tcp_input.c                       |    4 +--
 net/ipv4/tcp_output.c                      |    3 ++
 net/ipv4/tcp_timer.c                       |    3 +-
 net/ipv4/udp.c                             |    2 +
 net/ipv4/udp_offload.c                     |    2 +
 net/ipv6/ip6_output.c                      |    7 +++-
 net/ipv6/route.c                           |   11 ++-----
 net/ipv6/udp_offload.c                     |    2 +
 net/packet/af_packet.c                     |   13 ++++++--
 net/sched/act_ipt.c                        |   22 +++++++-------
 21 files changed, 118 insertions(+), 111 deletions(-)