Merge v4.4.139 into chromeos-4.4 |
|||
Issue descriptionMerge v4.4.139 into chromeos-4.4
,
Jul 8
,
Jul 9
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/998aec80d60e3350e25d26ec80fbe16954cbf9dd commit 998aec80d60e3350e25d26ec80fbe16954cbf9dd Author: Guenter Roeck <groeck@chromium.org> Date: Sun Jul 08 18:31:07 2018 CHROMIUM: Merge 'v4.4.139' into chromeos-4.4 Merge of v4.4.139 into chromeos-4.4 Conflicts: net/bluetooth/hci_conn.c Changelog: ---------------------------------------------------------------- ??? (1): Input: elantech - fix V4 report decoding for module with middle key Aaron Ma (1): Input: elantech - enable middle button of touchpads on ThinkPad P52 Adrian Hunter (6): perf tools: Fix symbol and object code resolution for vdso32 and vdsox32 perf intel-pt: Fix sync_switch INTEL_PT_SS_NOT_TRACING perf intel-pt: Fix decoding to accept CBR between FUP and corresponding TIP perf intel-pt: Fix MTC timing after overflow perf intel-pt: Fix "Unexpected indirect branch" error perf intel-pt: Fix packet decoding of CYC packets Alexander Sverdlin (2): ASoC: cirrus: i2s: Fix LRCLK configuration ASoC: cirrus: i2s: Fix {TX|RX}LinCtrlData setup Alexandr Savca (1): Input: elan_i2c - add ELAN0618 (Lenovo v330 15IKB) ACPI ID Amit Pundir (1): Bluetooth: hci_qca: Avoid missing rampatch failure with userspace fw loader Andy Shevchenko (1): mfd: intel-lpss: Program REMAP register in PIO mode Aneesh Kumar K.V (1): powerpc/mm/hash: Add missing isync prior to kernel stack SLB switch Ben Hutchings (1): Input: elan_i2c_smbus - fix more potential stack buffer overflows Bjørn Mork (1): cdc_ncm: avoid padding beyond end of skb Bo Chen (1): ALSA: hda - Handle kzalloc() failure in snd_hda_attach_pcm_stream() Boris Ostrovsky (1): xen: Remove unnecessary BUG_ON from __unbind_from_irq() Colin Ian King (1): libata: zpodd: make arrays cdb static, reduces object code size Corey Minyard (1): ipmi:bt: Set the timeout before doing a capabilities check Dan Carpenter (1): libata: zpodd: small read overflow in eject_tray() Dan Williams (1): x86/spectre_v1: Disable compiler optimizations over array_index_mask_nospec() Daniel Glöckner (1): usb: musb: fix remote wakeup racing with suspend Daniel Wagner (1): serial: sh-sci: Use spin_{try}lock_irqsave instead of open coding version Dave Wysochanski (1): NFSv4: Fix possible 1-byte stack overflow in nfs_idmap_read_and_verify_message David Rivshin (1): ARM: 8764/1: kgdb: fix NUMREGBYTES so that gdb_regs[] is the correct size Dennis Wassenberg (2): ALSA: hda: add dock and led support for HP EliteBook 830 G5 ALSA: hda: add dock and led support for HP ProBook 640 G4 Eric Dumazet (2): xfrm6: avoid potential infinite loop in _decode_session6() tcp: do not overshoot window_clamp in tcp_rcv_space_adjust() Eric W. Biederman (1): signal/xtensa: Consistenly use SIGBUS in do_unaligned_user Finn Thain (1): net/sonic: Use dma_mapping_error() Florian Westphal (1): xfrm: skip policies marked as dead while rehashing Frank van der Linden (1): tcp: verify the checksum of the first data segment in a new connection Gautham R. Shenoy (1): cpuidle: powernv: Fix promotion from snooze if next state disabled Geert Uytterhoeven (2): lib/vsprintf: Remove atomic-unsafe support for %pCr time: Make sure jiffies_to_msecs() preserves non-zero time periods Greg Kroah-Hartman (1): Linux 4.4.139 Guenter Roeck (1): Merge remote-tracking branch 'origin/linux/v4.4.139' into merge/chromeos-4.4-v4.4.139 Hans de Goede (1): libata: Drop SanDisk SD7UB3Q*G1001 NOLPM quirk Himanshu Madhani (1): scsi: qla2xxx: Fix setting lower transfer speed if GPSC fails Huacai Chen (1): MIPS: io: Add barrier after register read in inX() Ingo Flaschberger (1): 1wire: family module autoload fails because of upper/lower case mismatch. Ivan Bornyakov (1): atm: zatm: fix memcmp casting Jan Kara (2): ext4: fix fencepost error in check for inode count overflow during resize udf: Detect incorrect directory size Joakim Tjernlund (4): mtd: cfi_cmdset_0002: Use right chip in do_ppb_xxlock() mtd: cfi_cmdset_0002: fix SEGV unlocking multiple chips mtd: cfi_cmdset_0002: Fix unlocking requests crossing a chip boudary mtd: cfi_cmdset_0002: Avoid walking all chips when unlocking. Johan Hovold (3): backlight: as3711_bl: Fix Device Tree node lookup backlight: max8925_bl: Fix Device Tree node lookup backlight: tps65217_bl: Fix Device Tree node lookup Josh Hill (1): net: qmi_wwan: Add Netgear Aircard 779S Julian Anastasov (1): ipvs: fix buffer overflow with sync daemon and service Kai-Heng Feng (1): media: cx231xx: Add support for AverMedia DVD EZMaker 7 Kees Cook (1): video: uvesafb: Fix integer overflow in allocation Keith Busch (1): block: Fix transfer when chunk sectors exceeds max Leon Romanovsky (1): RDMA/mlx4: Discard unknown SQP work requests Liu Bo (2): Btrfs: make raid6 rebuild retry more Btrfs: fix unexpected cow in run_delalloc_nocow Lukas Czerner (1): ext4: update mtime in ext4_punch_hole even if no blocks are released Mahesh Salgaonkar (1): powerpc/fadump: Unregister fadump on kexec down path. Martin Kelly (1): iio:buffer: make length types match kfifo types Matthias Schiffer (1): mips: ftrace: fix static function graph tracing Mauro Carvalho Chehab (2): media: v4l2-compat-ioctl32: prevent go past max size media: dvb_frontend: fix locking issues at dvb_frontend_get_event() Maxim Moseychuk (1): usb: do not reset if a low-speed or full-speed device timed out Maxime Chevallier (1): spi: Fix scatterlist elements size in spi_map_buf Michael Neuling (2): powerpc/ptrace: Fix setting 512B aligned breakpoints with PTRACE_SET_DEBUGREG powerpc/ptrace: Fix enforcement of DAWR constraints Michael Schmitz (1): m68k/mm: Adjust VM area to be unmapped by gap size for __iounmap() Mika Westerberg (1): PCI: pciehp: Clear Presence Detect and Data Link Layer Status Changed on resume Mike Marciniszyn (1): IB/qib: Fix DMA api warning with debug kernel Mike Snitzer (1): dm thin: handle running out of data space vs concurrent discard Miklos Szeredi (2): fuse: atomic_o_trunc should truncate pagecache fuse: fix control dir setup and teardown Mikulas Patocka (1): branch-check: fix long->int truncation when profiling branches NeilBrown (1): md: fix two problems with setting the "re-add" device state. Omar Sandoval (1): Btrfs: fix clone vs chattr NODATASUM race Paolo Abeni (1): netfilter: ebtables: handle string from userspace with care Qu Wenruo (1): btrfs: scrub: Don't use inode pages for device replace Richard Weinberger (1): ubi: fastmap: Cancel work upon detach Robert Elliott (1): linvdimm, pmem: Preserve read-only setting for pmem devices Sasha Levin (1): Revert "Btrfs: fix scrub to repair raid6 corruption" Scott Mayhew (1): nfsd: restrict rd_maxcount to svc_max_payload in nfsd_encode_readdir Silvio Cesare (1): UBIFS: Fix potential integer overflow in allocation Srinivas Kandagatla (1): ASoC: dapm: delete dapm_kcontrol_data paths list before freeing it Stefan M Schaeckeler (1): of: unittest: for strings, account for trailing \0 in property length field Stefan Potyra (1): w1: mxc_w1: Enable clock before calling clk_get_rate() on it Steffen Maier (7): scsi: zfcp: fix missing SCSI trace for result of eh_host_reset_handler scsi: zfcp: fix missing SCSI trace for retry of abort / scsi_eh TMF scsi: zfcp: fix misleading REC trigger trace where erp_action setup failed scsi: zfcp: fix missing REC trigger trace on terminate_rport_io early return scsi: zfcp: fix missing REC trigger trace on terminate_rport_io for ERP_FAILED scsi: zfcp: fix missing REC trigger trace for all objects in ERP_FAILED scsi: zfcp: fix missing REC trigger trace on enqueue without ERP thread Szymon Janc (1): Bluetooth: Fix connection if directed advertising and privacy is used Takashi Iwai (1): ALSA: hda/realtek - Add a quirk for FSC ESPRIMO U9210 Tao Wang (1): cpufreq: Fix new policy initialization during limits updates via sysfs Tetsuo Handa (2): driver core: Don't ignore class_dir_create_and_add() failure. fuse: don't keep dead fuse_conn at fuse_fill_super(). Thadeu Lima de Souza Cascardo (1): fs/binfmt_misc.c: do not allow offset overflow Tobias Brunner (1): xfrm: Ignore socket policies when rebuilding hash tables Tokunori Ikegami (2): mtd: cfi_cmdset_0002: Change write buffer to check correct value MIPS: BCM47XX: Enable 74K Core ExternalSync for PCIe erratum Xiangning Yu (1): bonding: re-evaluate force_primary when the primary slave name changes Documentation/printk-formats.txt | 3 +- Makefile | 2 +- arch/arm/include/asm/kgdb.h | 2 +- arch/m68k/mm/kmap.c | 3 +- arch/mips/bcm47xx/setup.c | 6 + arch/mips/include/asm/io.h | 2 + arch/mips/include/asm/mipsregs.h | 3 + arch/mips/kernel/mcount.S | 27 ++--- arch/powerpc/kernel/entry_64.S | 1 + arch/powerpc/kernel/fadump.c | 3 + arch/powerpc/kernel/hw_breakpoint.c | 4 +- arch/powerpc/kernel/ptrace.c | 1 + arch/x86/include/asm/barrier.h | 2 +- arch/xtensa/kernel/traps.c | 2 +- drivers/ata/libata-core.c | 3 - drivers/ata/libata-zpodd.c | 4 +- drivers/atm/zatm.c | 4 +- drivers/base/core.c | 14 ++- drivers/bluetooth/hci_qca.c | 6 + drivers/char/ipmi/ipmi_bt_sm.c | 3 +- drivers/cpufreq/cpufreq.c | 2 + drivers/cpuidle/cpuidle-powernv.c | 32 +++++- drivers/iio/buffer/kfifo_buf.c | 4 +- drivers/infiniband/hw/mlx4/mad.c | 1 - drivers/infiniband/hw/qib/qib.h | 3 +- drivers/infiniband/hw/qib/qib_file_ops.c | 10 +- drivers/infiniband/hw/qib/qib_user_pages.c | 20 ++-- drivers/input/mouse/elan_i2c.h | 2 + drivers/input/mouse/elan_i2c_core.c | 3 +- drivers/input/mouse/elan_i2c_smbus.c | 10 +- drivers/input/mouse/elantech.c | 11 +- drivers/md/dm-thin.c | 11 +- drivers/md/md.c | 4 +- drivers/media/dvb-core/dvb_frontend.c | 23 ++-- drivers/media/usb/cx231xx/cx231xx-cards.c | 3 + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 2 +- drivers/mfd/intel-lpss.c | 4 +- drivers/mtd/chips/cfi_cmdset_0002.c | 21 ++-- drivers/mtd/ubi/build.c | 3 + drivers/mtd/ubi/wl.c | 4 +- drivers/net/bonding/bond_options.c | 1 + drivers/net/ethernet/natsemi/sonic.c | 2 +- drivers/net/usb/cdc_ncm.c | 4 +- drivers/net/usb/qmi_wwan.c | 1 + drivers/nvdimm/bus.c | 14 ++- drivers/of/unittest.c | 8 +- drivers/pci/hotplug/pciehp.h | 2 +- drivers/pci/hotplug/pciehp_core.c | 2 +- drivers/pci/hotplug/pciehp_hpc.c | 13 ++- drivers/s390/scsi/zfcp_dbf.c | 40 +++++++ drivers/s390/scsi/zfcp_erp.c | 123 ++++++++++++++++----- drivers/s390/scsi/zfcp_ext.h | 5 + drivers/s390/scsi/zfcp_scsi.c | 18 ++- drivers/scsi/qla2xxx/qla_init.c | 3 +- drivers/spi/spi.c | 10 +- drivers/tty/serial/sh-sci.c | 8 +- drivers/usb/core/hub.c | 4 +- drivers/usb/musb/musb_host.c | 5 +- drivers/usb/musb/musb_host.h | 7 +- drivers/usb/musb/musb_virthub.c | 25 +++-- drivers/video/backlight/as3711_bl.c | 33 ++++-- drivers/video/backlight/max8925_bl.c | 4 +- drivers/video/backlight/tps65217_bl.c | 4 +- drivers/video/fbdev/uvesafb.c | 3 +- drivers/w1/masters/mxc_w1.c | 20 ++-- drivers/w1/w1.c | 2 +- drivers/xen/events/events_base.c | 2 - fs/binfmt_misc.c | 12 +- fs/btrfs/inode.c | 33 +++++- fs/btrfs/ioctl.c | 12 +- fs/btrfs/scrub.c | 2 +- fs/ext4/inode.c | 36 +++--- fs/ext4/resize.c | 2 +- fs/fuse/control.c | 13 ++- fs/fuse/dir.c | 13 ++- fs/fuse/inode.c | 1 + fs/nfs/nfs4idmap.c | 5 +- fs/nfsd/nfs4xdr.c | 5 +- fs/ubifs/journal.c | 2 +- fs/udf/directory.c | 3 + include/linux/blkdev.h | 4 +- include/linux/compiler.h | 2 +- include/linux/iio/buffer.h | 6 +- kernel/time/time.c | 6 +- lib/vsprintf.c | 3 - net/bridge/netfilter/ebtables.c | 3 +- net/ipv4/tcp_input.c | 2 +- net/ipv4/tcp_ipv4.c | 4 + net/ipv6/tcp_ipv6.c | 4 + net/ipv6/xfrm6_policy.c | 2 +- net/netfilter/ipvs/ip_vs_ctl.c | 21 +++- net/xfrm/xfrm_policy.c | 5 + sound/pci/hda/hda_controller.c | 4 +- sound/pci/hda/patch_conexant.c | 2 + sound/pci/hda/patch_realtek.c | 1 + sound/soc/cirrus/edb93xx.c | 2 +- sound/soc/cirrus/ep93xx-i2s.c | 26 +++-- sound/soc/cirrus/snappercl15.c | 2 +- sound/soc/soc-dapm.c | 2 + tools/perf/util/dso.c | 2 + .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 23 +++- .../perf/util/intel-pt-decoder/intel-pt-decoder.h | 9 ++ .../util/intel-pt-decoder/intel-pt-pkt-decoder.c | 2 +- tools/perf/util/intel-pt.c | 5 + 104 files changed, 652 insertions(+), 260 deletions(-) BUG= chromium:859370 TEST=Build and test on various affected systems Change-Id: I2eeb5ca0670f088ce3f03901a4e9ceefbf296e0a Signed-off-by: Guenter Roeck <groeck@chromium.org> [modify] https://crrev.com/998aec80d60e3350e25d26ec80fbe16954cbf9dd/net/bluetooth/hci_conn.c
,
Jul 9
|
|||
►
Sign in to add a comment |
|||
Comment 1 by bugdroid1@chromium.org
, Jul 7