Merge tag 'v4.17.14' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.17-stable
[email protected] Fri, 31 Aug 2018 03:30:51 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994630AbeHaBbA6Osc2/[email protected]> |
Author: Ralf Baechle <[email protected]> Fri Aug 31 02:11:09 2018 +0200 Commit: f13ffd1b7157fb8c64eb9356f21c0b25ff8815ca Gitweb: https://git.linux-mips.org/g/ralf/linux/f13ffd1b7157 Branch: linux-4.17-stable --- Makefile | 2 - arch/x86/events/intel/uncore.h | 2 - arch/x86/events/intel/uncore_snbep.c | 10 +++-- block/blk-core.c | 5 +- drivers/i2c/busses/i2c-imx.c | 3 - drivers/scsi/qla2xxx/qla_attr.c | 1 drivers/scsi/qla2xxx/qla_gbl.h | 1 drivers/scsi/qla2xxx/qla_gs.c | 4 ++ drivers/scsi/qla2xxx/qla_init.c | 7 +-- drivers/scsi/qla2xxx/qla_inline.h | 2 + drivers/scsi/qla2xxx/qla_isr.c | 3 + drivers/scsi/qla2xxx/qla_mbx.c | 6 +++ drivers/scsi/qla2xxx/qla_mid.c | 11 ++++- drivers/scsi/qla2xxx/qla_os.c | 51 ++++++++++-------------- drivers/scsi/qla2xxx/qla_sup.c | 3 + fs/btrfs/extent_io.c | 3 + fs/jfs/jfs_dinode.h | 7 +++ fs/jfs/jfs_incore.h | 1 fs/jfs/super.c | 3 - fs/jfs/xattr.c | 10 +++-- fs/xfs/libxfs/xfs_attr_leaf.c | 5 +- fs/xfs/xfs_icache.c | 73 ++++++++++++++++++++++------------ include/linux/ring_buffer.h | 1 kernel/irq/manage.c | 9 ++++ kernel/softirq.c | 2 - kernel/time/tick-sched.c | 2 - kernel/trace/ring_buffer.c | 16 +++++++ kernel/trace/trace.c | 6 +++ net/netlink/af_netlink.c | 4 +- 29 files changed, 170 insertions(+), 83 deletions(-)