Commit 9e521356 authored Feb 03, 2020 by Ivaylo Georgiev

Merge android-4.19-q.94 (dabb11de) into msm-4.19



* refs/heads/tmp-dabb11de:
  Revert "dt-bindings: clock: renesas: rcar-usb2-clock-sel: Fix typo in example"
  Linux 4.19.94
  perf/x86/intel/bts: Fix the use of page_private()
  xen/blkback: Avoid unmapping unmapped grant pages
  s390/smp: fix physical to logical CPU map for SMT
  ubifs: ubifs_tnc_start_commit: Fix OOB in layout_in_gaps
  net: add annotations on hh->hh_len lockless accesses
  xfs: periodically yield scrub threads to the scheduler
  ath9k_htc: Discard undersized packets
  ath9k_htc: Modify byte order for an error message
  net: core: limit nested device depth
  tcp: annotate tp->rcv_nxt lockless reads
  rxrpc: Fix possible NULL pointer access in ICMP handling
  KVM: PPC: Book3S HV: use smp_mb() when setting/clearing host_ipi flag
  selftests: rtnetlink: add addresses with fixed life time
  powerpc/pseries/hvconsole: Fix stack overread via udbg
  drm/mst: Fix MST sideband up-reply failure handling
  scsi: qedf: Do not retry ELS request if qedf_alloc_cmd fails
  bdev: Refresh bdev size for disks without partitioning
  bdev: Factor out bdev revalidation into a common helper
  fix compat handling of FICLONERANGE, FIDEDUPERANGE and FS_IOC_FIEMAP
  tty: serial: msm_serial: Fix lockup for sysrq and oops
  arm64: dts: meson: odroid-c2: Disable usb_otg bus to avoid power failed warning
  dt-bindings: clock: renesas: rcar-usb2-clock-sel: Fix typo in example
  media: usb: fix memory leak in af9005_identify_state
  regulator: ab8500: Remove AB8505 USB regulator
  media: flexcop-usb: ensure -EIO is returned on error condition
  Bluetooth: Fix memory leak in hci_connect_le_scan
  Bluetooth: delete a stray unlock
  Bluetooth: btusb: fix PM leak in error case of setup
  platform/x86: pmc_atom: Add Siemens CONNECT X300 to critclk_systems DMI table
  xfs: don't check for AG deadlock for realtime files in bunmapi
  ACPI: sysfs: Change ACPI_MASKABLE_GPE_MAX to 0x100
  HID: i2c-hid: Reset ALPS touchpads on resume
  nfsd4: fix up replay_matches_cache()
  PM / devfreq: Check NULL governor in available_governors_show
  drm/msm: include linux/sched/task.h
  ftrace: Avoid potential division by zero in function profiler
  arm64: Revert support for execute-only user mappings
  exit: panic before exit_mm() on global init exit
  ALSA: firewire-motu: Correct a typo in the clock proc string
  ALSA: cs4236: fix error return comparison of an unsigned integer
  apparmor: fix aa_xattrs_match() may sleep while holding a RCU lock
  tracing: Fix endianness bug in histogram trigger
  tracing: Have the histogram compare functions convert to u64 first
  tracing: Avoid memory leak in process_system_preds()
  tracing: Fix lock inversion in trace_event_enable_tgid_record()
  rseq/selftests: Fix: Namespace gettid() for compatibility with glibc 2.30
  riscv: ftrace: correct the condition logic in function graph tracer
  gpiolib: fix up emulated open drain outputs
  libata: Fix retrieving of active qcs
  ata: ahci_brcm: BCM7425 AHCI requires AHCI_HFLAG_DELAY_ENGINE
  ata: ahci_brcm: Add missing clock management during recovery
  ata: ahci_brcm: Allow optional reset controller to be used
  ata: ahci_brcm: Fix AHCI resources management
  ata: libahci_platform: Export again ahci_platform_<en/dis>able_phys()
  compat_ioctl: block: handle BLKREPORTZONE/BLKRESETZONE
  compat_ioctl: block: handle Persistent Reservations
  dmaengine: Fix access to uninitialized dma_slave_caps
  locks: print unsigned ino in /proc/locks
  pstore/ram: Write new dumps to start of recycled zones
  mm: move_pages: return valid node id in status if the page is already on the target node
  memcg: account security cred as well to kmemcg
  mm/zsmalloc.c: fix the migrated zspage statistics.
  media: cec: check 'transmit_in_progress', not 'transmitting'
  media: cec: avoid decrementing transmit_queue_sz if it is 0
  media: cec: CEC 2.0-only bcast messages were ignored
  media: pulse8-cec: fix lost cec_transmit_attempt_done() call
  MIPS: Avoid VDSO ABI breakage due to global register variable
  drm/sun4i: hdmi: Remove duplicate cleanup calls
  ALSA: hda/realtek - Add headset Mic no shutup for ALC283
  ALSA: usb-audio: set the interface format after resume on Dell WD19
  ALSA: usb-audio: fix set_format altsetting sanity check
  ALSA: ice1724: Fix sleep-in-atomic in Infrasonic Quartet support code
  netfilter: nft_tproxy: Fix port selector on Big Endian
  drm: limit to INT_MAX in create_blob ioctl
  taskstats: fix data-race
  xfs: fix mount failure crash on invalid iclog memory access
  ALSA: hda - fixup for the bass speaker on Lenovo Carbon X1 7th gen
  ALSA: hda/realtek - Enable the bass speaker of ASUS UX431FLC
  ALSA: hda/realtek - Add Bass Speaker and fixed dac for bass speaker
  PM / hibernate: memory_bm_find_bit(): Tighten node optimisation
  xen/balloon: fix ballooned page accounting without hotplug enabled
  xen-blkback: prevent premature module unload
  IB/mlx5: Fix steering rule of drop and count
  IB/mlx4: Follow mirror sequence of device add during device removal
  s390/cpum_sf: Avoid SBD overflow condition in irq handler
  s390/cpum_sf: Adjust sampling interval to avoid hitting sample limits
  md: raid1: check rdev before reference in raid1_sync_request func
  afs: Fix creation calls in the dynamic root to fail with EOPNOTSUPP
  net: make socket read/write_iter() honor IOCB_NOWAIT
  usb: gadget: fix wrong endpoint desc
  drm/nouveau: Move the declaration of struct nouveau_conn_atom up a bit
  scsi: libsas: stop discovering if oob mode is disconnected
  scsi: iscsi: qla4xxx: fix double free in probe
  scsi: qla2xxx: Ignore PORT UPDATE after N2N PLOGI
  scsi: qla2xxx: Send Notify ACK after N2N PLOGI
  scsi: qla2xxx: Configure local loop for N2N target
  scsi: qla2xxx: Fix PLOGI payload and ELS IOCB dump length
  scsi: qla2xxx: Don't call qlt_async_event twice
  scsi: qla2xxx: Drop superfluous INIT_WORK of del_work
  scsi: lpfc: Fix memory leak on lpfc_bsg_write_ebuf_set func
  rxe: correctly calculate iCRC for unaligned payloads
  RDMA/cma: add missed unregister_pernet_subsys in init failure
  afs: Fix SELinux setting security label on /afs
  afs: Fix afs_find_server lookups for ipv4 peers
  PM / devfreq: Don't fail devfreq_dev_release if not in list
  PM / devfreq: Set scaling_max_freq to max on OPP notifier error
  PM / devfreq: Fix devfreq_notifier_call returning errno
  iio: adc: max9611: Fix too short conversion time delay
  drm/amd/display: Fixed kernel panic when booting with DP-to-HDMI dongle
  drm/amdgpu: add cache flush workaround to gfx8 emit_fence
  drm/amdgpu: add check before enabling/disabling broadcast mode
  nvme-fc: fix double-free scenarios on hw queues
  nvme_fc: add module to ops template to allow module references

Conflicts:
	drivers/devfreq/devfreq.c
	drivers/gpu/drm/drm_dp_mst_topology.c
	drivers/gpu/drm/drm_property.c

Change-Id: Iad80571bea0a2197ea36a70c425c61a66c0cf0bc
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>

parents 15283112 363cfba6

Documentation/admin-guide/kernel-parameters.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@
		the GPE dispatcher.
		This facility can be used to prevent such uncontrolled
		GPE floodings.
		Format: <int>
		Format: <byte>

		acpi_no_auto_serialize [HW,ACPI]
		Disable auto-serialization of AML methods

Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 4
		PATCHLEVEL = 19
		SUBLEVEL = 93
		SUBLEVEL = 94
		EXTRAVERSION =
		NAME = "People's Front"

arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts

+2 −2

Original line number	Diff line number	Diff line
		@@ -293,7 +293,7 @@
		};

		&usb0_phy {
		status = "okay";
		status = "disabled";
		phy-supply = <&usb_otg_pwr>;
		};

		@@ -303,7 +303,7 @@
		};

		&usb0 {
		status = "okay";
		status = "disabled";
		};

		&usb1 {

arch/arm64/include/asm/pgtable-prot.h

+2 −3

Original line number	Diff line number	Diff line
		@@ -96,13 +96,12 @@
		#define PAGE_SHARED_EXEC __pgprot(_PAGE_DEFAULT \| PTE_USER \| PTE_RDONLY \| PTE_NG \| PTE_PXN \| PTE_WRITE)
		#define PAGE_READONLY __pgprot(_PAGE_DEFAULT \| PTE_USER \| PTE_RDONLY \| PTE_NG \| PTE_PXN \| PTE_UXN)
		#define PAGE_READONLY_EXEC __pgprot(_PAGE_DEFAULT \| PTE_USER \| PTE_RDONLY \| PTE_NG \| PTE_PXN)
		#define PAGE_EXECONLY __pgprot(_PAGE_DEFAULT \| PTE_RDONLY \| PTE_NG \| PTE_PXN)

		#define __P000 PAGE_NONE
		#define __P001 PAGE_READONLY
		#define __P010 PAGE_READONLY
		#define __P011 PAGE_READONLY
		#define __P100 PAGE_EXECONLY
		#define __P100 PAGE_READONLY_EXEC
		#define __P101 PAGE_READONLY_EXEC
		#define __P110 PAGE_READONLY_EXEC
		#define __P111 PAGE_READONLY_EXEC
		@@ -111,7 +110,7 @@
		#define __S001 PAGE_READONLY
		#define __S010 PAGE_SHARED
		#define __S011 PAGE_SHARED
		#define __S100 PAGE_EXECONLY
		#define __S100 PAGE_READONLY_EXEC
		#define __S101 PAGE_READONLY_EXEC
		#define __S110 PAGE_SHARED_EXEC
		#define __S111 PAGE_SHARED_EXEC

arch/arm64/include/asm/pgtable.h

+3 −7

Original line number	Diff line number	Diff line
		@@ -106,12 +106,8 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
		#define pte_dirty(pte) (pte_sw_dirty(pte) \|\| pte_hw_dirty(pte))

		#define pte_valid(pte) (!!(pte_val(pte) & PTE_VALID))
		/*
		* Execute-only user mappings do not have the PTE_USER bit set. All valid
		* kernel mappings have the PTE_UXN bit set.
		*/
		#define pte_valid_not_user(pte) \
		((pte_val(pte) & (PTE_VALID \| PTE_USER \| PTE_UXN)) == (PTE_VALID \| PTE_UXN))
		((pte_val(pte) & (PTE_VALID \| PTE_USER)) == PTE_VALID)
		#define pte_valid_young(pte) \
		((pte_val(pte) & (PTE_VALID \| PTE_AF)) == (PTE_VALID \| PTE_AF))
		#define pte_valid_user(pte) \
		@@ -127,8 +123,8 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];

		/*
		* p??_access_permitted() is true for valid user mappings (subject to the
		* write permission check) other than user execute-only which do not have the
		* PTE_USER bit set. PROT_NONE mappings do not have the PTE_VALID bit set.
		* write permission check). PROT_NONE mappings do not have the PTE_VALID bit
		* set.
		*/
		#define pte_access_permitted(pte, write) \
		(pte_valid_user(pte) && (!(write) \|\| pte_write(pte)))