New issue
Advanced search Search tips

Issue 812025 link

Starred by 1 user

Issue metadata

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



Sign in to add a comment

Merge v4.14.19 into chromeos-4.14

Project Member Reported by groeck@chromium.org, Feb 13 2018

Issue description

Merge v4.14.19 into chromeos-4.14
 
Project Member

Comment 1 by bugdroid1@chromium.org, Feb 16 2018

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

commit 64cfb1afd0216da5136c3de2efae320b9e02a369
Author: Guenter Roeck <groeck@chromium.org>
Date: Tue Feb 13 23:15:56 2018

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

Merge of v4.14.19 into chromeos-4.14

Changelog:
----------------------------------------------------------------
Andrew Morton (1):
      kernel/exit.c: export abort() to modules

Chunhao Lin (1):
      r8169: fix RTL8168EP take too long to complete driver initialization.

Dan Carpenter (1):
      scsi: storvsc: missing error code in storvsc_probe()

David Ahern (1):
      net: ipv6: send unsolicited NA after DAD

Eric Dumazet (2):
      net: igmp: add a missing rcu locking section
      soreuseport: fix mem leak in reuseport_add_sock()

Greg Kroah-Hartman (2):
      Revert "x86/alternative: Print unadorned pointers"
      Linux 4.14.19

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

Jason Wang (1):
      vhost_net: stop device during reset owner

Jesse Chan (2):
      media: mtk-vcodec: add missing MODULE_LICENSE/DESCRIPTION
      media: soc_camera: soc_scale_crop: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE

Jiri Pirko (1):
      rocker: fix possible null pointer dereference in rocker_router_fib_event_work

Junxiao Bi (1):
      qlcnic: fix deadlock bug

Kristian Evensen (1):
      qmi_wwan: Add support for Quectel EP06

Li RongQing (1):
      tcp: release sk_frag.page in tcp_disconnect

Martin KaFai Lau (1):
      ipv6: Fix SO_REUSEPORT UDP socket with implicit sk_ipv6only

Masahiro Yamada (3):
      .gitignore: sort normal pattern rules alphabetically
      .gitignore: move *.dtb and *.dtb.S patterns to the top-level .gitignore
      kbuild: rpm-pkg: keep spec file until make mrproper

Neal Cardwell (1):
      tcp_bbr: fix pacing_gain to always be unity when using lt_bw

Nikolay Aleksandrov (1):
      ip6mr: fix stale iterator

Robert Baronescu (1):
      crypto: tcrypt - fix S/G table for test_aead_speed()

Roman Gushchin (1):
      Revert "defer call to mem_cgroup_sk_alloc()"

Sudip Mukherjee (1):
      arch: define weak abort()

 .gitignore                                         | 49 ++++++++++++----------
 Makefile                                           |  2 +-
 arch/arc/boot/.gitignore                           |  1 -
 arch/arm/boot/.gitignore                           |  1 -
 arch/arm/kernel/traps.c                            |  1 -
 arch/arm64/boot/dts/.gitignore                     |  1 -
 arch/m32r/kernel/traps.c                           |  1 -
 arch/metag/boot/.gitignore                         |  1 -
 arch/microblaze/boot/.gitignore                    |  1 -
 arch/mips/boot/.gitignore                          |  1 -
 arch/nios2/boot/.gitignore                         |  1 -
 arch/powerpc/boot/.gitignore                       |  1 -
 arch/unicore32/kernel/traps.c                      |  1 -
 arch/x86/kernel/alternative.c                      | 14 +++----
 arch/xtensa/boot/.gitignore                        |  1 -
 crypto/tcrypt.c                                    |  6 ++-
 .../media/platform/mtk-vcodec/mtk_vcodec_util.c    |  3 ++
 drivers/media/platform/soc_camera/soc_scale_crop.c |  4 ++
 .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c    | 18 ++++----
 drivers/net/ethernet/realtek/r8169.c               |  4 +-
 drivers/net/ethernet/rocker/rocker_main.c          | 18 ++++----
 drivers/net/usb/qmi_wwan.c                         |  1 +
 drivers/of/unittest-data/.gitignore                |  2 -
 drivers/scsi/storvsc_drv.c                         |  4 +-
 drivers/vhost/net.c                                |  1 +
 kernel/exit.c                                      |  9 ++++
 mm/memcontrol.c                                    | 14 +++++++
 net/core/sock.c                                    |  5 +--
 net/core/sock_reuseport.c                          | 35 +++++++++-------
 net/ipv4/inet_connection_sock.c                    |  1 -
 net/ipv4/tcp.c                                     |  6 +++
 net/ipv4/tcp_bbr.c                                 |  6 +--
 net/ipv6/addrconf.c                                | 30 +++++++++++--
 net/ipv6/af_inet6.c                                | 11 +++--
 net/ipv6/ip6mr.c                                   |  1 +
 net/ipv6/ndisc.c                                   |  5 +++
 scripts/package/Makefile                           |  4 +-
 37 files changed, 166 insertions(+), 99 deletions(-)
 delete mode 100644 arch/arm64/boot/dts/.gitignore
 delete mode 100644 drivers/of/unittest-data/.gitignore

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

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


Comment 2 by groeck@chromium.org, Feb 16 2018

Status: Fixed (was: Assigned)

Sign in to add a comment