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

Commit 053efa6d authored by Ivaylo Georgiev's avatar Ivaylo Georgiev
Browse files

Merge android-4.19.58 (5ad6eeba) into msm-4.19 



* refs/heads/tmp-5ad6eeba:
  Linux 4.19.58
  dmaengine: imx-sdma: remove BD_INTR for channel0
  dmaengine: qcom: bam_dma: Fix completed descriptors count
  MIPS: have "plain" make calls build dtbs for selected platforms
  MIPS: Add missing EHB in mtc0 -> mfc0 sequence.
  MIPS: Fix bounds check virt_addr_valid
  svcrdma: Ignore source port when computing DRC hash
  nfsd: Fix overflow causing non-working mounts on 1 TB machines
  KVM: LAPIC: Fix pending interrupt in IRR blocked by software disable LAPIC
  KVM: x86: degrade WARN to pr_warn_ratelimited
  netfilter: ipv6: nf_defrag: accept duplicate fragments again
  bpf: fix bpf_jit_limit knob for PAGE_SIZE >= 64K
  net: hns: fix unsigned comparison to less than zero
  sc16is7xx: move label 'err_spi' to correct section
  netfilter: ipv6: nf_defrag: fix leakage of unqueued fragments
  ip6: fix skb leak in ip6frag_expire_frag_queue()
  rds: Fix warning.
  ALSA: hda: Initialize power_state field properly
  net: hns: Fixes the missing put_device in positive leg for roce reset
  x86/boot/compressed/64: Do not corrupt EDX on EFER.LME=1 setting
  selftests: fib_rule_tests: Fix icmp proto with ipv6
  scsi: tcmu: fix use after free
  mac80211: mesh: fix missing unlock on error in table_path_del()
  f2fs: don't access node/meta inode mapping after iput
  drm/fb-helper: generic: Don't take module ref for fbcon
  media: s5p-mfc: fix incorrect bus assignment in virtual child device
  net/smc: move unhash before release of clcsock
  mlxsw: spectrum: Handle VLAN device unlinking
  tty: rocket: fix incorrect forward declaration of 'rp_init()'
  btrfs: Ensure replaced device doesn't have pending chunk allocation
  mm/vmscan.c: prevent useless kswapd loops
  ftrace/x86: Remove possible deadlock between register_kprobe() and ftrace_run_update_code()
  drm/imx: only send event on crtc disable if kept disabled
  drm/imx: notify drm core before sending event during crtc disable
  drm/etnaviv: add missing failure path to destroy suballoc
  drm/amdgpu/gfx9: use reset default for PA_SC_FIFO_SIZE
  drm/amd/powerplay: use hardware fan control if no powerplay fan table
  arm64: kaslr: keep modules inside module region when KASAN is enabled
  ARM: dts: armada-xp-98dx3236: Switch to armada-38x-uart serial node
  tracing/snapshot: Resize spare buffer if size changed
  fs/userfaultfd.c: disable irqs for fault_pending and event locks
  lib/mpi: Fix karactx leak in mpi_powm
  ALSA: hda/realtek - Change front mic location for Lenovo M710q
  ALSA: hda/realtek: Add quirks for several Clevo notebook barebones
  ALSA: usb-audio: fix sign unintended sign extension on left shifts
  ALSA: line6: Fix write on zero-sized buffer
  ALSA: firewire-lib/fireworks: fix miss detection of received MIDI messages
  ALSA: seq: fix incorrect order of dest_client/dest_ports arguments
  crypto: cryptd - Fix skcipher instance memory leak
  crypto: user - prevent operating on larval algorithms
  ptrace: Fix ->ptracer_cred handling for PTRACE_TRACEME
  drm/i915/dmc: protect against reading random memory
  ftrace: Fix NULL pointer dereference in free_ftrace_func_mapper()
  module: Fix livepatch/ftrace module text permissions race
  tracing: avoid build warning with HAVE_NOP_MCOUNT
  mm/mlock.c: change count_mm_mlocked_page_nr return type
  scripts/decode_stacktrace.sh: prefix addr2line with $CROSS_COMPILE
  cpuset: restore sanity to cpuset_cpus_allowed_fallback()
  i2c: pca-platform: Fix GPIO lookup code
  platform/mellanox: mlxreg-hotplug: Add devm_free_irq call to remove flow
  platform/x86: mlx-platform: Fix parent device in i2c-mux-reg device registration
  platform/x86: intel-vbtn: Report switch events when event wakes device
  platform/x86: asus-wmi: Only Tell EC the OS will handle display hotkeys from asus_nb_wmi
  drm: panel-orientation-quirks: Add quirk for GPD MicroPC
  drm: panel-orientation-quirks: Add quirk for GPD pocket2
  scsi: hpsa: correct ioaccel2 chaining
  SoC: rt274: Fix internal jack assignment in set_jack callback
  ALSA: hdac: fix memory release for SST and SOF drivers
  usb: gadget: udc: lpc32xx: allocate descriptor with GFP_ATOMIC
  usb: gadget: fusb300_udc: Fix memory leak of fusb300->ep[i]
  x86/CPU: Add more Icelake model numbers
  ASoC: sun4i-i2s: Add offset to RX channel select
  ASoC: sun4i-i2s: Fix sun8i tx channel offset mask
  ASoC: max98090: remove 24-bit format support if RJ is 0
  drm/mediatek: call mtk_dsi_stop() after mtk_drm_crtc_atomic_disable()
  drm/mediatek: clear num_pipes when unbind driver
  drm/mediatek: call drm_atomic_helper_shutdown() when unbinding driver
  drm/mediatek: unbind components in mtk_drm_unbind()
  drm/mediatek: fix unbind functions
  spi: bitbang: Fix NULL pointer dereference in spi_unregister_master
  ASoC: ak4458: rstn_control - return a non-zero on error only
  ASoC: soc-pcm: BE dai needs prepare when pause release after resume
  ASoC: ak4458: add return value for ak4458_probe
  ASoC : cs4265 : readable register too low
  netfilter: nft_flow_offload: IPCB is only valid for ipv4 family
  netfilter: nft_flow_offload: don't offload when sequence numbers need adjustment
  netfilter: nft_flow_offload: set liberal tracking mode for tcp
  netfilter: nf_flow_table: ignore DF bit setting
  md/raid0: Do not bypass blocking queue entered for raid0 bios
  block: Fix a NULL pointer dereference in generic_make_request()
  Bluetooth: Fix faulty expression for minimum encryption key size check

Change-Id: I42f3ee04258a2392be42269d05d99dc0b02a9feb
Signed-off-by: default avatarIvaylo Georgiev <irgeorgiev@codeaurora.org>
parents 09e52c3c 5ad6eeba

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 57

SUBLEVEL = 58

EXTRAVERSION =

NAME = "People's Front"

arch/arm/boot/dts/armada-xp-98dx3236.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -336,3 +336,11 @@ 
	status = "disabled";

};



&uart0 {

	compatible = "marvell,armada-38x-uart";

};



&uart1 {

	compatible = "marvell,armada-38x-uart";

};

arch/arm64/kernel/module.c

+6 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 


void *module_alloc(unsigned long size)

{

	u64 module_alloc_end = module_alloc_base + MODULES_VSIZE;

	gfp_t gfp_mask = GFP_KERNEL;

	void *p;
@@ -39,9 +40,12 @@ void *module_alloc(unsigned long size) 
	if (IS_ENABLED(CONFIG_ARM64_MODULE_PLTS))

		gfp_mask |= __GFP_NOWARN;



	if (IS_ENABLED(CONFIG_KASAN))

		/* don't exceed the static module region - see below */

		module_alloc_end = MODULES_END;



	p = __vmalloc_node_range(size, MODULE_ALIGN, module_alloc_base,

				module_alloc_base + MODULES_VSIZE,

				gfp_mask, PAGE_KERNEL_EXEC, 0,

				module_alloc_end, gfp_mask, PAGE_KERNEL_EXEC, 0,

				NUMA_NO_NODE, __builtin_return_address(0));



	if (!p && IS_ENABLED(CONFIG_ARM64_MODULE_PLTS) &&

arch/mips/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ archscripts: scripts_basic 
	$(Q)$(MAKE) $(build)=arch/mips/boot/tools relocs



KBUILD_DEFCONFIG := 32r2el_defconfig

KBUILD_DTBS      := dtbs



#

# Select the object file format to substitute into the linker script.
@@ -385,7 +386,7 @@ quiet_cmd_64 = OBJCOPY $@ 
vmlinux.64: vmlinux

	$(call cmd,64)



all:	$(all-y)

all:	$(all-y) $(KBUILD_DTBS)



# boot

$(boot-y): $(vmlinux-32) FORCE

arch/mips/mm/mmap.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ unsigned long arch_randomize_brk(struct mm_struct *mm) 


int __virt_addr_valid(const volatile void *kaddr)

{

	unsigned long vaddr = (unsigned long)vaddr;

	unsigned long vaddr = (unsigned long)kaddr;



	if ((vaddr < PAGE_OFFSET) || (vaddr >= MAP_BASE))

		return 0;