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

Commit 857a9095 authored by Ivaylo Georgiev's avatar Ivaylo Georgiev
Browse files

Merge android-4.19.59 (0f653d9a) into msm-4.19



* refs/heads/tmp-0f653d9a:
  Revert "dt-bindings: can: mcp251x: add mcp25625 support"
  Linux 4.19.59
  staging: rtl8712: reduce stack usage, again
  staging: bcm2835-camera: Handle empty EOS buffers whilst streaming
  staging: bcm2835-camera: Remove check of the number of buffers supplied
  staging: bcm2835-camera: Ensure all buffers are returned on disable
  staging: bcm2835-camera: Replace spinlock protecting context_map with mutex
  staging: fsl-dpaa2/ethsw: fix memory leak of switchdev_work
  MIPS: Remove superfluous check for __linux__
  VMCI: Fix integer overflow in VMCI handle arrays
  carl9170: fix misuse of device driver API
  binder: fix memory leak in error path
  lkdtm: support llvm-objcopy
  HID: Add another Primax PIXART OEM mouse quirk
  staging: comedi: amplc_pci230: fix null pointer deref on interrupt
  staging: comedi: dt282x: fix a null pointer deref on interrupt
  drivers/usb/typec/tps6598x.c: fix 4CC cmd write
  drivers/usb/typec/tps6598x.c: fix portinfo width
  usb: renesas_usbhs: add a workaround for a race condition of workqueue
  usb: dwc2: use a longer AHB idle timeout in dwc2_core_reset()
  usb: gadget: ether: Fix race between gether_disconnect and rx_submit
  p54usb: Fix race between disconnect and firmware loading
  Revert "serial: 8250: Don't service RX FIFO if interrupts are disabled"
  USB: serial: option: add support for GosunCn ME3630 RNDIS mode
  USB: serial: ftdi_sio: add ID for isodebug v1
  mwifiex: Don't abort on small, spec-compliant vendor IEs
  mwifiex: Abort at too short BSS descriptor element
  Documentation/admin: Remove the vsyscall=native documentation
  Documentation: Add section about CPU vulnerabilities for Spectre
  x86/tls: Fix possible spectre-v1 in do_get_thread_area()
  x86/ptrace: Fix possible spectre-v1 in ptrace_get_debugreg()
  perf pmu: Fix uncore PMU alias list for ARM64
  block, bfq: NULL out the bic when it's no longer valid
  ALSA: hda/realtek - Headphone Mic can't record after S3
  ALSA: usb-audio: Fix parse of UAC2 Extension Units
  media: stv0297: fix frequency range limit
  udf: Fix incorrect final NOT_ALLOCATED (hole) extent length
  fscrypt: don't set policy for a dead directory
  net :sunrpc :clnt :Fix xps refcount imbalance on the error path
  NFS4: Only set creation opendata if O_CREAT
  net: dsa: mv88e6xxx: fix shift of FID bits in mv88e6185_g1_vtu_loadpurge()
  quota: fix a problem about transfer quota
  scsi: qedi: Check targetname while finding boot target information
  net: lio_core: fix potential sign-extension overflow on large shift
  ip6_tunnel: allow not to count pkts on tstats by passing dev as NULL
  drm: return -EFAULT if copy_to_user() fails
  bnx2x: Check if transceiver implements DDM before access
  md: fix for divide error in status_resync
  mmc: core: complete HS400 before checking status
  qmi_wwan: extend permitted QMAP mux_id value range
  qmi_wwan: avoid RCU stalls on device disconnect when in QMAP mode
  qmi_wwan: add support for QMAP padding in the RX path
  bpf, x64: fix stack layout of JITed bpf code
  bpf, devmap: Add missing RCU read lock on flush
  bpf, devmap: Add missing bulk queue free
  bpf, devmap: Fix premature entry free on destroying map
  mac80211: do not start any work during reconfigure flow
  mac80211: only warn once on chanctx_conf being NULL
  ARM: davinci: da8xx: specify dma_coherent_mask for lcdc
  ARM: davinci: da850-evm: call regulator_has_full_constraints()
  mlxsw: spectrum: Disallow prio-tagged packets when PVID is removed
  KVM: arm/arm64: vgic: Fix kvm_device leak in vgic_its_destroy
  Input: imx_keypad - make sure keyboard can always wake up system
  riscv: Fix udelay in RV32.
  drm/vmwgfx: fix a warning due to missing dma_parms
  drm/vmwgfx: Honor the sg list segment size limitation
  s390/boot: disable address-of-packed-member warning
  ARM: dts: am335x phytec boards: Fix cd-gpios active level
  ibmvnic: Fix unchecked return codes of memory allocations
  ibmvnic: Refresh device multicast list after reset
  ibmvnic: Do not close unopened driver during reset
  net: phy: rename Asix Electronics PHY driver
  can: af_can: Fix error path of can_init()
  can: m_can: implement errata "Needless activation of MRAF irq"
  can: mcp251x: add support for mcp25625
  dt-bindings: can: mcp251x: add mcp25625 support
  soundwire: intel: set dai min and max channels correctly
  mwifiex: Fix heap overflow in mwifiex_uap_parse_tail_ies()
  iwlwifi: Fix double-free problems in iwl_req_fw_callback()
  mwifiex: Fix possible buffer overflows at parsing bss descriptor
  mac80211: free peer keys before vif down in mesh
  mac80211: mesh: fix RCU warning
  staging:iio:ad7150: fix threshold mode config bit
  soundwire: stream: fix out of boundary access on port properties
  bpf: sockmap, fix use after free from sleep in psock backlog workqueue
  mac80211: fix rate reporting inside cfg80211_calculate_bitrate_he()
  samples, bpf: suppress compiler warning
  samples, bpf: fix to change the buffer size for read()
  Input: elantech - enable middle button support on 2 ThinkPads
  soc: bcm: brcmstb: biuctrl: Register writes require a barrier
  soc: brcmstb: Fix error path for unsupported CPUs
  crypto: talitos - rename alternative AEAD algos.

Conflicts:
	drivers/mmc/core/mmc.c

Change-Id: I74e5063a4119ad000d89f7a87c683aa5531145f5
Signed-off-by: default avatarIvaylo Georgiev <irgeorgiev@codeaurora.org>
parents 053efa6d edcc8dac
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ Contact: Bjørn Mork <bjorn@mork.no>
Description:
		Unsigned integer.

		Write a number ranging from 1 to 127 to add a qmap mux
		Write a number ranging from 1 to 254 to add a qmap mux
		based network device, supported by recent Qualcomm based
		modems.

@@ -46,5 +46,5 @@ Contact: Bjørn Mork <bjorn@mork.no>
Description:
		Unsigned integer.

		Write a number ranging from 1 to 127 to delete a previously
		Write a number ranging from 1 to 254 to delete a previously
		created qmap mux based network device.
+1 −0
Original line number Diff line number Diff line
@@ -9,5 +9,6 @@ are configurable at compile, boot or run time.
.. toctree::
   :maxdepth: 1

   spectre
   l1tf
   mds
+697 −0

File added.

Preview size limit exceeded, changes collapsed.

+0 −6
Original line number Diff line number Diff line
@@ -4989,12 +4989,6 @@
			emulate     [default] Vsyscalls turn into traps and are
			            emulated reasonably safely.

			native      Vsyscalls are native syscall instructions.
			            This is a little bit faster than trapping
			            and makes a few dynamic recompilers work
			            better than they would in emulation mode.
			            It also makes exploits much easier to write.

			none        Vsyscalls don't work at all.  This makes
			            them quite hard to use for exploits but
			            might break your system.
+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ If PR_SPEC_PRCTL is set, then the per-task control of the mitigation is
available. If not set, prctl(PR_SET_SPECULATION_CTRL) for the speculation
misfeature will fail.

.. _set_spec_ctrl:

PR_SET_SPECULATION_CTRL
-----------------------

Loading