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

Commit 5c7f2dd7 authored by Ivaylo Georgiev's avatar Ivaylo Georgiev
Browse files

Merge android-4.19.54 (237d3835) into msm-4.19 



* refs/heads/tmp-237d3835:
  Linux 4.19.54
  Abort file_remove_privs() for non-reg. files
  coredump: fix race condition between collapse_huge_page() and core dumping
  ocfs2: fix error path kobject memory leak
  mlxsw: spectrum: Prevent force of 56G
  scsi: libsas: delete sas port if expander discover failed
  scsi: scsi_dh_alua: Fix possible null-ptr-deref
  scsi: smartpqi: properly set both the DMA mask and the coherent DMA mask
  scsi: libcxgbi: add a check for NULL pointer in cxgbi_check_route()
  net: phy: dp83867: Set up RGMII TX delay
  net: phylink: ensure consistent phy interface mode
  net: sh_eth: fix mdio access in sh_eth_close() for R-Car Gen2 and RZ/A1 SoCs
  arm64: use the correct function type for __arm64_sys_ni_syscall
  arm64: use the correct function type in SYSCALL_DEFINE0
  arm64: fix syscall_fn_t type
  KVM: PPC: Book3S HV: Don't take kvm->lock around kvm_for_each_vcpu
  KVM: PPC: Book3S: Use new mutex to synchronize access to rtas token list
  xenbus: Avoid deadlock during suspend due to open transactions
  xen/pvcalls: Remove set but not used variable
  ia64: fix build errors by exporting paddr_to_nid()
  perf record: Fix s390 missing module symbol and warning for non-root users
  perf namespace: Protect reading thread's namespace
  perf data: Fix 'strncat may truncate' build failure with recent gcc
  configfs: Fix use-after-free when accessing sd->s_dentry
  ALSA: hda - Force polling mode on CNL for fixing codec communication
  i2c: dev: fix potential memory leak in i2cdev_ioctl_rdwr
  net: aquantia: fix LRO with FCS error
  net: aquantia: tx clean budget logic error
  drm/etnaviv: lock MMU while dumping core
  ACPI/PCI: PM: Add missing wakeup.flags.valid checks
  net: tulip: de4x5: Drop redundant MODULE_DEVICE_TABLE()
  net: stmmac: update rx tail pointer register to fix rx dma hang issue.
  gpio: fix gpio-adp5588 build errors
  perf/ring-buffer: Always use {READ,WRITE}_ONCE() for rb->user_page data
  perf/ring_buffer: Add ordering to rb->nest increment
  perf/ring_buffer: Fix exposing a temporarily decreased data_head
  x86/CPU/AMD: Don't force the CPB cap when running under a hypervisor
  mISDN: make sure device name is NUL terminated
  usb: xhci: Fix a potential null pointer dereference in xhci_debugfs_create_endpoint()
  powerpc/powernv: Return for invalid IMC domain
  clk: ti: clkctrl: Fix clkdm_clk handling
  selftests: netfilter: missing error check when setting up veth interface
  ipvs: Fix use-after-free in ip_vs_in
  netfilter: nf_queue: fix reinject verdict handling
  perf/x86/intel/ds: Fix EVENT vs. UEVENT PEBS constraints
  Staging: vc04_services: Fix a couple error codes
  net: mvpp2: prs: Use the correct helpers when removing all VID filters
  net: mvpp2: prs: Fix parser range for VID filtering
  net/mlx5: Avoid reloading already removed devices
  vsock/virtio: set SOCK_DONE on peer shutdown
  tipc: purge deferredq list for each grp member in tipc_group_delete
  sunhv: Fix device naming inconsistency between sunhv_console and sunhv_reg
  sctp: Free cookie before we memdup a new one
  nfc: Ensure presence of required attributes in the deactivate_target handler
  net: openvswitch: do not free vport if register_netdevice() is failed.
  net: dsa: rtl8366: Fix up VLAN filtering
  neigh: fix use-after-free read in pneigh_get_next
  lapb: fixed leak of control-blocks.
  ipv6: flowlabel: fl6_sock_lookup() must use atomic_inc_not_zero
  hv_netvsc: Set probe mode to sync
  be2net: Fix number of Rx queues used for flow hashing
  ax25: fix inconsistent lock state in ax25_destroy_timer
  ANDROID: kernel: cgroup: cpuset: Clear cpus_requested for empty buf
  ANDROID: kernel: cgroup: cpuset: Add missing allocation of cpus_requested in alloc_trial_cpuset

Conflicts:
	fs/configfs/dir.c

Change-Id: Ib11d19d5a6926562356aa66315b03a7a0f7b9640
Signed-off-by: default avatarIvaylo Georgiev <irgeorgiev@codeaurora.org>
parents 5baa9a5b 237d3835

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 53

SUBLEVEL = 54

EXTRAVERSION =

NAME = "People's Front"

arch/arm64/kernel/sys.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ SYSCALL_DEFINE1(arm64_personality, unsigned int, personality) 


asmlinkage long sys_ni_syscall(void);



SYSCALL_DEFINE0(ni_syscall)

asmlinkage long __arm64_sys_ni_syscall(const struct pt_regs *__unused)

{

	return sys_ni_syscall();

}

arch/arm64/kernel/sys32.c

+0 −7
Original line number Diff line number Diff line
@@ -133,13 +133,6 @@ COMPAT_SYSCALL_DEFINE6(aarch32_fallocate, int, fd, int, mode, 
	return ksys_fallocate(fd, mode, arg_u64(offset), arg_u64(len));

}



asmlinkage long sys_ni_syscall(void);



COMPAT_SYSCALL_DEFINE0(ni_syscall)

{

	return sys_ni_syscall();

}



#undef __SYSCALL

#define __SYSCALL(nr, sym)	asmlinkage long __arm64_##sym(const struct pt_regs *);

#include <asm/unistd32.h>

arch/ia64/mm/numa.c

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ paddr_to_nid(unsigned long paddr) 


	return (i < num_node_memblks) ? node_memblk[i].nid : (num_node_memblks ? -1 : 0);

}

EXPORT_SYMBOL(paddr_to_nid);



#if defined(CONFIG_SPARSEMEM) && defined(CONFIG_NUMA)

/*

arch/powerpc/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -299,6 +299,7 @@ struct kvm_arch { 
#ifdef CONFIG_PPC_BOOK3S_64

	struct list_head spapr_tce_tables;

	struct list_head rtas_tokens;

	struct mutex rtas_token_lock;

	DECLARE_BITMAP(enabled_hcalls, MAX_HCALL_OPCODE/4 + 1);

#endif

#ifdef CONFIG_KVM_MPIC