OSDN Git Service

Merge android-4.4.189 (74c8219) into msm-4.4
authorSrinivasarao P <spathi@codeaurora.org>
Mon, 12 Aug 2019 05:13:01 +0000 (10:43 +0530)
committerSrinivasarao P <spathi@codeaurora.org>
Mon, 12 Aug 2019 05:13:48 +0000 (10:43 +0530)
commit478556932db7a2e4dd19e4da619599fd3d5a56aa
tree0d87c384868f1f35ee8dfebbcf72722fd542edc9
parent7b0c4ab61ef1dc4eaa00ee0d9b4c50ca0193ad75
parent74c82193e89daaa486f49dc8a4f8ed38f0460159
Merge android-4.4.189 (74c8219) into msm-4.4

* refs/heads/tmp-74c8219
  Linux 4.4.189
  x86/speculation/swapgs: Exclude ATOMs from speculation through SWAPGS
  x86/entry/64: Use JMP instead of JMPQ
  x86/speculation: Enable Spectre v1 swapgs mitigations
  x86/speculation: Prepare entry code for Spectre v1 swapgs mitigations
  x86/entry/64: Fix context tracking state warning when load_gs_index fails
  x86: cpufeatures: Sort feature word 7
  spi: bcm2835: Fix 3-wire mode if DMA is enabled
  block: blk_init_allocated_queue() set q->fq as NULL in the fail case
  compat_ioctl: pppoe: fix PPPOEIOCSFWD handling
  bnx2x: Disable multi-cos feature.
  net/mlx5: Use reversed order when unregister devices
  net: sched: Fix a possible null-pointer dereference in dequeue_func()
  tipc: compat: allow tipc commands without arguments
  net: fix ifindex collision during namespace removal
  net: bridge: delete local fdb on device init failure
  atm: iphase: Fix Spectre v1 vulnerability
  tcp: be more careful in tcp_fragment()
  HID: Add quirk for HP X1200 PIXART OEM mouse
  netfilter: nfnetlink_acct: validate NFACCT_QUOTA parameter
  arm64: cpufeature: Fix feature comparison for CTR_EL0.{CWG,ERG}
  arm64: cpufeature: Fix CTR_EL0 field definitions
  UPSTREAM: net-ipv6-ndisc: add support for RFC7710 RA Captive Portal Identifier

Change-Id: I0bdf89783d0c83a3385d77f6b4c6f3d3b3fb0460
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
Documentation/kernel-parameters.txt
Makefile
arch/arm64/include/asm/cpufeature.h
arch/arm64/kernel/cpufeature.c
block/blk-core.c
fs/compat_ioctl.c
include/net/tcp.h
net/core/dev.c