Commit a0c8d6ec authored Feb 11, 2019 by Blagovest Kolenichev

Merge android-4.14-p.98 (848d71fb) into msm-4.14



* refs/heads/tmp-848d71fb:
  Linux 4.14.98
  fanotify: fix handling of events on child sub-directory
  drivers: core: Remove glue dirs from sysfs earlier
  cifs: Always resolve hostname before reconnecting
  md/raid5: fix 'out of memory' during raid cache recovery
  mm: migrate: don't rely on __PageMovable() of newpage after unlocking it
  mm: hwpoison: use do_send_sig_info() instead of force_sig()
  mm, oom: fix use-after-free in oom_kill_process
  oom, oom_reaper: do not enqueue same task twice
  kernel/exit.c: release ptraced tasks before zap_pid_ns_processes
  mmc: sdhci-iproc: handle mmc_of_parse() errors during probe
  platform/x86: asus-nb-wmi: Drop mapping of 0x33 and 0x34 scan codes
  platform/x86: asus-nb-wmi: Map 0x35 to KEY_SCREENLOCK
  IB/hfi1: Remove overly conservative VM_EXEC flag check
  ALSA: hda/realtek - Fixed hp_pin no value
  mmc: bcm2835: Fix DMA channel leak on probe error
  gfs2: Revert "Fix loop in gfs2_rbm_find"
  gpio: pcf857x: Fix interrupts on multiple instances
  gpio: altera-a10sr: Set proper output level for direction_output
  arm64: hibernate: Clean the __hyp_text to PoC after resume
  arm64: hyp-stub: Forbid kprobing of the hyp-stub
  arm64: kaslr: ensure randomized quantities are clean also when kaslr is off
  ARM: cns3xxx: Fix writing to wrong PCI config registers after alignment
  NFS: Fix up return value on fatal errors in nfs_page_async_flush()
  selftests/seccomp: Enhance per-arch ptrace syscall skip tests
  iommu/vt-d: Fix memory leak in intel_iommu_put_resv_regions()
  fs/dcache: Fix incorrect nr_dentry_unused accounting in shrink_dcache_sb()
  CIFS: Do not count -ENODATA as failure for query directory
  ipvlan, l3mdev: fix broken l3s mode wrt local routes
  l2tp: fix reading optional fields of L2TPv3
  l2tp: remove l2specific_len dependency in l2tp_core
  sctp: improve the events for sctp stream reset
  sctp: improve the events for sctp stream adding
  virtio_net: Fix not restoring real_num_rx_queues
  virtio_net: Don't call free_old_xmit_skbs for xdp_frames
  virtio_net: Don't enable NAPI when interface is down
  Revert "net/mlx5e: E-Switch, Initialize eswitch only if eswitch manager"
  net/mlx5e: Allow MAC invalidation while spoofchk is ON
  ucc_geth: Reset BQL queue when stopping device
  net: set default network namespace in init_dummy_netdev()
  net/rose: fix NULL ax25_cb kernel panic
  netrom: switch to sock timer API
  net/mlx4_core: Add masking for a few queries on HCA caps
  l2tp: copy 4 more bytes to linear part if necessary
  ipv6: sr: clear IP6CB(skb) on SRH ip4ip6 encapsulation
  ipv6: Consider sk_bound_dev_if when binding a socket to an address
  Fix "net: ipv4: do not handle duplicate fragments as overlapping"

Conflicts:
	mm/oom_kill.c

Change-Id: I647b62a46225034b3c6286a774bafb8c6439dbde
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>

parents 2cda3bbe 848d71fb

Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 4
		PATCHLEVEL = 14
		SUBLEVEL = 97
		SUBLEVEL = 98
		EXTRAVERSION =
		NAME = Petit Gorille

arch/arm/mach-cns3xxx/pcie.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -83,7 +83,7 @@ static void __iomem cns3xxx_pci_map_bus(struct pci_bus bus,
		} else /* remote PCI bus */
		base = cnspci->cfg1_regs + ((busno & 0xf) << 20);

		return base + (where & 0xffc) + (devfn << 12);
		return base + where + (devfn << 12);
		}

		static int cns3xxx_pci_read_config(struct pci_bus *bus, unsigned int devfn,

arch/arm64/kernel/hibernate.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -299,8 +299,10 @@ int swsusp_arch_suspend(void)
		dcache_clean_range(__idmap_text_start, __idmap_text_end);

		/* Clean kvm setup code to PoC? */
		if (el2_reset_needed())
		if (el2_reset_needed()) {
		dcache_clean_range(__hyp_idmap_text_start, __hyp_idmap_text_end);
		dcache_clean_range(__hyp_text_start, __hyp_text_end);
		}

		/* make the crash dump kernel image protected again */
		crash_post_resume();

arch/arm64/kernel/hyp-stub.S

+2 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,8 @@
		#include <asm/virt.h>

		.text
		.pushsection .hyp.text, "ax"

		.align 11

		ENTRY(__hyp_stub_vectors)

arch/arm64/kernel/kaslr.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,7 @@ u64 __init kaslr_early_init(u64 dt_phys)
		* we end up running with module randomization disabled.
		*/
		module_alloc_base = (u64)_etext - MODULES_VSIZE;
		__flush_dcache_area(&module_alloc_base, sizeof(module_alloc_base));

		/*
		* Try to map the FDT early. If this fails, we simply bail,