New issue
Advanced search Search tips

Issue 823299 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner:
Closed: Mar 2018
Components:
EstimatedDays: ----
NextAction: ----
OS: Chrome
Pri: 3
Type: Bug



Sign in to add a comment

Merge v4.14.28 into chromeos-4.14

Project Member Reported by groeck@chromium.org, Mar 19 2018

Issue description

Merge v4.14.28 into chromeos-4.14
 

Comment 1 by groeck@chromium.org, Mar 19 2018

Summary: Merge v4.14.28 into chromeos-4.14 (was: Merge v4.4.28 into chromeos-4.14)
Project Member

Comment 2 by bugdroid1@chromium.org, Mar 22 2018

Labels: merge-merged-chromeos-4.14
The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/91384c3efb565982d7738b505762e5c685036ed0

commit 91384c3efb565982d7738b505762e5c685036ed0
Author: Guenter Roeck <groeck@chromium.org>
Date: Tue Mar 20 03:21:43 2018

CHROMIUM: Merge 'v4.14.28' into chromeos-4.14

Merge of v4.14.28 into chromeos-4.14

Changes applied on top of 'v4.14.28' prior to merge:
    f301b77840d5 CHROMIUM: Revert "drm/i915/glk: Disable Guc and HuC on GLK"

Changelog:
----------------------------------------------------------------
Adam Thomson (1):
      typec: tcpm: fusb302: Resolve out of order messaging events

Adiel Aloni (1):
      mac80211_hwsim: enforce PS_MANUAL_POLL to be set after PS_ENABLED

Adrian Hunter (1):
      mmc: mmc_test: Ensure command queue is disabled for testing

Alexey Khoroshilov (1):
      rtc: brcmstb-waketimer: fix error handling in brcmstb_waketmr_probe()

Andrew F. Davis (2):
      ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin
      ARM: dts: omap3-n900: Fix the audio CODEC's reset pin

Andrew Lunn (1):
      net: phy: Restore phy_resume() locking assumption

Anusha Srivatsa (1):
      drm/i915/glk: Disable Guc and HuC on GLK

Arnd Bergmann (1):
      IB/mlx5: revisit -Wmaybe-uninitialized warning

Axel Lin (1):
      pwm: stmpe: Fix wrong register offset for hwpwm=2 case

Bart Van Assche (1):
      scsi: core: scsi_get_device_flags_keyed(): Always return device flags

Ben Greear (1):
      ath10k: fix invalid STS_CAP_OFFSET_MASK

Bjorn Andersson (1):
      leds: pm8058: Silence pointer to integer size warning

Chris Wilson (2):
      dma-buf/fence: Fix lock inversion within dma-fence-array
      agp/intel: Flush all chipset writes after updating the GGTT

Christophe JAILLET (2):
      power: supply: ab8500_charger: Fix an error handling path
      power: supply: ab8500_charger: Bail out in case of error in 'ab8500_charger_init_hw_registers()'

Christophe Leroy (1):
      Fix misannotated out-of-line _copy_to_user()

Colin Ian King (3):
      usbip: vudc: fix null pointer dereference on udc->lock
      staging: rtl8822be: fix missing null check on dev_alloc_skb return
      crypto: cavium - fix memory leak on info

Dan Carpenter (2):
      media: cpia2: Fix a couple off by one bugs
      ASoC: nuc900: Fix a loop timeout test

Danilo Krummrich (1):
      usb: quirks: add control message delay for 1b1c:1b20

Davidlohr Bueso (1):
      locking/locktorture: Fix num reader/writer corner cases

Emmanuel Grumbach (1):
      iwlwifi: mvm: rs: don't override the rate history in the search cycle

Eric W. Biederman (1):
      userns: Don't fail follow_automount based on s_user_ns

Fabio Estevam (1):
      ASoC: sgtl5000: Fix suspend/resume

Fabrizio Castro (1):
      pinctrl: sh-pfc: r8a7791: Add can_clk function

Felix Kuehling (1):
      drm/amdgpu: fix get_max_engine_clock_in_mhz

Frank Mori Hess (1):
      staging: comedi: fix comedi_nsamples_left.

Geert Uytterhoeven (1):
      arm64: dts: renesas: salvator-common: Add EthernetAVB PHY reset

Greentime Hu (1):
      earlycon: add reg-offset to physical address before mapping

Greg Kroah-Hartman (2):
      Revert "btrfs: use proper endianness accessors for super_copy"
      Linux 4.14.28

Guenter Roeck (2):
      CHROMIUM: Revert "drm/i915/glk: Disable Guc and HuC on GLK"
      Merge remote-tracking branch 'origin/linux/v4.14.28' into merge/chromeos-4.14-v4.14.28

Gustavo A. R. Silva (1):
      media: davinci: vpif_capture: add NULL check on devm_kzalloc return value

H.J. Lu (1):
      x86: Treat R_X86_64_PLT32 as R_X86_64_PC32

Hans de Goede (2):
      ASoC: rt5651: Fix regcache sync errors on resume
      HID: multitouch: Only look at non touch fields in first packet of a frame

Heinz Mauelshagen (1):
      dm raid: fix raid set size revalidation

Horia Geantă (1):
      crypto: caam/qi - use correct print specifier for size_t

Jagdish Gediya (1):
      mtd: nand: ifc: update bufnum mask for ver >= 2.0.0

Jani Nikula (1):
      drm/edid: set ELD connector type in drm_edid_to_eld()

Jernej Skrabec (1):
      drm/sun4i: Fix format mask in DE2 driver

Jiri Kosina (1):
      HID: elo: clear BTN_LEFT mapping

Joel Fernandes (1):
      staging: android: ashmem: Fix lockdep issue during llseek

Johan Hovold (1):
      USB: ledtrig-usbport: fix of-node leak

John Fastabend (1):
      net: sched: drop qdisc_reset from dev_graft_qdisc

Jonas Danielsson (1):
      tty/serial: atmel: add new version check for usart

Josh Poimboeuf (1):
      powerpc/modules: Don't try to restore r2 after a sibling call

Julien BOIBESSOT (1):
      tools/usbip: fixes build with musl libc toolchain

Kai-Heng Feng (1):
      xhci: Fix front USB ports on ASUS PRIME B350M-A

Kieran Bingham (1):
      media: vsp1: Prevent suspending and resuming DRM pipelines

Li Dongyang (1):
      scsi: ses: don't ask for diagnostic pages repeatedly during probe

Limin Zhu (1):
      mwifiex: cfg80211: do not change virtual interface during scan processing

Lorenzo Colitti (1):
      net: xfrm: allow clearing socket xfrm policies.

Luca Coelho (1):
      mac80211: remove BUG() when interface type is invalid

Luis R. Rodriguez (1):
      test_firmware: fix setting old custom fw path back on exit

Mahesh Bandewar (1):
      ipvlan: add L2 check for packets arriving via virtual devices

Manikanta Pubbisetty (1):
      ath10k: update tdls teardown state to target

Mathias Nyman (1):
      xhci: fix endpoint context tracer output

Michael Chan (1):
      bnxt_en: Don't print "Link speed -1 no longer supported" messages.

Michael Hennerich (1):
      net: ieee802154: adf7242: Fix bug if defined DEBUG

Mimi Zohar (1):
      ima: relax requiring a file signature for new files with zero length

Miquel Raynal (1):
      mtd: nand: fix interpretation of NAND_CMD_NONE in nand_command[_lp]()

Monk Liu (2):
      drm/amdgpu:fix random missing of FLR NOTIFY
      drm/amdgpu:fix virtual dce bug

Nicholas Piggin (1):
      powerpc/64: Don't trace irqs-off at interrupt return to soft-disabled context

Nikola Ciprich (1):
      serial: 8250_pci: Add Brainboxes UC-260 4 port serial device

Oliver Neukum (1):
      uas: fix comparison for error code

Paul E. McKenney (2):
      sched: Stop switched_to_rt() from sending IPIs to offline CPUs
      sched: Stop resched_cpu() from sending IPIs to offline CPUs

Pete Zaitcev (1):
      usb: usbmon: Read text within supplied buffer size

Peter Meerwald-Stadler (1):
      iio: health: max30102: Add power enable parameter to get_temp function

Philipp Zabel (1):
      drm/etnaviv: make THERMAL selectable

Pierre (1):
      crypto: ecc - Fix NULL pointer deref. on no default_rng

Rafael J. Wysocki (1):
      cpufreq: Fix governor module removal race

Richard Fitzgerald (1):
      ASoC: wm_adsp: For TLV controls only register TLV get/set

Roger Quadros (1):
      usb: dwc3: Fix lock-up on ID change during system suspend/resume

Russell King (1):
      net: phy: fix resume handling

Sara Sharon (1):
      iwlwifi: mvm: avoid dumping assert log when device is stopped

Sebastian Andrzej Siewior (1):
      serial: core: mark port as initialized in autoconfig

SeongJae Park (1):
      rcutorture/configinit: Fix build directory error message

Simon Horman (1):
      ARM: dts: koelsch: Move cec_clock to root node

Simon Shields (1):
      ARM: dts: exynos: Correct Trats2 panel reset line

Sinan Kaya (1):
      dmaengine: qcom_hidma: check pending interrupts

Srinivas Kandagatla (1):
      clk: qcom: msm8916: fix mnd_width for codec_digcodec

Stefan Brüns (1):
      iio: adc: ina2xx: Shift bus voltage register to mask flag bits

Steffen Maier (1):
      dm mpath: fix passing integrity data

Stephen Hemminger (1):
      veth: set peer GSO values

Sunil Goutham (1):
      net: thunderx: Set max queue count taking XDP_TX into account

Takeshi Kihara (1):
      pinctrl: sh-pfc: r8a7795-es1: Fix MOD_SEL1 bit[25:24] to 0x3 when using STP_ISEN_1_D

Teijo Kinnunen (1):
      USB: storage: Add JMicron bridge 152d:2567 to unusual_devs.h

Thomas Richter (2):
      perf annotate: Fix unnecessary memory allocation for s390x
      perf annotate: Fix objdump comment parsing for Intel mov dissassembly

Tobias Jordan (1):
      spi: sun6i: disable/unprepare clocks on remove

Toshiaki Makita (1):
      virtio_net: Disable interrupts if napi_complete_done rescheduled napi

Ulrich Hecht (1):
      serial: sh-sci: prevent lockup on full TTY buffers

Ville Syrjälä (1):
      video/hdmi: Allow "empty" HDMI infoframes

Xinyong (1):
      usb: gadget: f_fs: Fix use-after-free in ffs_fs_kill_sb()

Xose Vazquez Perez (2):
      scsi: devinfo: apply to HP XP the same flags as Hitachi VSP
      scsi: dh: add new rdac devices

Yixun Lan (1):
      clk: meson: gxbb: fix wrong clock for SARADC/SANA

Yong Deng (1):
      ASoC: sun4i-i2s: Fix RX slot number of SUN8I

Yong Zhao (1):
      drm/amdkfd: Fix memory leaks in kfd topology

Yoshihiro Shimoda (1):
      usb: host: xhci-rcar: add support for r8a77965

Yossef Efraim (1):
      xfrm: Fix xfrm_replay_overflow_offload_esn

 Documentation/devicetree/bindings/usb/usb-xhci.txt |   1 +
 Makefile                                           |   2 +-
 arch/arm/boot/dts/am335x-pepper.dts                |   2 +-
 arch/arm/boot/dts/exynos4412-trats2.dts            |   2 +-
 arch/arm/boot/dts/omap3-n900.dts                   |   4 +-
 arch/arm/boot/dts/r8a7791-koelsch.dts              |  12 +-
 arch/arm64/boot/dts/renesas/salvator-common.dtsi   |   1 +
 arch/powerpc/include/asm/code-patching.h           |   1 +
 arch/powerpc/kernel/entry_64.S                     |  10 +-
 arch/powerpc/kernel/module_64.c                    |  12 +-
 arch/powerpc/lib/code-patching.c                   |   5 +
 arch/x86/kernel/machine_kexec_64.c                 |   1 +
 arch/x86/kernel/module.c                           |   1 +
 arch/x86/tools/relocs.c                            |   3 +
 crypto/ecc.c                                       |   2 +-
 drivers/base/Kconfig                               |   1 +
 drivers/char/agp/intel-gtt.c                       |   2 +
 drivers/clk/meson/gxbb.c                           |   4 +-
 drivers/clk/qcom/gcc-msm8916.c                     |   1 +
 drivers/cpufreq/cpufreq.c                          |   6 +
 drivers/crypto/caam/caamalg_qi.c                   |   6 +-
 drivers/crypto/cavium/cpt/cptvf_reqmanager.c       |   3 +-
 drivers/dma-buf/dma-fence-array.c                  |  14 ++-
 drivers/dma/qcom/hidma_ll.c                        |   9 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c         |   7 +-
 drivers/gpu/drm/amd/amdgpu/dce_virtual.c           |   4 +-
 drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c              |  14 ++-
 drivers/gpu/drm/amd/amdkfd/kfd_topology.c          |  10 ++
 drivers/gpu/drm/drm_edid.c                         |   9 +-
 drivers/gpu/drm/etnaviv/Kconfig                    |   9 ++
 drivers/gpu/drm/etnaviv/etnaviv_gpu.c              |   8 +-
 drivers/gpu/drm/sun4i/sun8i_mixer.h                |   2 +-
 drivers/hid/hid-elo.c                              |   6 +
 drivers/hid/hid-multitouch.c                       |  17 ++-
 drivers/iio/adc/ina2xx-adc.c                       |  26 +++--
 drivers/iio/health/max30102.c                      |  36 +++---
 drivers/infiniband/hw/mlx5/mr.c                    |   3 +
 drivers/leds/leds-pm8058.c                         |   2 +-
 drivers/md/dm-mpath.c                              |   5 +-
 drivers/md/dm-raid.c                               |  30 +++--
 drivers/media/platform/davinci/vpif_capture.c      |   2 +
 drivers/media/platform/vsp1/vsp1_drv.c             |  16 ++-
 drivers/media/usb/cpia2/cpia2_v4l.c                |   4 +-
 drivers/mmc/core/mmc_test.c                        |  11 +-
 drivers/mtd/nand/fsl_ifc_nand.c                    |   7 ++
 drivers/mtd/nand/nand_base.c                       |   9 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt.c          |  10 +-
 drivers/net/ethernet/cavium/thunder/nicvf_main.c   |   5 +
 drivers/net/ieee802154/adf7242.c                   |   4 +-
 drivers/net/ipvlan/ipvlan_core.c                   |   4 +
 drivers/net/phy/at803x.c                           |   4 -
 drivers/net/phy/phy.c                              |   9 +-
 drivers/net/phy/phy_device.c                       |  20 +++-
 drivers/net/veth.c                                 |   3 +
 drivers/net/virtio_net.c                           |   9 +-
 drivers/net/wireless/ath/ath10k/mac.c              |  10 ++
 drivers/net/wireless/ath/ath10k/wmi.h              |   3 +-
 drivers/net/wireless/intel/iwlwifi/mvm/rs.c        |   4 +-
 drivers/net/wireless/intel/iwlwifi/mvm/utils.c     |   6 +
 drivers/net/wireless/mac80211_hwsim.c              |  17 ++-
 drivers/net/wireless/marvell/mwifiex/cfg80211.c    |   6 +
 drivers/pinctrl/sh-pfc/pfc-r8a7791.c               |  22 +++-
 drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c           |   2 +-
 drivers/power/supply/ab8500_charger.c              |   6 +-
 drivers/pwm/pwm-stmpe.c                            |   2 +-
 drivers/rtc/rtc-brcmstb-waketimer.c                |  15 ++-
 drivers/scsi/scsi_devinfo.c                        |   9 +-
 drivers/scsi/scsi_dh.c                             |   5 +-
 drivers/scsi/ses.c                                 |  11 +-
 drivers/spi/spi-sun6i.c                            |   2 +-
 drivers/staging/android/ashmem.c                   |  15 ++-
 drivers/staging/comedi/drivers.c                   |   3 +-
 drivers/staging/rtlwifi/rtl8822be/fw.c             |   2 +
 drivers/staging/typec/fusb302/fusb302.c            |  21 +++-
 drivers/tty/serial/8250/8250_pci.c                 |  11 ++
 drivers/tty/serial/atmel_serial.c                  |   1 +
 drivers/tty/serial/earlycon.c                      |   3 +-
 drivers/tty/serial/serial_core.c                   |   2 +
 drivers/tty/serial/sh-sci.c                        |   2 +
 drivers/usb/core/ledtrig-usbport.c                 |   8 +-
 drivers/usb/core/message.c                         |   4 +
 drivers/usb/core/quirks.c                          |   3 +-
 drivers/usb/dwc3/core.c                            |   2 +-
 drivers/usb/gadget/function/f_fs.c                 |   1 -
 drivers/usb/host/xhci-pci.c                        |   3 +
 drivers/usb/host/xhci-rcar.c                       |   4 +
 drivers/usb/host/xhci.c                            |   3 +
 drivers/usb/host/xhci.h                            |  23 ++--
 drivers/usb/mon/mon_text.c                         | 126 +++++++++++++--------
 drivers/usb/storage/uas.c                          |   2 +-
 drivers/usb/storage/unusual_devs.h                 |   7 ++
 drivers/usb/usbip/vudc_sysfs.c                     |   8 +-
 drivers/video/hdmi.c                               |  51 +++++----
 fs/btrfs/sysfs.c                                   |   8 +-
 fs/btrfs/transaction.c                             |  20 ++--
 fs/namei.c                                         |   3 -
 include/linux/dma-fence-array.h                    |   3 +
 include/linux/phy.h                                |   1 +
 include/linux/usb/quirks.h                         |   3 +
 kernel/locking/locktorture.c                       |  76 +++++++------
 kernel/sched/core.c                                |   3 +-
 kernel/sched/rt.c                                  |   2 +-
 lib/usercopy.c                                     |   2 +-
 net/mac80211/iface.c                               |   2 +-
 net/sched/sch_generic.c                            |  28 +++--
 net/xfrm/xfrm_policy.c                             |   2 +-
 net/xfrm/xfrm_replay.c                             |   3 +-
 net/xfrm/xfrm_state.c                              |   7 ++
 security/integrity/ima/ima_appraise.c              |   3 +-
 sound/soc/codecs/rt5651.c                          |   1 +
 sound/soc/codecs/sgtl5000.c                        |  11 ++
 sound/soc/codecs/wm_adsp.c                         |  14 ++-
 sound/soc/nuc900/nuc900-ac97.c                     |   4 +-
 sound/soc/sunxi/sun4i-i2s.c                        |   2 +-
 tools/perf/arch/s390/annotate/instructions.c       |   3 +-
 tools/perf/util/annotate.c                         |   8 +-
 tools/testing/selftests/firmware/fw_filesystem.sh  |   5 +-
 .../testing/selftests/rcutorture/bin/configinit.sh |   2 +-
 tools/usb/usbip/src/usbipd.c                       |   2 +-
 119 files changed, 732 insertions(+), 321 deletions(-)

BUG= chromium:823299 
TEST=Build and test on various affected systems

Change-Id: Ic77aefb7c28ed8fcbcc0f3a9a0eafe7022e594b8
Signed-off-by: Guenter Roeck <groeck@chromium.org>


Comment 3 by groeck@chromium.org, Mar 22 2018

Status: Fixed (was: Assigned)

Sign in to add a comment