Merge v4.4.140 into chromeos-4.4 |
|||
Issue descriptionMerge v4.4.140 into chromeos-4.4
,
Jul 15
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/e708a22fa53a9e99a3ed52b76b4e5a916cb6013e commit e708a22fa53a9e99a3ed52b76b4e5a916cb6013e Author: Guenter Roeck <groeck@chromium.org> Date: Wed Jul 11 19:29:30 2018 CHROMIUM: Merge 'v4.4.140' into chromeos-4.4 Merge of v4.4.140 into chromeos-4.4 Conflicts: drivers/md/dm-bufio.c Changelog: ---------------------------------------------------------------- Ben Hutchings (1): ipv4: Fix error return value in fib_convert_metrics() Brad Love (1): media: cx25840: Use subdev host data for PLL override Cannon Matthews (1): mm: hugetlb: yield when prepping struct pages Changbin Du (1): tracing: Fix missing return symbol in function_graph output Christian Borntraeger (1): s390: Correct register corruption in critical section cleanup Dan Carpenter (1): staging: comedi: quatech_daqp_cs: fix no-op loop daqp_ao_insn_write() Daniel Rosenberg (1): HID: debug: check length before copy_to_user() Dave Hansen (1): x86/boot: Fix early command-line parsing when matching at end Douglas Anderson (1): dm bufio: avoid sleeping while holding the dm_bufio lock Greg Kroah-Hartman (1): Linux 4.4.140 Guenter Roeck (1): Merge remote-tracking branch 'origin/linux/v4.4.140' into merge/chromeos-4.4-v4.4.140 Gustavo A. R. Silva (1): HID: hiddev: fix potential Spectre v1 Houston Yaroschoff (1): usb: cdc_acm: Add quirk for Uniden UBC125 scanner Jann Horn (2): scsi: sg: mitigate read/write abuse netfilter: nf_log: don't hold nf_log_mutex during user access Jason Andryuk (1): HID: i2c-hid: Fix "incomplete report" noise Johan Hovold (1): USB: serial: cp210x: add CESINEL device ids Jon Derrick (1): ext4: check superblock mapped prior to committing Karoly Pados (1): USB: serial: cp210x: add Silicon Labs IDs for Windows Update Keith Busch (1): nvme-pci: initialize queue memory before interrupts Lars Ellenberg (1): drbd: fix access after free Laura Abbott (1): staging: android: ion: Return an ERR_PTR in ion_map_kernel Martin Kaiser (1): mtd: rawnand: mxc: set spare area size register explicitly Masami Hiramatsu (1): kprobes/x86: Do not modify singlestep buffer while resuming Mikulas Patocka (2): dm bufio: drop the lock when doing GFP_NOIO allocation dm bufio: don't take the lock in dm_bufio_shrink_count Paulo Alcantara (1): cifs: Fix infinite loop when using hard mount option Richard Weinberger (1): ubi: fastmap: Correctly handle interrupted erasures in EBA Sean Nyekjaer (1): ARM: dts: imx6q: Use correct SDMA script for SPI5 core Taehee Yoo (1): netfilter: nf_tables: use WARN_ON_ONCE instead of BUG_ON in nft_do_chain() Tetsuo Handa (2): n_tty: Fix stall at n_tty_receive_char_special(). n_tty: Access echo_* variables carefully. Theodore Ts'o (9): jbd2: don't mark block as modified if the handle is out of credits ext4: make sure bitmaps and the inode table don't overlap with bg descriptors ext4: always check block group bounds in ext4_init_block_bitmap() ext4: only look at the bg_flags field if it is valid ext4: verify the depth of extent tree in ext4_find_extent() ext4: include the illegal physical block in the bad map ext4_error msg ext4: clear i_data in ext4_inode_info when removing inline data ext4: add more inode number paranoia checks ext4: add more mount time checks of the superblock Tokunori Ikegami (3): mtd: cfi_cmdset_0002: Change definition naming to retry write operation mtd: cfi_cmdset_0002: Change erase functions to retry for error mtd: cfi_cmdset_0002: Change erase functions to check chip good only Tony Luck (1): x86/mce: Fix incorrect "Machine check from unknown source" message Vasanthakumar Thiagarajan (1): ath10k: fix rfc1042 header retrieval in QCA4019 with eth decap mode Vlastimil Babka (1): mm, page_alloc: do not break __GFP_THISNODE by zonelist reset Wolfram Sang (1): i2c: rcar: fix resume by always initializing registers before transfer Yazen Ghannam (1): x86/mce: Detect local MCEs properly Makefile | 2 +- arch/arm/boot/dts/imx6q.dtsi | 2 +- arch/s390/kernel/entry.S | 4 +- arch/x86/kernel/cpu/mcheck/mce.c | 51 ++++++++----- arch/x86/kernel/kprobes/core.c | 42 ++++++----- arch/x86/lib/cmdline.c | 34 ++++++--- drivers/block/drbd/drbd_worker.c | 2 +- drivers/hid/hid-debug.c | 8 ++- drivers/hid/i2c-hid/i2c-hid.c | 2 +- drivers/hid/usbhid/hiddev.c | 11 +++ drivers/i2c/busses/i2c-rcar.c | 3 +- drivers/md/dm-bufio.c | 3 +- drivers/media/i2c/cx25840/cx25840-core.c | 28 ++++++-- drivers/mtd/chips/cfi_cmdset_0002.c | 30 +++++--- drivers/mtd/nand/mxc_nand.c | 5 +- drivers/mtd/ubi/eba.c | 92 +++++++++++++++++++++++- drivers/net/wireless/ath/ath10k/htt_rx.c | 5 +- drivers/nvme/host/pci.c | 4 +- drivers/scsi/sg.c | 42 ++++++++++- drivers/staging/android/ion/ion_heap.c | 2 +- drivers/staging/comedi/drivers/quatech_daqp_cs.c | 2 +- drivers/tty/n_tty.c | 55 ++++++++------ drivers/usb/class/cdc-acm.c | 3 + drivers/usb/serial/cp210x.c | 14 ++++ fs/cifs/cifssmb.c | 10 ++- fs/cifs/smb2pdu.c | 18 +++-- fs/ext4/balloc.c | 21 +++--- fs/ext4/ext4.h | 5 -- fs/ext4/ext4_extents.h | 1 + fs/ext4/extents.c | 6 ++ fs/ext4/ialloc.c | 14 +++- fs/ext4/inline.c | 1 + fs/ext4/inode.c | 7 +- fs/ext4/mballoc.c | 6 +- fs/ext4/super.c | 86 ++++++++++++++++++---- fs/jbd2/transaction.c | 9 ++- kernel/trace/trace_functions_graph.c | 5 +- mm/hugetlb.c | 1 + mm/page_alloc.c | 2 - net/ipv4/fib_semantics.c | 2 +- net/netfilter/nf_log.c | 9 ++- net/netfilter/nf_tables_core.c | 3 +- 42 files changed, 496 insertions(+), 156 deletions(-) BUG= chromium:862678 TEST=Build and test on various affected systems Change-Id: I70ec49398c813662952967e90b3e9cab1f224935 Signed-off-by: Guenter Roeck <groeck@chromium.org> [modify] https://crrev.com/e708a22fa53a9e99a3ed52b76b4e5a916cb6013e/drivers/md/dm-bufio.c
,
Jul 15
|
|||
►
Sign in to add a comment |
|||
Comment 1 by groeck@chromium.org
, Jul 11