Merge v4.4.109 into chromeos-4.4 |
|||||
Issue descriptionMerge v4.4.109 into chromeos-4.4
,
Jan 3 2018
,
Jan 3 2018
,
Jan 4 2018
,
Jan 6 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/b5e2483ae8c0b074013e8096e34b6c77ed32850b commit b5e2483ae8c0b074013e8096e34b6c77ed32850b Author: Guenter Roeck <groeck@chromium.org> Date: Fri Jan 05 16:27:35 2018 CHROMIUM: Merge 'v4.4.109' into chromeos-4.4 Merge of v4.4.109 into chromeos-4.4 Conflicts: net/netfilter/nfnetlink_cthelper.c net/ipv4/raw.c drivers/usb/host/xhci-plat.c arch/x86/xen/enlighten.c arch/x86/mm/tlb.c arch/x86/kernel/cpu/common.c arch/x86/include/asm/tlbflush.h Changelog: ---------------------------------------------------------------- Aaron Lu (1): x86/irq: Do not substract irq_tlb_count from irq_call_count Adam Wallis (1): xhci: plat: Register shutdown for xhci_plat Aleksandar Markovic (1): MIPS: math-emu: Fix final emulation phase for certain instructions Alexander Duyck (2): net: Do not allow negative values for busy_read and busy_poll sysctl interfaces i40e: Do not enable NAPI on q_vectors that have no rings Alexandre Belloni (1): rtc: set the alarm to the next expiring timer Alexey Khoroshilov (1): irda: vlsi_ir: fix check for DMA mapping errors Andy Lutomirski (18): x86/mm: Add INVPCID helpers x86/mm: Add a 'noinvpcid' boot option to turn off INVPCID x86/mm: If INVPCID is available, use it to flush global mappings sched/core: Add switch_mm_irqs_off() and use it in the scheduler x86/mm: Build arch/x86/mm/tlb.c even on !SMP x86/mm, sched/core: Uninline switch_mm() x86/mm, sched/core: Turn off IRQs in switch_mm() sched/core: Idle_task_exit() shouldn't use switch_mm_irqs_off() x86/vm86/32: Switch to flush_tlb_mm_range() in mark_screen_rdonly() x86/mm: Remove flush_tlb() and flush_tlb_current_task() x86/mm: Make flush_tlb_mm_range() more predictable x86/mm: Reimplement flush_tlb_page() using flush_tlb_mm_range() x86/mm: Remove the UP asm/tlbflush.h code, always use the (formerly) SMP code x86/mm: Disable PCID on 32-bit kernels x86/mm: Add the 'nopcid' boot option to turn off PCID x86/mm: Enable CR4.PCIDE on supported systems x86/mm/64: Fix reboot interaction with CR4.PCIDE mm/vmstat: Make NR_TLB_REMOTE_FLUSH_RECEIVED available even on UP Arnd Bergmann (3): hwmon: (asus_atk0110) fix uninitialized data access bna: avoid writing uninitialized data into hw registers isdn: kcapi: avoid uninitialized data Arvind Yadav (1): thermal: hisilicon: Handle return value of clk_prepare_enable Borislav Petkov (1): x86/mm: Fix INVPCID asm constraint Brian King (1): tg3: Fix rx hang on MTU change with 5717/5719 Christian Lamparter (1): crypto: crypto4xx - increase context and scatter ring buffer elements Christoph Paasch (1): tcp md5sig: Use skb's saddr when replying to an incoming segment Christophe JAILLET (1): igb: check memory allocation failure Dan Carpenter (1): bna: integer overflow bug in debugfs Dan Murphy (1): net: phy: at803x: Change error to EINVAL for invalid MAC Daniel Thompson (1): usb: xhci: Add XHCI_TRUST_TX_LENGTH for Renesas uPD720201 Daniele Palmas (1): USB: serial: option: add support for Telit ME910 PID 0x1101 David Daney (1): PCI: Avoid bus reset if bridge itself is broken Derek Basehore (1): backlight: pwm_bl: Fix overflow condition Dick Kennedy (3): scsi: lpfc: Fix PT2PT PRLI reject scsi: lpfc: Fix secure firmware updates scsi: lpfc: PLOGI failures during NPIV testing Dmitry Fleytman Dmitry Fleytman (1): usb: Add device quirk for Logitech HD Pro Webcam C925e Emil Tantilov (1): ixgbe: fix use of uninitialized padding Eric Dumazet (4): sch_dsmark: fix invalid skb_cow() usage inet: frag: release spinlock before calling icmp_send() ipv4: igmp: guard against silly MTU values ipv6: mcast: better catch silly mtu values Eric W. Biederman (1): net: Fix double free and memory corruption in get_net_ns_by_id() Gabriele Paoloni (1): PCI/AER: Report non-fatal errors only to the affected endpoint Gao Feng (1): netfilter: nf_nat_snmp: Fix panic when snmp_trap_helper fails to register Greg Kroah-Hartman (3): Revert "Bluetooth: btusb: driver to enable the usb-wakeup feature" Linux 4.4.108 Linux 4.4.109 Grygorii Strashko (1): net: phy: micrel: ksz9031: reconfigure autoneg after phy autoneg workaround Guenter Roeck (1): Merge remote-tracking branch 'origin/linux/v4.4.109' into merge/chromeos-4.4-v4.4.109 Gustavo A. R. Silva (1): usb: gadget: udc: remove pointer dereference after free Helge Deller (1): parisc: Hide Diva-built-in serial aux and graphics card Herbert Xu (1): crypto: deadlock between crypto_alg_sem/rtnl_mutex/genl_mutex Herongguang (Stephen) (1): KVM: pci-assign: do not map smm memory slot pages in vt-d page tables Hoang Tran (1): tcp: fix under-evaluated ssthresh in TCP Vegas Hui Wang (1): ALSA: hda - fix headset mic detection issue on a Dell machine Ido Schimmel (1): ipv4: Fix use-after-free when flushing FIB tables Ingo Molnar (1): mm/mmu_context, sched/core: Fix mmu_context.h assumption Jacob Keller (1): fm10k: ensure we process SM mbx when processing VF mbx Jaroslav Kysela (2): ALSA: hda - add support for docking station for HP 820 G2 ALSA: hda - add support for docking station for HP 840 G3 Jeffy Chen (1): netfilter: nfnl_cthelper: Fix memory leak Jing Xia (1): tracing: Fix crash when it fails to alloc ring buffer Johan Hovold (3): mfd: twl4030-audio: Fix sibling-node lookup mfd: twl6040: Fix child-node lookup ASoC: twl4030: fix child-node lookup Jon Hunter (1): mfd: cros ec: spi: Don't send first message too soon Jon Medhurst (1): arm: kprobes: Align stack to 8-bytes in test code Juan Zea (1): usbip: fix usbip bind writing random string after command in match_busid Julian Wiedmann (1): s390/qeth: no ETH header for outbound AF_IUCV Kevin Cernekee (2): net: igmp: Use correct source address on IGMPv3 reports netlink: Add netns check on taps Linus Torvalds (2): kbuild: add '-fno-stack-check' to kernel build options n_tty: fix EXTPROC vs ICANON interaction with TIOCINQ (aka FIONREAD) Liping Zhang (2): netfilter: nfnl_cthelper: fix a race when walk the nf_ct_helper_hash table netfilter: nfnetlink_queue: fix secctx memory leak Maciej S. Szmigiero (1): ASoC: fsl_ssi: AC'97 ops need regmap, clock and cleaning up on failure Masami Hiramatsu (1): arm: kprobes: Fix the return address of multiple kretprobes Mathias Nyman (1): USB: Fix off by one in type-specific length check of BOS SSP capability Max Schulze (1): USB: serial: ftdi_sio: add id for Airbus DS P8GR Mohamed Ghannam (1): net: ipv4: fix for a race condition in raw_sendmsg Nadav Amit (1): mm/rmap: batched invalidations should use existing api Nicholas Piggin (1): cpuidle: fix broadcast control when broadcast can not be entered Nikolay Aleksandrov (1): net: bridge: fix early call to br_stp_change_bridge_id and plug newlink leaks Oliver Neukum (1): usb: add RESET_RESUME for ELSA MicroLink 56K Pablo Neira Ayuso (1): netfilter: nfnl_cthelper: fix runtime expectation policy updates Paolo Bonzini (1): kvm: x86: fix RSM when PCID is non-zero Patrice Chotard (1): pinctrl: st: add irq_request/release_resources callbacks Peter Stein (1): HID: xinmo: fix for out of range for THT 2P arcade controller. Rafael J. Wysocki (1): PCI / PM: Force devices to D0 in pci_pm_thaw_noirq() Ravi Bangoria (1): powerpc/perf: Dereference BHRB entries safely Reinhard Speyerer (1): USB: serial: qcserial: add Sierra Wireless EM7565 Reizer, Eyal (1): ARM: dts: am335x-evmsk: adjust mmc2 param to allow suspend Ricardo Ribalda Delgado (1): spi: xilinx: Detect stall with Unknown commands Rob Herring (1): ARM: dts: ti: fix PCI bus dtc warnings Roger Quadros (1): usb: gadget: f_uvc: Sanity check wMaxPacketSize for SuperSpeed Russell King (2): ARM: dma-mapping: disallow dma_get_sgtable() for non-kernel managed memory rtc: pl031: make interrupt optional SZ Lin (林上智) (1): USB: serial: option: adding support for YUGA CLM920-NC5 Sagi Grimberg (1): RDMA/iser: Fix possible mr leak on device removal event Sankar Patchineelam (1): bnxt_en: Fix NULL pointer dereference in reopen failure path Sebastian Andrzej Siewior (1): crypto: mcryptd - protect the per-CPU queue with a lock Sebastian Sjoholm (1): net: qmi_wwan: add Sierra EM7565 1199:9091 Shaohua Li (1): net: reevalulate autoflowlabel setting after sysctl setting Shuah Khan (2): usbip: stub: stop printing kernel pointer addresses in messages usbip: vhci: stop printing kernel pointer addresses in messages Sreekanth Reddy (1): scsi: mpt3sas: Fix IO error occurs on pulling out a drive from RAID1 volume created on two SATA drive Steve Capper (1): arm64: Initialise high_memory global variable earlier Steve Wise (1): iw_cxgb4: Only validate the MSN for successful completions Steven Rostedt (1): ARM: Hide finish_arch_post_lock_switch() from modules Steven Rostedt (VMware) (3): tracing: Remove extra zeroing out of the ring buffer page tracing: Fix possible double free on failure of allocating trace buffer ring-buffer: Mask out the info bits when returning buffer page length Stuart Hayes (1): PCI: Create SR-IOV virtfn/physfn links before attaching driver Sudip Mukherjee (1): alpha: fix build failures Takashi Iwai (7): ALSA: hda - Clear the leftover component assignment at snd_hdac_i915_exit() ALSA: hda - Degrade i915 binding failure message ALSA: hda - Fix yet another i915 pointer leftover in error path ACPI: APEI / ERST: Fix missing error handling in erst_reader() ALSA: rawmidi: Avoid racy info ioctl via ctl device ALSA: usb-audio: Fix the missing ctl name suffix at parsing SU ALSA: hda: Drop useless WARN_ON() Thomas Gleixner (2): nohz: Prevent a timer interrupt storm in tick_nohz_stop_sched_tick() x86/smpboot: Remove stale TLB flush invocations Tobias Jordan (1): net: mvmdio: disable/unprepare clocks in EPROBE_DEFER case Tonghao Zhang (1): sctp: Replace use of sockets_allocated with specified macro. Tony Lindgren (1): net: qmi_wwan: Add USB IDs for MDM6600 modem on Motorola Droid 4 Vaibhav Jain (1): cxl: Check if vphb exists before iterating over AFU devices Vaidyanathan Srinivasan (2): cpuidle: Validate cpu_dev in cpuidle_add_sysfs() cpuidle: powernv: Pass correct drv->cpumask for registration Varun Prakash (1): scsi: cxgb4i: fix Tx skb leak Wanpeng Li (3): KVM: x86: correct async page present tracepoint KVM: VMX: Fix enable VPID conditions KVM: X86: Fix load RFLAGS w/o the fixed bit Willem de Bruijn (1): sock: free skb in skb_complete_tx_timestamp on error Yelena Krivosheev (1): net: mvneta: clear interface link status on port disable hayeswang (2): r8152: fix the list rx_done may be used without initialization r8152: prevent the driver from transmitting packets with carrier off Makefile | 5 ++- arch/alpha/include/asm/mmu_context.h | 1 + arch/arm/boot/dts/am335x-evmsk.dts | 1 + arch/arm/boot/dts/dra7.dtsi | 2 ++ arch/arm/mm/dma-mapping.c | 20 +++++++++++- arch/arm/probes/kprobes/core.c | 24 +++++++++++++-- arch/arm/probes/kprobes/test-core.c | 11 +++++-- arch/arm64/mm/init.c | 2 +- arch/mips/math-emu/cp1emu.c | 28 ++++++++--------- arch/powerpc/perf/core-book3s.c | 8 +++-- arch/x86/include/asm/tlbflush.h | 4 +-- arch/x86/kernel/reboot.c | 4 +++ arch/x86/kernel/smpboot.c | 9 ------ arch/x86/kvm/emulate.c | 32 ++++++++++++++----- arch/x86/kvm/vmx.c | 9 +++++- arch/x86/kvm/x86.c | 4 +-- arch/x86/xen/enlighten.c | 2 +- crypto/mcryptd.c | 23 ++++++-------- drivers/acpi/apei/erst.c | 2 +- drivers/cpuidle/cpuidle-powernv.c | 18 +++++++++++ drivers/cpuidle/cpuidle.c | 1 + drivers/cpuidle/sysfs.c | 12 ++++++++ drivers/crypto/amcc/crypto4xx_core.h | 10 +++--- drivers/hid/hid-core.c | 1 + drivers/hid/hid-ids.h | 1 + drivers/hid/hid-xinmo.c | 1 + drivers/hwmon/asus_atk0110.c | 3 ++ drivers/infiniband/hw/cxgb4/cq.c | 6 ++-- drivers/infiniband/ulp/iser/iscsi_iser.h | 2 ++ drivers/infiniband/ulp/iser/iser_verbs.c | 8 +++-- drivers/isdn/capi/kcapi.c | 1 + drivers/mfd/cros_ec_spi.c | 1 + drivers/mfd/twl4030-audio.c | 9 ++++-- drivers/mfd/twl6040.c | 12 +++++--- drivers/misc/cxl/pci.c | 13 ++++++++ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 13 ++++++++ drivers/net/ethernet/broadcom/tg3.c | 4 ++- drivers/net/ethernet/brocade/bna/bfa_ioc.c | 10 ++++-- drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 2 +- drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 3 ++ drivers/net/ethernet/intel/i40e/i40e_main.c | 16 +++++++--- drivers/net/ethernet/intel/igb/igb_main.c | 2 ++ drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 4 +-- drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 2 ++ drivers/net/ethernet/marvell/mvmdio.c | 3 +- drivers/net/ethernet/marvell/mvneta.c | 4 +++ drivers/net/irda/vlsi_ir.c | 8 ++--- drivers/net/phy/at803x.c | 2 +- drivers/net/phy/micrel.c | 1 + drivers/net/usb/qmi_wwan.c | 5 +++ drivers/net/usb/r8152.c | 1 + drivers/parisc/lba_pci.c | 33 ++++++++++++++++++++ drivers/pci/iov.c | 3 +- drivers/pci/pci-driver.c | 7 ++++- drivers/pci/pci.c | 4 +++ drivers/pci/pcie/aer/aerdrv_core.c | 9 +++++- drivers/pinctrl/pinctrl-st.c | 30 ++++++++++++++---- drivers/rtc/interface.c | 2 +- drivers/rtc/rtc-pl031.c | 14 +++++---- drivers/s390/net/qeth_l3_main.c | 15 +++------ drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 1 + drivers/scsi/lpfc/lpfc_els.c | 3 +- drivers/scsi/lpfc/lpfc_hbadisc.c | 3 +- drivers/scsi/lpfc/lpfc_hw4.h | 2 +- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 5 +++ drivers/spi/spi-xilinx.c | 11 +++++++ drivers/thermal/hisi_thermal.c | 5 ++- drivers/tty/n_tty.c | 4 +-- drivers/usb/core/config.c | 2 +- drivers/usb/core/quirks.c | 6 +++- drivers/usb/gadget/function/f_uvc.c | 8 +++++ drivers/usb/gadget/udc/pch_udc.c | 1 - drivers/usb/host/xhci-pci.c | 3 ++ drivers/usb/host/xhci-plat.c | 2 +- drivers/usb/serial/ftdi_sio.c | 1 + drivers/usb/serial/ftdi_sio_ids.h | 6 ++++ drivers/usb/serial/option.c | 17 ++++++++++ drivers/usb/serial/qcserial.c | 3 ++ drivers/usb/usbip/stub_main.c | 5 +-- drivers/usb/usbip/stub_rx.c | 7 ++--- drivers/usb/usbip/stub_tx.c | 4 +-- drivers/usb/usbip/vhci_hcd.c | 10 ------ drivers/usb/usbip/vhci_rx.c | 23 +++++++------- drivers/usb/usbip/vhci_tx.c | 3 +- include/crypto/mcryptd.h | 1 + include/linux/ipv6.h | 3 +- include/net/ip.h | 2 ++ kernel/time/tick-sched.c | 19 ++++++++++-- kernel/trace/ring_buffer.c | 6 +++- kernel/trace/trace.c | 13 +++----- net/bridge/br_netlink.c | 11 ++++--- net/core/net_namespace.c | 2 +- net/core/skbuff.c | 6 +++- net/core/sysctl_net_core.c | 6 ++-- net/ipv4/devinet.c | 2 +- net/ipv4/fib_frontend.c | 9 ++++-- net/ipv4/igmp.c | 24 +++++++++------ net/ipv4/ip_fragment.c | 25 ++++++++++----- net/ipv4/ip_tunnel.c | 4 +-- net/ipv4/netfilter/nf_nat_snmp_basic.c | 19 +----------- net/ipv4/raw.c | 15 ++++++--- net/ipv4/tcp_ipv4.c | 2 +- net/ipv4/tcp_vegas.c | 2 +- net/ipv6/af_inet6.c | 1 - net/ipv6/ip6_output.c | 12 ++++++-- net/ipv6/ipv6_sockglue.c | 1 + net/ipv6/mcast.c | 25 +++++++++------ net/ipv6/tcp_ipv6.c | 2 +- net/netfilter/nfnetlink_queue.c | 9 ++++-- net/netlink/af_netlink.c | 41 +++++++++++++++++++++++++ net/sched/sch_dsmark.c | 10 ++++-- net/sctp/socket.c | 4 +-- sound/core/rawmidi.c | 15 +++++++-- sound/hda/hdac_i915.c | 2 +- sound/pci/hda/patch_conexant.c | 11 +++++++ sound/pci/hda/patch_realtek.c | 19 +++++++++++- sound/soc/codecs/twl4030.c | 4 ++- sound/soc/fsl/fsl_ssi.c | 18 +++++++---- sound/usb/mixer.c | 27 +++++++++------- tools/usb/usbip/src/utils.c | 9 ++++-- virt/kvm/kvm_main.c | 2 +- 121 files changed, 725 insertions(+), 280 deletions(-) BUG= chromium:798433 TEST=Build and test on various affected systems Change-Id: I60c3962e38bff224e7b74c3ad374915c1cce3fcd Signed-off-by: Guenter Roeck <groeck@chromium.org> [modify] https://crrev.com/b5e2483ae8c0b074013e8096e34b6c77ed32850b/arch/x86/kernel/cpu/common.c [modify] https://crrev.com/b5e2483ae8c0b074013e8096e34b6c77ed32850b/net/netfilter/nfnetlink_cthelper.c [modify] https://crrev.com/b5e2483ae8c0b074013e8096e34b6c77ed32850b/net/ipv4/raw.c [modify] https://crrev.com/b5e2483ae8c0b074013e8096e34b6c77ed32850b/arch/x86/include/asm/tlbflush.h [modify] https://crrev.com/b5e2483ae8c0b074013e8096e34b6c77ed32850b/arch/x86/xen/enlighten.c [modify] https://crrev.com/b5e2483ae8c0b074013e8096e34b6c77ed32850b/arch/x86/mm/tlb.c [modify] https://crrev.com/b5e2483ae8c0b074013e8096e34b6c77ed32850b/drivers/usb/host/xhci-plat.c
,
Jan 6 2018
|
|||||
►
Sign in to add a comment |
|||||
Comment 1 by bugdroid1@chromium.org
, Jan 2 2018