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

Commit a71cb5b9 authored by Ivaylo Georgiev's avatar Ivaylo Georgiev
Browse files

Merge android-4.19.62 (f232ce65) into msm-4.19 



* refs/heads/tmp-f232ce65:
  Linux 4.19.62
  net: sched: verify that q!=NULL before setting q->flags
  mm: vmscan: scan anonymous pages on file refaults
  KVM: nVMX: Clear pending KVM_REQ_GET_VMCS12_PAGES when leaving nested
  KVM: nVMX: do not use dangling shadow VMCS after guest reset
  ext4: allow directory holes
  ext4: use jbd2_inode dirty range scoping
  jbd2: introduce jbd2_inode dirty range scoping
  mm: add filemap_fdatawait_range_keep_errors()
  ext4: enforce the immutable flag on open files
  ext4: don't allow any modifications to an immutable file
  perf/core: Fix race between close() and fork()
  perf/core: Fix exclusive events' grouping
  MIPS: lb60: Fix pin mappings
  gpio: davinci: silence error prints in case of EPROBE_DEFER
  dma-buf: Discard old fence_excl on retrying get_fences_rcu for realloc
  dma-buf: balance refcount inbalance
  net: bridge: stp: don't cache eth dest pointer before skb pull
  net: bridge: don't cache ether dest pointer on input
  net: bridge: mcast: fix stale ipv6 hdr pointer when handling v6 query
  net: bridge: mcast: fix stale nsrcs pointer in igmp3/mld2 report handling
  sctp: not bind the socket in sctp_connect
  net/tls: make sure offload also gets the keys wiped
  net_sched: unset TCQ_F_CAN_BYPASS when adding filters
  netrom: hold sock when setting skb->destructor
  netrom: fix a memory leak in nr_rx_frame()
  macsec: fix checksumming after decryption
  macsec: fix use-after-free of skb during RX
  net/mlx5e: IPoIB, Add error path in mlx5_rdma_setup_rn
  vrf: make sure skb->data contains ip header to make routing
  tcp: Reset bytes_acked and bytes_received when disconnecting
  tcp: fix tcp_set_congestion_control() use from bpf hook
  tcp: be more careful in tcp_fragment()
  sky2: Disable MSI on ASUS P6T
  sctp: fix error handling on stream scheduler initialization
  rxrpc: Fix send on a connected, but unbound socket
  r8169: fix issue with confused RX unit after PHY power-down on RTL8411b
  nfc: fix potential illegal memory access
  net: stmmac: Re-work the queue selection for TSO packets
  net: phy: sfp: hwmon: Fix scaling of RX power
  net: openvswitch: fix csum updates for MPLS actions
  net: neigh: fix multiple neigh timer scheduling
  net: make skb_dst_force return true when dst is refcounted
  net: dsa: mv88e6xxx: wait after reset deactivation
  net: bcmgenet: use promisc for unsupported filters
  ipv6: Unlink sibling route in case of failure
  ipv6: rt6_check should return NULL if 'from' is NULL
  ipv4: don't set IPv6 only flags to IPv4 addresses
  igmp: fix memory leak in igmpv3_del_delrec()
  hv_netvsc: Fix extra rcu_read_unlock in netvsc_recv_callback()
  caif-hsi: fix possible deadlock in cfhsi_exit_module()
  bnx2x: Prevent load reordering in tx completion processing
  ANDROID: xfrm: remove in_compat_syscall() checks
  ANDROID: enable CONFIG_RTC_DRV_TEST on cuttlefish

Conflicts:
	kernel/events/core.c

Change-Id: Id501b344a427f6daab82039b9922e8e69d660feb
Signed-off-by: default avatarIvaylo Georgiev <irgeorgiev@codeaurora.org>
parents e369d405 f232ce65

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 61

SUBLEVEL = 62

EXTRAVERSION =

NAME = "People's Front"

arch/mips/jz4740/board-qi_lb60.c

+8 −8
Original line number Diff line number Diff line
@@ -471,27 +471,27 @@ static unsigned long pin_cfg_bias_disable[] = { 
static struct pinctrl_map pin_map[] __initdata = {

	/* NAND pin configuration */

	PIN_MAP_MUX_GROUP_DEFAULT("jz4740-nand",

			"10010000.jz4740-pinctrl", "nand", "nand-cs1"),

			"10010000.pin-controller", "nand-cs1", "nand"),



	/* fbdev pin configuration */

	PIN_MAP_MUX_GROUP("jz4740-fb", PINCTRL_STATE_DEFAULT,

			"10010000.jz4740-pinctrl", "lcd", "lcd-8bit"),

			"10010000.pin-controller", "lcd-8bit", "lcd"),

	PIN_MAP_MUX_GROUP("jz4740-fb", PINCTRL_STATE_SLEEP,

			"10010000.jz4740-pinctrl", "lcd", "lcd-no-pins"),

			"10010000.pin-controller", "lcd-no-pins", "lcd"),



	/* MMC pin configuration */

	PIN_MAP_MUX_GROUP_DEFAULT("jz4740-mmc.0",

			"10010000.jz4740-pinctrl", "mmc", "mmc-1bit"),

			"10010000.pin-controller", "mmc-1bit", "mmc"),

	PIN_MAP_MUX_GROUP_DEFAULT("jz4740-mmc.0",

			"10010000.jz4740-pinctrl", "mmc", "mmc-4bit"),

			"10010000.pin-controller", "mmc-4bit", "mmc"),

	PIN_MAP_CONFIGS_PIN_DEFAULT("jz4740-mmc.0",

			"10010000.jz4740-pinctrl", "PD0", pin_cfg_bias_disable),

			"10010000.pin-controller", "PD0", pin_cfg_bias_disable),

	PIN_MAP_CONFIGS_PIN_DEFAULT("jz4740-mmc.0",

			"10010000.jz4740-pinctrl", "PD2", pin_cfg_bias_disable),

			"10010000.pin-controller", "PD2", pin_cfg_bias_disable),



	/* PWM pin configuration */

	PIN_MAP_MUX_GROUP_DEFAULT("jz4740-pwm",

			"10010000.jz4740-pinctrl", "pwm4", "pwm4"),

			"10010000.pin-controller", "pwm4", "pwm4"),

};

arch/x86/configs/x86_64_cuttlefish_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -406,6 +406,7 @@ CONFIG_MMC=y 
# CONFIG_PWRSEQ_SIMPLE is not set

# CONFIG_MMC_BLOCK is not set

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_TEST=y

CONFIG_SW_SYNC=y

CONFIG_VIRTIO_PCI=y

CONFIG_VIRTIO_BALLOON=y

arch/x86/kvm/vmx.c

+9 −1
Original line number Diff line number Diff line
@@ -8457,6 +8457,7 @@ static void vmx_disable_shadow_vmcs(struct vcpu_vmx *vmx) 
{

	vmcs_clear_bits(SECONDARY_VM_EXEC_CONTROL, SECONDARY_EXEC_SHADOW_VMCS);

	vmcs_write64(VMCS_LINK_POINTER, -1ull);

	vmx->nested.sync_shadow_vmcs = false;

}



static inline void nested_release_vmcs12(struct vcpu_vmx *vmx)
@@ -8468,7 +8469,6 @@ static inline void nested_release_vmcs12(struct vcpu_vmx *vmx) 
		/* copy to memory all shadowed fields in case

		   they were modified */

		copy_shadow_to_vmcs12(vmx);

		vmx->nested.sync_shadow_vmcs = false;

		vmx_disable_shadow_vmcs(vmx);

	}

	vmx->nested.posted_intr_nv = -1;
@@ -8490,6 +8490,8 @@ static void free_nested(struct vcpu_vmx *vmx) 
	if (!vmx->nested.vmxon && !vmx->nested.smm.vmxon)

		return;



	kvm_clear_request(KVM_REQ_GET_VMCS12_PAGES, &vmx->vcpu);



	hrtimer_cancel(&vmx->nested.preemption_timer);

	vmx->nested.vmxon = false;

	vmx->nested.smm.vmxon = false;
@@ -8668,6 +8670,9 @@ static void copy_shadow_to_vmcs12(struct vcpu_vmx *vmx) 
	u64 field_value;

	struct vmcs *shadow_vmcs = vmx->vmcs01.shadow_vmcs;



	if (WARN_ON(!shadow_vmcs))

		return;



	preempt_disable();



	vmcs_load(shadow_vmcs);
@@ -8706,6 +8711,9 @@ static void copy_vmcs12_to_shadow(struct vcpu_vmx *vmx) 
	u64 field_value = 0;

	struct vmcs *shadow_vmcs = vmx->vmcs01.shadow_vmcs;



	if (WARN_ON(!shadow_vmcs))

		return;



	vmcs_load(shadow_vmcs);



	for (q = 0; q < ARRAY_SIZE(fields); q++) {

drivers/dma-buf/dma-buf.c

+1 −0
Original line number Diff line number Diff line
@@ -1221,6 +1221,7 @@ static int dma_buf_debug_show(struct seq_file *s, void *unused) 
				   fence->ops->get_driver_name(fence),

				   fence->ops->get_timeline_name(fence),

				   dma_fence_is_signaled(fence) ? "" : "un");

			dma_fence_put(fence);

		}

		rcu_read_unlock();