New issue
Advanced search Search tips

Issue 910938 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner:
Closed: Dec 6
Components:
EstimatedDays: ----
NextAction: ----
OS: Chrome
Pri: 3
Type: Bug



Sign in to add a comment

Merge v4.4.166 into chromeos-4.4

Project Member Reported by groeck@chromium.org, Dec 2

Issue description

Merge v4.4.166 into chromeos-4.4
 
Status: Started (was: Assigned)
Project Member

Comment 2 by bugdroid1@chromium.org, Dec 6

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

commit e86b1d9010ba80ec23d4f6aa96874bd1075e5967
Author: Guenter Roeck <groeck@chromium.org>
Date: Sun Dec 02 17:56:57 2018

CHROMIUM: Merge 'v4.4.166' into chromeos-4.4

Merge of v4.4.166 into chromeos-4.4

Conflicts:
    kernel/debug/kdb/kdb_io.c
    fs/namei.c

Changelog:
----------------------------------------------------------------
Aaron Ma (2):
      usb: xhci: fix timeout for transition from RExit to U0
      usb: xhci: fix uninitialized completion when USB3 port got wrong status

Amitkumar Karwar (1):
      mwifiex: Fix NULL pointer dereference in skb_dequeue()

Andrew Price (1):
      gfs2: Don't leave s_fs_info pointing to freed memory in init_sbd

Andy Lutomirski (1):
      x86/entry/64: Remove %ebx handling from error_entry/exit

Anson Huang (1):
      cpufreq: imx6q: add return value check for voltage scale

Arnd Bergmann (1):
      Input: xpad - remove unused function

Arvind Yadav (1):
      Input: xpad - constify usb_device_id

Benjamin Valentin (5):
      Input: xpad - sort supported devices by USB ID
      Input: xpad - sync supported devices with xboxdrv
      Input: xpad - add USB IDs for Mad Catz Brawlstick and Razer Sabertooth
      Input: xpad - sync supported devices with 360Controller
      Input: xpad - sync supported devices with XBCD

Cameron Gutman (11):
      Input: xpad - prevent spurious input from wired Xbox 360 controllers
      Input: xpad - fix rumble on Xbox One controllers with 2015 firmware
      Input: xpad - power off wireless 360 controllers on suspend
      Input: xpad - add product ID for Xbox One S pad
      Input: xpad - fix Xbox One rumble stopping after 2.5 secs
      Input: xpad - don't depend on endpoint order
      Input: xpad - fix stuck mode button on Xbox One S pad
      Input: xpad - restore LED state after device resume
      Input: xpad - support some quirky Xbox One pads
      Input: xpad - fix PowerA init quirk for some gamepad models
      Input: xpad - validate USB endpoint type during probe

Clement Calmels (1):
      Input: xpad - remove spurious events of wireless xpad 360 controller

Daniel Tobias (2):
      Input: xpad - correctly sort vendor id's
      Input: xpad - move reporting xbox one home button to common function

Dennis Wassenberg (1):
      usb: core: Fix hub port connection events lost

Dmitry Torokhov (1):
      Input: xpad - use LED API when identifying wireless controllers

Dominique Martinet (1):
      v9fs_dir_readdir: fix double-free on p9stat_read error

Emmanuel Grumbach (2):
      iwlwifi: mvm: support sta_statistics() even on older firmware
      iwlwifi: mvm: fix regulatory domain update when the firmware starts

Enno Boland (1):
      Input: xpad - fix GPD Win 2 controller name

Eric Dumazet (1):
      llc: do not use sk_eat_skb()

Ethan Lee (1):
      Input: xpad - add GPD Win 2 Controller USB IDs

Francis Therien (1):
      Input: xpad - add PDP device id 0x02a4

Greg Hackmann (1):
      arm64: remove no-op -p linker flag

Greg Kroah-Hartman (3):
      MAINTAINERS: Add Sasha as a stable branch maintainer
      tty: wipe buffer if not echoing data
      Linux 4.4.166

Guenter Roeck (1):
      Merge remote-tracking branch 'origin/linux/v4.4.166' into merge/chromeos-4.4-v4.4.166

Janosch Frank (1):
      s390/mm: Check for valid vma before zapping in gmap_discard

Johan Hovold (3):
      of: add helper to lookup compatible child node
      NFC: nfcmrvl_uart: fix OF child-node lookup
      net: bcmgenet: fix OF child-node lookup

Johannes Thumshirn (1):
      cw1200: Don't leak memory if krealloc failes

Karthik D A (1):
      mwifiex: fix p2p device doesn't find in scan problem

Leo Sperling (1):
      Input: xpad - fix some coding style issues

Linus Torvalds (1):
      tty: wipe buffer.

Liping Zhang (1):
      netfilter: nf_tables: fix oops when inserting an element into a verdict map

Marc Kleine-Budde (4):
      can: dev: can_get_echo_skb(): factor out non sending code to __can_get_echo_skb()
      can: dev: __can_get_echo_skb(): replace struct can_frame by canfd_frame to access frame length
      can: dev: __can_get_echo_skb(): Don't crash the kernel if can_priv::echo_skb is accessed out of bounds
      can: dev: __can_get_echo_skb(): print error message, if trying to echo non existing skb

Marcus Folkesson (1):
      Input: xpad - avoid using __set_bit() for capabilities

Mark Furneaux (1):
      Input: xpad - add support for PDP Xbox One controllers

Mathias Nyman (1):
      usb: xhci: Prevent bus suspend if a port connect change or polling state is detected

Mauricio Faria de Oliveira (1):
      scsi: qla2xxx: do not queue commands when unloading

Nicolas Iooss (1):
      x86/entry: spell EBX register correctly in documentation

Pavel Rojtberg (5):
      Input: xpad - workaround dead irq_out after suspend/ resume
      Input: xpad - correct xbox one pad device name
      Input: xpad - add more third-party controllers
      Input: xpad - xbox one elite controller support
      Input: xpad - simplify error condition in init_output

Pierre-Loup A. Griffais (2):
      Input: xpad - handle "present" and "gone" correctly
      Input: xpad - update Xbox One Force Feedback Support

Prarit Bhargava (1):
      kdb: Use strscpy with destination buffer size

Qu Wenruo (1):
      btrfs: Ensure btrfs_trim_fs can trim the whole filesystem

Ramses Ramírez (1):
      Input: xpad - add support for Xbox1 PDP Camo series gamepad

Salvatore Mesoraca (1):
      namei: allow restricted O_CREAT of FIFOs and regular files

Satheesh Rajendran (1):
      powerpc/numa: Suppress "VPHN is not supported" messages

Scott Wood (1):
      KVM: PPC: Move and undef TRACE_INCLUDE_PATH/FILE

Silvan Jegen (1):
      Input: xpad - add Mad Catz FightStick TE 2 VID/PID

Steven Rostedt (VMware) (1):
      sched/core: Allow __sched_setscheduler() in interrupts when PI is not used

Subhash Jadavani (2):
      scsi: ufs: fix race between clock gating and devfreq scaling work
      scsi: ufshcd: release resources if probe fails

Tetsuo Handa (1):
      bfs: add sanity check at bfs_fill_super()

Thomas Zimmermann (1):
      drm/ast: Remove existing framebuffers before loading driver

Trond Myklebust (1):
      SUNRPC: Fix a bogus get/put in generic_key_to_expire()

Vasanthakumar Thiagarajan (1):
      ath10k: fix kernel panic due to race in accessing arvif list

Venkat Gopalakrishnan (1):
      scsi: ufshcd: Fix race between clk scaling and ungate work

Xin Long (1):
      sctp: clear the transport of some out_chunk_list chunks in sctp_assoc_rm_peer

Y.C. Chen (2):
      drm/ast: change resolution may cause screen blurred
      drm/ast: fixed cursor may disappear sometimes

Yaniv Gardi (1):
      scsi: ufs: fix bugs related to null pointer access and array size

Yufen Yu (1):
      tmpfs: make lseek(SEEK_DATA/SEK_HOLE) return ENXIO with a negative offset

 Documentation/sysctl/fs.txt                       |  36 +
 MAINTAINERS                                       |   1 +
 Makefile                                          |   2 +-
 arch/arm64/Makefile                               |   2 +-
 arch/powerpc/kvm/trace.h                          |   8 +-
 arch/powerpc/kvm/trace_booke.h                    |   9 +-
 arch/powerpc/kvm/trace_hv.h                       |   9 +-
 arch/powerpc/kvm/trace_pr.h                       |   9 +-
 arch/powerpc/mm/numa.c                            |   2 +-
 arch/s390/mm/pgtable.c                            |   2 +
 arch/x86/entry/entry_64.S                         |  20 +-
 drivers/cpufreq/imx6q-cpufreq.c                   |   7 +-
 drivers/gpu/drm/ast/ast_drv.c                     |  21 +
 drivers/gpu/drm/ast/ast_mode.c                    |   3 +-
 drivers/input/joystick/xpad.c                     | 810 +++++++++++++++++-----
 drivers/net/can/dev.c                             |  48 +-
 drivers/net/ethernet/broadcom/genet/bcmmii.c      |   2 +-
 drivers/net/wireless/ath/ath10k/mac.c             |   6 +
 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c |  12 +-
 drivers/net/wireless/intel/iwlwifi/mvm/nvm.c      |   5 +-
 drivers/net/wireless/st/cw1200/wsm.c              |  16 +-
 drivers/nfc/nfcmrvl/uart.c                        |   5 +-
 drivers/of/base.c                                 |  25 +
 drivers/scsi/qla2xxx/qla_os.c                     |   5 +
 drivers/scsi/ufs/ufs.h                            |   3 +-
 drivers/scsi/ufs/ufshcd-pci.c                     |   2 +
 drivers/scsi/ufs/ufshcd-pltfrm.c                  |   5 +-
 drivers/scsi/ufs/ufshcd.c                         |  75 +-
 drivers/tty/n_tty.c                               |  19 +-
 drivers/tty/tty_buffer.c                          |   2 +
 drivers/usb/core/hub.c                            |   4 +-
 drivers/usb/host/xhci-hub.c                       |  66 +-
 drivers/usb/host/xhci-ring.c                      |   2 +-
 drivers/usb/host/xhci.h                           |   2 +-
 fs/9p/vfs_dir.c                                   |  11 -
 fs/bfs/inode.c                                    |   9 +-
 fs/btrfs/extent-tree.c                            |  10 +-
 fs/btrfs/ioctl.c                                  |  11 +-
 fs/gfs2/ops_fstype.c                              |   2 +-
 fs/namei.c                                        |  53 +-
 include/linux/can/dev.h                           |   1 +
 include/linux/fs.h                                |   2 +
 include/linux/of.h                                |   8 +
 kernel/debug/kdb/kdb_io.c                         |  15 +-
 kernel/debug/kdb/kdb_private.h                    |   2 +-
 kernel/debug/kdb/kdb_support.c                    |  10 +-
 kernel/sched/core.c                               |   4 +-
 kernel/sysctl.c                                   |  18 +
 mm/shmem.c                                        |   4 +-
 net/llc/af_llc.c                                  |  11 +-
 net/netfilter/nf_tables_api.c                     |   1 +
 net/sctp/associola.c                              |  10 +-
 net/sunrpc/auth_generic.c                         |   8 +-
 53 files changed, 1100 insertions(+), 335 deletions(-)

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

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

[modify] https://crrev.com/e86b1d9010ba80ec23d4f6aa96874bd1075e5967/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
[modify] https://crrev.com/e86b1d9010ba80ec23d4f6aa96874bd1075e5967/drivers/net/wireless/st/cw1200/wsm.c
[delete] https://crrev.com/77480abc681f7fdc94b64981053566a4ae15c1d8/drivers/net/wireless/mwifiex/wmm.c
[delete] https://crrev.com/77480abc681f7fdc94b64981053566a4ae15c1d8/drivers/net/wireless/iwlwifi/mvm/mac80211.c
[delete] https://crrev.com/77480abc681f7fdc94b64981053566a4ae15c1d8/drivers/net/wireless/iwlwifi/mvm/nvm.c
[modify] https://crrev.com/e86b1d9010ba80ec23d4f6aa96874bd1075e5967/fs/namei.c
[delete] https://crrev.com/77480abc681f7fdc94b64981053566a4ae15c1d8/drivers/net/wireless/cw1200/wsm.c
[modify] https://crrev.com/e86b1d9010ba80ec23d4f6aa96874bd1075e5967/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
[modify] https://crrev.com/e86b1d9010ba80ec23d4f6aa96874bd1075e5967/kernel/debug/kdb/kdb_io.c
[delete] https://crrev.com/77480abc681f7fdc94b64981053566a4ae15c1d8/drivers/net/wireless/mwifiex/cfg80211.c

Status: Fixed (was: Started)

Sign in to add a comment