Merge tag 'v3.2.99' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-3.2-stable
[email protected] Sat, 16 Jun 2018 06:23:19 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994677AbeFPEXWXlLhF/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue May 15 22:04:51 2018 +0200 Commit: 101ec7f67ff353feec611e81cb73e0fea53b1b8b Gitweb: https://git.linux-mips.org/g/ralf/linux/101ec7f67ff3 Branch: linux-3.2-stable --- Documentation/kernel-parameters.txt | 3 Makefile | 2 arch/s390/kernel/dis.c | 4 arch/x86/include/asm/alternative.h | 4 arch/x86/kernel/alternative.c | 129 +++------ arch/x86/kernel/smpboot.c | 20 - arch/x86/kvm/svm.c | 7 + arch/x86/kvm/vmx.c | 4 arch/x86/kvm/x86.c | 5 arch/x86/kvm/x86.h | 2 arch/x86/lib/x86-opcode-map.txt | 2 arch/x86/mm/kaiser.c | 5 arch/x86/xen/smp.c | 6 block/blk-core.c | 3 drivers/char/tpm/tpm.c | 6 drivers/infiniband/hw/mlx4/qp.c | 2 drivers/infiniband/ulp/srp/ib_srp.c | 23 +- drivers/input/misc/adxl34x.c | 2 drivers/md/dm-bufio.c | 15 - drivers/md/dm-table.c | 32 +- drivers/md/dm.c | 12 + drivers/media/rc/ir-lirc-codec.c | 9 - drivers/media/video/cx231xx/cx231xx-cards.c | 3 drivers/media/video/omap/omap_vout.c | 3 drivers/mtd/nand/nand_base.c | 9 - drivers/net/wireless/rt2x00/rt2x00usb.c | 6 drivers/pci/pcie/aer/aerdrv_core.c | 9 + drivers/rtc/interface.c | 16 + drivers/scsi/bfa/bfad_debugfs.c | 5 drivers/staging/media/as102/as102_fw.c | 28 +- drivers/staging/usbip/stub_rx.c | 58 +++- drivers/staging/usbip/stub_tx.c | 7 + drivers/staging/usbip/usbip_common.h | 1 .../staging/usbip/userspace/libsrc/usbip_common.c | 2 .../staging/usbip/userspace/libsrc/vhci_driver.c | 8 - drivers/staging/usbip/vhci_hcd.c | 39 --- drivers/staging/usbip/vhci_sysfs.c | 20 + drivers/usb/core/devio.c | 14 + drivers/usb/core/quirks.c | 3 drivers/usb/serial/garmin_gps.c | 22 +- drivers/video/udlfb.c | 10 - fs/9p/vfs_inode.c | 3 fs/9p/vfs_inode_dotl.c | 3 fs/autofs4/waitq.c | 45 ++- fs/coda/upcall.c | 3 fs/ecryptfs/messaging.c | 8 - fs/isofs/isofs.h | 2 fs/isofs/rock.h | 2 fs/isofs/util.c | 2 fs/nfs/nfs4proc.c | 18 + fs/nilfs2/segment.c | 6 fs/ocfs2/alloc.c | 2 fs/ocfs2/file.c | 9 - include/linux/blkdev.h | 1 include/linux/usb/ch9.h | 19 + include/net/sctp/sctp.h | 2 include/net/sctp/structs.h | 8 - kernel/cpu.c | 11 - kernel/extable.c | 2 kernel/trace/blktrace.c | 76 ++++-- net/9p/client.c | 3 net/9p/trans_virtio.c | 13 - net/l2tp/l2tp_core.c | 42 ++- net/l2tp/l2tp_core.h | 3 net/l2tp/l2tp_eth.c | 96 +++++-- net/l2tp/l2tp_ppp.c | 276 +++++++++++--------- net/netfilter/xt_TCPMSS.c | 43 ++- net/netfilter/xt_TCPOPTSTRIP.c | 19 + net/rds/rdma.c | 4 net/sctp/ipv6.c | 160 ++++++------ net/sctp/protocol.c | 12 - net/sctp/socket.c | 33 +- net/sctp/transport.c | 4 net/sctp/ulpevent.c | 2 sound/core/seq/seq_clientmgr.c | 10 + sound/core/seq/seq_clientmgr.h | 1 sound/core/timer_compat.c | 12 - sound/pci/hda/hda_intel.c | 3 sound/usb/clock.c | 9 - sound/usb/mixer.c | 15 + 80 files changed, 906 insertions(+), 636 deletions(-)