New issue
Advanced search Search tips

Issue 908469 link

Starred by 2 users

Issue metadata

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



Sign in to add a comment

Merge v4.4.165 into chromeos-4.4

Project Member Reported by groeck@chromium.org, Nov 26

Issue description

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

Comment 2 by bugdroid1@chromium.org, Dec 1

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

commit a4e85e7a1ecb14195ca7db082189155d69e539e6
Author: Guenter Roeck <groeck@chromium.org>
Date: Wed Nov 28 16:35:08 2018

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

Merge of v4.4.165 into chromeos-4.4

Conflicts:
    scripts/Kbuild.include
    net/ipv6/route.c
    drivers/media/v4l2-core/videobuf2-core.c
    drivers/media/v4l2-core/v4l2-event.c
    arch/x86/Makefile
    Makefile

Changelog:
----------------------------------------------------------------
Al Viro (1):
      new helper: uaccess_kernel()

Andreas Gruenbacher (1):
      gfs2: Put bitmap buffers in put_super

Ard Biesheuvel (3):
      crypto: arm64/sha - avoid non-standard inline asm tricks
      efi/libstub/arm64: Force 'hidden' visibility for section markers
      efi/libstub/arm64: Set -fpie when building the EFI stub

Arnd Bergmann (1):
      modules: mark __inittest/__exittest as __maybe_unused

Behan Webster (2):
      kbuild: Add better clang cross build support
      kbuild: use -Oz instead of -Os when using clang

Chengguang Xu (1):
      fs/exofs: fix potential memory leak in mount option parsing

Chris Fries (1):
      kbuild: Set KBUILD_CFLAGS before incl. arch Makefile

Dan Carpenter (1):
      uio: Fix an Oops on load

David Ahern (1):
      ipv6: Fix PMTU updates for UDP/raw sockets in presence of VRF

David Lin (1):
      kbuild: clang: fix build failures with sparse check

Emmanuel Pescosta (1):
      usb: quirks: Add delay-init quirk for Corsair K70 LUX RGB

Eric Biggers (1):
      HID: uhid: forbid UHID_CREATE under KERNEL_DS or elevated privileges

Eric Dumazet (1):
      net-gro: reset skb->pkt_type in napi_reuse_skb()

Eric Westbrook (1):
      netfilter: ipset: actually allow allowable CIDR 0 in hash:net,port,net

Ernesto A. Fernández (2):
      hfs: prevent btree data loss on root split
      hfsplus: prevent btree data loss on root split

Geert Uytterhoeven (1):
      hwmon: (ibmpowernv) Remove bogus __init annotations

Greg Kroah-Hartman (2):
      Revert "Bluetooth: h5: Fix missing dependency on BT_HCIUART_SERDEV"
      Linux 4.4.165

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

Gustavo A. R. Silva (1):
      drivers/misc/sgi-gru: fix Spectre v1 vulnerability

Hans Verkuil (1):
      Revert "media: videobuf2-core: don't call memop 'finish' when queueing"

Hans de Goede (1):
      ACPI / platform: Add SMB0001 HID to forbidden_id_list

Jann Horn (1):
      reiserfs: propagate errors from fill_with_dentries() properly

Jeremy Linton (1):
      lib/raid6: Fix arm64 test build

Jeroen Hofstee (1):
      kbuild: fix asm-offset generation to work with clang

Jozsef Kadlecsik (1):
      netfilter: ipset: Correct rcu_dereference() call in ip_set_put_comment()

Justin M. Forbes (1):
      s390/mm: Fix ERROR: "__node_distance" undefined!

Kai-Heng Feng (1):
      USB: quirks: Add no-lpm quirk for Raydium touchscreens

Lu Fengqi (1):
      btrfs: fix pinned underflow after transaction aborted

Maarten Jacobs (1):
      usb: cdc-acm: add entry for Hiro (Conexant) modem

Marek Szyprowski (1):
      clk: samsung: exynos5420: Enable PERIS clocks for suspend

Mark Charlebois (1):
      kbuild, LLVMLinux: Add -Werror to cc-option to support clang

Masahiro Yamada (3):
      kbuild: consolidate redundant sed script ASM offset generation
      kbuild: drop -Wno-unknown-warning-option from clang options
      kbuild: move cc-option and cc-disable-warning after incl. arch Makefile

Mathias Nyman (1):
      xhci: Fix USB3 NULL pointer dereference at logical disconnect.

Matthias Kaehlcke (10):
      kbuild: Consolidate header generation from ASM offset information
      kbuild: clang: Disable 'address-of-packed-member' warning
      arm64: Disable asm-operand-width warning for clang
      x86/kbuild: Use cc-option to enable -falign-{jumps/loops}
      x86/mm/kaslr: Use the _ASM_MUL macro for multiplication to work around Clang incompatibility
      kbuild: Add __cc-option macro
      x86/build: Use __cc-option for boot code compiler options
      x86/build: Specify stack alignment for clang
      x86/build: Fix stack alignment for CLang
      x86/build: Use cc-option to validate stack alignment parameter

Mattias Jacobsson (1):
      USB: misc: appledisplay: add 20" Apple Cinema Display

Michael Davidson (3):
      kbuild: clang: add -no-integrated-as to KBUILD_[AC]FLAGS
      crypto, x86: aesni - fix token pasting for clang
      x86/boot: #undef memcpy() et al in string.c

Minchan Kim (1):
      zram: close udev startup race condition as default groups

Nathan Chancellor (2):
      arm64: percpu: Initialize ret in the default case
      misc: atmel-ssc: Fix section annotation on atmel_ssc_get_driver_data

Nick Desaulniers (2):
      kbuild: fix linker feature test macros when cross compiling with Clang
      kbuild: clang: remove crufty HOSTCFLAGS

Paul Gortmaker (1):
      platform/x86: acerhdf: Add BIOS entry for Gateway LT31 v1.3307

Richard Weinberger (1):
      um: Give start_idle_thread() a return code

Sabrina Dubroca (1):
      ip_tunnel: don't force DF when MTU is locked

Sakari Ailus (1):
      media: v4l: event: Add subscription to list before calling "add" operation

Siva Reddy Kallam (1):
      tg3: Add PHY reset for 5717/5719/5720 in change ring and flow control paths

Sodagudi Prasad (1):
      kbuild: clang: disable unused variable warnings only when constant

Stefan Agner (2):
      kbuild: set no-integrated-as before incl. arch Makefile
      kbuild: allow to use GCC toolchain not in Clang search path

Taehee Yoo (1):
      netfilter: xt_IDLETIMER: add sysfs filename checking routine

Vasily Gorbik (1):
      s390/vdso: add missing FORCE to build targets

Vinícius Tinti (1):
      kbuild: Add support to generate LLVM assembly files

YueHaibing (1):
      SUNRPC: drop pointless static qualifier in xdr_get_next_encode_buffer()

배석진 (1):
      flow_dissector: do not dissect l4 ports for fragments

 Makefile                                       | 20 ++++++++++--
 arch/arm64/include/asm/percpu.h                |  3 ++
 arch/s390/kernel/vdso32/Makefile               |  6 ++--
 arch/s390/kernel/vdso64/Makefile               |  6 ++--
 arch/s390/numa/numa.c                          |  1 +
 arch/um/os-Linux/skas/process.c                |  5 +++
 arch/x86/Makefile                              | 17 +++++++---
 arch/x86/boot/compressed/aslr.c                |  1 +
 drivers/acpi/acpi_platform.c                   |  1 +
 drivers/block/zram/zram_drv.c                  | 26 ++++------------
 drivers/bluetooth/Kconfig                      |  1 -
 drivers/clk/samsung/clk-exynos5420.c           |  1 +
 drivers/hid/uhid.c                             | 13 ++++++++
 drivers/hwmon/ibmpowernv.c                     |  7 ++---
 drivers/media/v4l2-core/v4l2-event.c           | 43 ++++++++++++++------------
 drivers/misc/atmel-ssc.c                       |  2 +-
 drivers/misc/sgi-gru/grukdump.c                |  4 +++
 drivers/net/ethernet/broadcom/tg3.c            | 18 +++++++++--
 drivers/platform/x86/acerhdf.c                 |  1 +
 drivers/uio/uio.c                              |  7 +++--
 drivers/usb/class/cdc-acm.c                    |  3 ++
 drivers/usb/core/quirks.c                      |  8 +++++
 drivers/usb/misc/appledisplay.c                |  1 +
 fs/btrfs/disk-io.c                             | 19 +++++++++---
 fs/exofs/super.c                               |  5 ++-
 fs/gfs2/rgrp.c                                 |  3 +-
 fs/hfs/brec.c                                  |  4 +++
 fs/hfsplus/brec.c                              |  4 +++
 fs/reiserfs/xattr.c                            |  7 +++++
 include/linux/netfilter/ipset/ip_set_comment.h |  4 +--
 include/linux/uaccess.h                        |  3 ++
 lib/raid6/test/Makefile                        |  4 +--
 net/core/dev.c                                 |  4 +++
 net/core/flow_dissector.c                      |  4 +--
 net/ipv4/ip_tunnel_core.c                      |  2 +-
 net/ipv6/route.c                               |  8 +++--
 net/netfilter/ipset/ip_set_hash_netportnet.c   |  8 ++---
 net/netfilter/xt_IDLETIMER.c                   | 20 ++++++++++++
 net/sunrpc/xdr.c                               |  2 +-
 39 files changed, 215 insertions(+), 81 deletions(-)

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

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

[modify] https://crrev.com/a4e85e7a1ecb14195ca7db082189155d69e539e6/drivers/media/v4l2-core/videobuf2-core.c
[modify] https://crrev.com/a4e85e7a1ecb14195ca7db082189155d69e539e6/drivers/media/v4l2-core/v4l2-event.c
[modify] https://crrev.com/a4e85e7a1ecb14195ca7db082189155d69e539e6/Makefile
[modify] https://crrev.com/a4e85e7a1ecb14195ca7db082189155d69e539e6/arch/x86/Makefile
[modify] https://crrev.com/a4e85e7a1ecb14195ca7db082189155d69e539e6/scripts/Kbuild.include
[modify] https://crrev.com/a4e85e7a1ecb14195ca7db082189155d69e539e6/net/ipv6/route.c

Status: Fixed (was: Started)

Sign in to add a comment