Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 2cda3bbe authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android-4.14-p.97 (0053642d) into msm-4.14



* refs/heads/tmp-0053642d:
  Linux 4.14.97
  btrfs: dev-replace: go back to suspended state if target device is missing
  btrfs: fix error handling in btrfs_dev_replace_start
  f2fs: read page index before freeing
  xen: Fix x86 sched_clock() interface for xen
  x86/xen/time: Output xen sched_clock time from 0
  x86/xen/time: setup vcpu 0 time info page
  x86/xen/time: set pvclock flags on xen_time_init()
  x86/pvclock: add setter for pvclock_pvti_cpu0_va
  ptp_kvm: probe for kvm guest availability
  xhci: Fix leaking USB3 shared_hcd at xhci removal
  usb: dwc3: gadget: Clear req->needs_extra_trb flag on cleanup
  nvmet-rdma: fix null dereference under heavy load
  nvmet-rdma: Add unlikely for response allocated check
  s390/smp: Fix calling smp_call_ipl_cpu() from ipl CPU
  KVM: x86: Fix a 4.14 backport regression related to userspace/guest FPU
  net: stmmac: Use correct values in TQS/RQS fields
  Revert "seccomp: add a selftest for get_metadata"
  perf unwind: Take pgoff into account when reporting elf to libdwfl
  perf unwind: Unwind with libdw doesn't take symfs into account
  vt: invoke notifier on screen size change
  can: bcm: check timer values before ktime conversion
  can: dev: __can_get_echo_skb(): fix bogous check for non-existing skb by removing it
  irqchip/gic-v3-its: Align PCI Multi-MSI allocation on their size
  posix-cpu-timers: Unbreak timer rearming
  x86/kaslr: Fix incorrect i8254 outb() parameters
  x86/selftests/pkeys: Fork() to check for state being preserved
  x86/pkeys: Properly copy pkey state at fork()
  KVM: x86: Fix single-step debugging
  dm crypt: fix parsing of extended IV arguments
  dm thin: fix passdown_double_checking_shared_status()
  acpi/nfit: Fix command-supported detection
  acpi/nfit: Block function zero DSMs
  Input: uinput - fix undefined behavior in uinput_validate_absinfo()
  compiler.h: enable builtin overflow checkers and add fallback code
  Input: xpad - add support for SteelSeries Stratus Duo
  CIFS: Do not reconnect TCP session in add_credits()
  CIFS: Fix credit calculation for encrypted reads with errors
  CIFS: Fix credits calculations for reads with errors
  CIFS: Fix possible hang during async MTU reads and writes
  Drivers: hv: vmbus: Check for ring when getting debug info
  hv_balloon: avoid touching uninitialized struct page during tail onlining
  tty/n_hdlc: fix __might_sleep warning
  uart: Fix crash in uart_write and uart_put_char
  tty: Handle problem if line discipline does not have receive_buf
  staging: rtl8188eu: Add device code for D-Link DWA-121 rev B1
  char/mwave: fix potential Spectre v1 vulnerability
  s390/smp: fix CPU hotplug deadlock with CPU rescan
  s390/early: improve machine detection
  ARC: perf: map generic branches to correct hardware condition
  ARC: adjust memblock_reserve of kernel memory
  ARCv2: lib: memeset: fix doing prefetchw outside of buffer
  ALSA: hda - Add mute LED support for HP ProBook 470 G5
  ASoC: rt5514-spi: Fix potential NULL pointer dereference
  ASoC: atom: fix a missing check of snd_pcm_lib_malloc_pages
  USB: serial: pl2303: add new PID to support PL2303TB
  USB: serial: simple: add Motorola Tetra TPG2200 device id
  mei: me: add denverton innovation engine device IDs
  mmc: Kconfig: Enable CONFIG_MMC_SDHCI_IO_ACCESSORS
  ipfrag: really prevent allocation on netns exit
  tcp: allow MSG_ZEROCOPY transmission also in CLOSE_WAIT state
  net: ipv4: Fix memory leak in network namespace dismantle
  vhost: log dirty page correctly
  openvswitch: Avoid OOB read when parsing flow nlattrs
  net_sched: refetch skb protocol for each filter
  net: phy: mdio_bus: add missing device_del() in mdiobus_register() error handling
  net: Fix usage of pskb_trim_rcsum
  net: bridge: Fix ethernet header pointer before check skb forwardable
  amd-xgbe: Fix mdio access for non-zero ports and clause 45 PHYs
  f2fs: add missing part of patch "f2fs: support flexible inline xattr size"

Conflicts:
	drivers/usb/host/xhci-plat.c
	fs/f2fs/node.c

Change-Id: I750a77383fb2a40417b2321db530815cc09275f2
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents 148d2875 0053642d
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment