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

Commit 437cc370 authored by Ivaylo Georgiev's avatar Ivaylo Georgiev
Browse files

Merge android-4.19.38 (5e7b4fbe) into msm-4.19



* refs/heads/tmp-5e7b4fbe:
  Linux 4.19.38
  powerpc/fsl: Add FSL_PPC_BOOK3E as supported arch for nospectre_v2 boot arg
  net/tls: don't leak IV and record seq when offload fails
  net/tls: avoid potential deadlock in tls_set_device_offload_rx()
  net/mlx5e: Fix use-after-free after xdp_return_frame
  net/mlx5e: Fix the max MTU check in case of XDP
  mlxsw: spectrum: Put MC TCs into DWRR mode
  mlxsw: pci: Reincrease PCI reset timeout
  net: hns: Fix WARNING when hns modules installed
  team: fix possible recursive locking when add slaves
  stmmac: pci: Adjust IOT2000 matching
  net/tls: fix refcount adjustment in fallback
  net: stmmac: move stmmac_check_ether_addr() to driver probe
  net/rose: fix unbound loop in rose_loopback_timer()
  net: rds: exchange of 8K and 1M pool
  net/mlx5e: ethtool, Remove unsupported SFP EEPROM high pages query
  mlxsw: spectrum: Fix autoneg status in ethtool
  ipv4: set the tcp_min_rtt_wlen range from 0 to one day
  ipv4: add sanity checks in ipv4_link_failure()
  x86/fpu: Don't export __kernel_fpu_{begin,end}()
  mm: Fix warning in insert_pfn()
  x86/retpolines: Disable switch jump tables when retpolines are enabled
  x86, retpolines: Raise limit for generating indirect calls from switch-case
  Fix aio_poll() races
  aio: store event at final iocb_put()
  aio: keep io_event in aio_kiocb
  aio: fold lookup_kiocb() into its sole caller
  pin iocb through aio.
  aio: simplify - and fix - fget/fput for io_submit()
  aio: initialize kiocb private in case any filesystems expect it.
  aio: abstract out io_event filler helper
  aio: split out iocb copy from io_submit_one()
  aio: use iocb_put() instead of open coding it
  aio: don't zero entire aio_kiocb aio_get_req()
  aio: separate out ring reservation from req allocation
  aio: use assigned completion handler
  aio: clear IOCB_HIPRI
  rxrpc: fix race condition in rxrpc_input_packet()
  net/rds: Check address length before reading address family
  net: netrom: Fix error cleanup path of nr_proto_init
  tipc: check link name with right length in tipc_nl_compat_link_set
  tipc: check bearer name with right length in tipc_nl_compat_bearer_enable
  fm10k: Fix a potential NULL pointer dereference
  netfilter: ebtables: CONFIG_COMPAT: drop a bogus WARN_ON
  NFS: Forbid setting AF_INET6 to "struct sockaddr_in"->sin_family.
  sched/deadline: Correctly handle active 0-lag timers
  binder: fix handling of misaligned binder object
  workqueue: Try to catch flush_work() without INIT_WORK().
  fs/proc/proc_sysctl.c: Fix a NULL pointer dereference
  intel_th: gth: Fix an off-by-one in output unassigning
  slip: make slhc_free() silently accept an error pointer
  USB: Consolidate LPM checks to avoid enabling LPM twice
  USB: Add new USB LPM helpers
  drm/vc4: Fix compilation error reported by kbuild test bot
  Revert "drm/i915/fbdev: Actually configure untiled displays"
  drm/vc4: Fix memory leak during gpu reset.
  powerpc/mm/radix: Make Radix require HUGETLB_PAGE
  ARM: 8857/1: efi: enable CP15 DMB instructions before cleaning the cache
  dmaengine: sh: rcar-dmac: Fix glitch in dmaengine_tx_status
  dmaengine: sh: rcar-dmac: With cyclic DMA residue 0 is valid
  vfio/type1: Limit DMA mappings per container
  Input: synaptics-rmi4 - write config register values to the right offset
  perf/x86/intel: Update KBL Package C-state events to also include PC8/PC9/PC10 counters
  sunrpc: don't mark uninitialised items as VALID.
  nfsd: Don't release the callback slot unless it was actually held
  ceph: fix ci->i_head_snapc leak
  ceph: ensure d_name stability in ceph_dentry_hash()
  ceph: only use d_name directly when parent is locked
  sched/numa: Fix a possible divide-by-zero
  RDMA/mlx5: Do not allow the user to write to the clock page
  IB/rdmavt: Fix frwr memory registration
  trace: Fix preempt_enable_no_resched() abuse
  MIPS: scall64-o32: Fix indirect syscall number load
  lib/Kconfig.debug: fix build error without CONFIG_BLOCK
  zram: pass down the bvec we need to read into in the work struct
  gpio: eic: sprd: Fix incorrect irq type setting for the sync EIC
  tracing: Fix buffer_ref pipe ops
  tracing: Fix a memory leak by early error exit in trace_pid_write()
  cifs: do not attempt cifs operation on smb2+ rename error
  cifs: fix memory leak in SMB2_read
  net: dsa: mv88e6xxx: add call to mv88e6xxx_ports_cmode_init to probe for new DSA framework
  ALSA: hda/ca0132 - Fix build error without CONFIG_PCI
  powerpc/vdso32: fix CLOCK_MONOTONIC on PPC64
  ipvs: fix warning on unused variable
  vsock/virtio: fix kernel panic from virtio_transport_reset_no_sock
  drm/rockchip: fix for mailbox read validation.
  loop: do not print warn message if partition scan is successful
  tipc: handle the err returned from cmd header function
  ext4: fix some error pointer dereferences
  net: mvpp2: fix validate for PPv2.1
  net/ibmvnic: Fix RTNL deadlock during device reset
  netfilter: nf_tables: bogus EBUSY in helper removal from transaction
  netfilter: nf_tables: bogus EBUSY when deleting set after flush
  netfilter: nf_tables: fix set double-free in abort path
  netfilter: nft_compat: use .release_ops and remove list of extension
  netfilter: nft_compat: don't use refcount_inc on newly allocated entry
  netfilter: nf_tables: unbind set in rule from commit path
  netfilter: nf_tables: warn when expr implements only one of activate/deactivate
  netfilter: nft_compat: destroy function must not have side effects
  netfilter: nf_tables: split set destruction in deactivate and destroy phase
  netfilter: nft_compat: make lists per netns
  netfilter: nft_compat: use refcnt_t type for nft_xt reference count

Change-Id: I5ac7e5185c3b9f2264d850549df4978946ffcd50
Signed-off-by: default avatarIvaylo Georgiev <irgeorgiev@codeaurora.org>
parents 3fc4c60d 5e7b4fbe
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -2812,7 +2812,7 @@
			check bypass). With this option data leaks are possible
			in the system.

	nospectre_v2	[X86] Disable all mitigations for the Spectre variant 2
	nospectre_v2	[X86,PPC_FSL_BOOK3E] Disable all mitigations for the Spectre variant 2
			(indirect branch prediction) vulnerability. System may
			allow data leaks with this option, which is equivalent
			to spectre_v2=off.
+1 −0
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ tcp_min_rtt_wlen - INTEGER
	minimum RTT when it is moved to a longer path (e.g., due to traffic
	engineering). A longer window makes the filter more resistant to RTT
	inflations such as transient congestion. The unit is seconds.
	Possible values: 0 - 86400 (1 day)
	Default: 300

tcp_moderate_rcvbuf - BOOLEAN
+1 −1
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0
VERSION = 4
PATCHLEVEL = 19
SUBLEVEL = 37
SUBLEVEL = 38
EXTRAVERSION =
NAME = "People's Front"

+15 −1
Original line number Diff line number Diff line
@@ -1395,7 +1395,21 @@ ENTRY(efi_stub_entry)

		@ Preserve return value of efi_entry() in r4
		mov	r4, r0
		bl	cache_clean_flush

		@ our cache maintenance code relies on CP15 barrier instructions
		@ but since we arrived here with the MMU and caches configured
		@ by UEFI, we must check that the CP15BEN bit is set in SCTLR.
		@ Note that this bit is RAO/WI on v6 and earlier, so the ISB in
		@ the enable path will be executed on v7+ only.
		mrc	p15, 0, r1, c1, c0, 0	@ read SCTLR
		tst	r1, #(1 << 5)		@ CP15BEN bit set?
		bne	0f
		orr	r1, r1, #(1 << 5)	@ CP15 barrier instructions
		mcr	p15, 0, r1, c1, c0, 0	@ write SCTLR
 ARM(		.inst	0xf57ff06f		@ v7+ isb	)
 THUMB(		isb						)

0:		bl	cache_clean_flush
		bl	cache_off

		@ Set parameters for booting zImage according to boot protocol
+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ trace_a_syscall:
	subu	t1, v0,  __NR_O32_Linux
	move	a1, v0
	bnez	t1, 1f /* __NR_syscall at offset 0 */
	lw	a1, PT_R4(sp) /* Arg1 for __NR_syscall case */
	ld	a1, PT_R4(sp) /* Arg1 for __NR_syscall case */
	.set	pop

1:	jal	syscall_trace_enter
Loading