Merge tag 'v3.18.108' 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:22:38 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994427AbeFPEWlvXtlh/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue May 15 22:35:38 2018 +0200 Commit: ffd6cebcae98423b421a2b34ab516f7602939b66 Gitweb: https://git.linux-mips.org/g/ralf/linux/ffd6cebcae98 Branch: linux-3.18-stable --- Makefile | 2 + drivers/char/virtio_console.c | 49 +++++++++++++++++------------------ drivers/mtd/chips/cfi_cmdset_0001.c | 33 ++++++++++++++++++++---- drivers/mtd/chips/cfi_cmdset_0002.c | 9 ++++-- drivers/scsi/sd.c | 2 + drivers/tty/n_gsm.c | 23 ++++++++++++++++ drivers/tty/tty_ldisc.c | 11 ++++---- drivers/usb/core/hcd.c | 1 + drivers/usb/core/hub.c | 10 ++++++- drivers/usb/core/quirks.c | 3 ++ drivers/usb/serial/cp210x.c | 1 + drivers/usb/serial/ftdi_sio.c | 3 +- drivers/usb/usbip/stub_main.c | 5 ++++ drivers/usb/usbip/usbip_common.h | 2 + fs/ext4/balloc.c | 17 +++++++++++- fs/ext4/ialloc.c | 8 +++++- fs/jbd2/transaction.c | 1 + include/linux/mtd/flashchip.h | 1 + include/linux/virtio.h | 3 ++ lib/kobject.c | 12 ++++----- net/ceph/messenger.c | 7 +++++ sound/core/pcm_native.c | 1 + sound/core/seq/oss/seq_oss_synth.c | 12 ++++++--- sound/soc/fsl/fsl_esai.c | 7 +++++ sound/usb/mixer_maps.c | 3 ++ tools/perf/tests/code-reading.c | 20 +------------- 26 files changed, 169 insertions(+), 77 deletions(-)