Merge tag 'v3.18.98' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-3.18-stable
[email protected] Sat, 16 Jun 2018 06:21:38 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23993316AbeFPEVlBXPmh/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue May 15 22:08:18 2018 +0200 Commit: 62511a5c21354c9bdd710e5cb521108536f513bf Gitweb: https://git.linux-mips.org/g/ralf/linux/62511a5c2135 Branch: linux-3.18-stable --- Makefile | 2 - arch/sh/boards/mach-se/770x/setup.c | 10 +++- drivers/gpu/drm/ttm/ttm_page_alloc.c | 2 + drivers/leds/led-core.c | 2 - drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 6 +- drivers/net/ethernet/arc/emac_main.c | 53 +++++++++++++--------- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 4 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 14 +++++- drivers/net/ethernet/broadcom/tg3.c | 13 +++++ drivers/net/ethernet/broadcom/tg3.h | 4 ++ drivers/net/ethernet/freescale/gianfar_ptp.c | 3 - drivers/net/ethernet/intel/e1000/e1000.h | 3 + drivers/net/ethernet/intel/e1000/e1000_main.c | 27 +++++++++-- drivers/net/phy/mdio-sun4i.c | 6 ++ drivers/net/xen-netfront.c | 1 drivers/s390/block/dasd_3990_erp.c | 10 ++++ drivers/scsi/storvsc_drv.c | 3 + drivers/spi/spi-atmel.c | 2 - drivers/xen/gntdev.c | 8 ++- fs/super.c | 6 ++ fs/xfs/xfs_qm.c | 46 ++++++++++++------- kernel/time/hrtimer.c | 7 ++- net/ipv6/ip6_output.c | 11 +---- net/ipv6/route.c | 1 net/sctp/socket.c | 16 ++++--- 25 files changed, 179 insertions(+), 81 deletions(-)