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

Commit a1476870 authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android-4.14.129 (93c338c2) into msm-4.14 



* refs/heads/tmp-93c338c2:
  Linux 4.14.129
  Abort file_remove_privs() for non-reg. files
  infiniband: fix race condition between infiniband mlx4, mlx5 driver and core dumping
  coredump: fix race condition between collapse_huge_page() and core dumping
  HID: wacom: Send BTN_TOUCH in response to INTUOSP2_BT eraser contact
  HID: wacom: Don't report anything prior to the tool entering range
  HID: wacom: Don't set tool type until we're in range
  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: sh_eth: fix mdio access in sh_eth_close() for R-Car Gen2 and RZ/A1 SoCs
  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
  ia64: fix build errors by exporting paddr_to_nid()
  perf record: Fix s390 missing module symbol and warning for non-root users
  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: tulip: de4x5: Drop redundant MODULE_DEVICE_TABLE()
  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
  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
  sunhv: Fix device naming inconsistency between sunhv_console and sunhv_reg
  sctp: Free cookie before we memdup a new one
  net: openvswitch: do not free vport if register_netdevice() is failed.
  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
  be2net: Fix number of Rx queues used for flow hashing
  ax25: fix inconsistent lock state in ax25_destroy_timer
  perf machine: Guard against NULL in machine__exit()

Conflicts:
	fs/configfs/dir.c

Change-Id: I4045364b79aa23d85fc008fe99d858b24406bd2f
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents d6c7df0d 93c338c2

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 128

SUBLEVEL = 129

EXTRAVERSION =

NAME = Petit Gorille

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
@@ -296,6 +296,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

arch/powerpc/kvm/book3s.c

+1 −0
Original line number Diff line number Diff line
@@ -836,6 +836,7 @@ int kvmppc_core_init_vm(struct kvm *kvm) 
#ifdef CONFIG_PPC64

	INIT_LIST_HEAD_RCU(&kvm->arch.spapr_tce_tables);

	INIT_LIST_HEAD(&kvm->arch.rtas_tokens);

	mutex_init(&kvm->arch.rtas_token_lock);

#endif



	return kvm->arch.kvm_ops->init_vm(kvm);

arch/powerpc/kvm/book3s_hv.c

+1 −8
Original line number Diff line number Diff line
@@ -392,12 +392,7 @@ static void kvmppc_dump_regs(struct kvm_vcpu *vcpu) 


static struct kvm_vcpu *kvmppc_find_vcpu(struct kvm *kvm, int id)

{

	struct kvm_vcpu *ret;



	mutex_lock(&kvm->lock);

	ret = kvm_get_vcpu_by_id(kvm, id);

	mutex_unlock(&kvm->lock);

	return ret;

	return kvm_get_vcpu_by_id(kvm, id);

}



static void init_vpa(struct kvm_vcpu *vcpu, struct lppaca *vpa)
@@ -1258,7 +1253,6 @@ static void kvmppc_set_lpcr(struct kvm_vcpu *vcpu, u64 new_lpcr, 
	struct kvmppc_vcore *vc = vcpu->arch.vcore;

	u64 mask;



	mutex_lock(&kvm->lock);

	spin_lock(&vc->lock);

	/*

	 * If ILE (interrupt little-endian) has changed, update the
@@ -1298,7 +1292,6 @@ static void kvmppc_set_lpcr(struct kvm_vcpu *vcpu, u64 new_lpcr, 
		mask &= 0xFFFFFFFF;

	vc->lpcr = (vc->lpcr & ~mask) | (new_lpcr & mask);

	spin_unlock(&vc->lock);

	mutex_unlock(&kvm->lock);

}



static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,