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

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

Merge android-4.19.61 (71ce27c3) into msm-4.19



* refs/heads/tmp-71ce27c3:
  Revert "dt-bindings: allow up to four clocks for orion-mdio"
  Linux 4.19.61
  dm bufio: fix deadlock with loop device
  dt-bindings: allow up to four clocks for orion-mdio
  net: mvmdio: allow up to four clocks to be specified for orion-mdio
  blkcg: update blkcg_print_stat() to handle larger outputs
  blk-iolatency: clear use_delay when io.latency is set to zero
  blk-throttle: fix zero wait time for iops throttled group
  usb: Handle USB3 remote wakeup for LPM enabled devices correctly
  Bluetooth: Add SMP workaround Microsoft Surface Precision Mouse bug
  intel_th: msu: Fix single mode with disabled IOMMU
  mtd: spinand: read returns badly if the last page has bitflips
  mtd: rawnand: mtk: Correct low level time calculation of r/w cycle
  eCryptfs: fix a couple type promotion bugs
  mmc: sdhci-msm: fix mutex while in spinlock
  powerpc/pseries: Fix oops in hotplug memory notifier
  powerpc/powernv/npu: Fix reference leak
  powerpc/watchpoint: Restore NV GPRs while returning from exception
  powerpc/32s: fix suspend/resume when IBATs 4-7 are used
  parisc: Fix kernel panic due invalid values in IAOQ0 or IAOQ1
  parisc: Ensure userspace privilege for ptraced processes in regset functions
  crypto: caam - limit output IV to CBC to work around CTR mode DMA issue
  gpu: ipu-v3: ipu-ic: Fix saturation bit offset in TPMEM
  xfs: abort unaligned nowait directio early
  xfs: serialize unaligned dio writes against all other dio writes
  xfs: fix reporting supported extra file attributes for statx()
  xfs: reserve blocks for ifree transaction during log recovery
  xfs: don't ever put nlink > 0 inodes on the unlinked list
  xfs: rename m_inotbt_nores to m_finobt_nores
  xfs: don't overflow xattr listent buffer
  xfs: flush removing page cache in xfs_reflink_remap_prep
  xfs: fix pagecache truncation prior to reflink
  include/asm-generic/bug.h: fix "cut here" for WARN_ON for __WARN_TAINT architectures
  coda: pass the host file in vma->vm_file on mmap
  libnvdimm/pfn: fix fsdax-mode namespace info-block zero-fields
  HID: wacom: correct touch resolution x/y typo
  HID: wacom: generic: Correct pad syncing
  HID: wacom: generic: only switch the mode on devices with LEDs
  IB/mlx5: Report correctly tag matching rendezvous capability
  Btrfs: add missing inode version, ctime and mtime updates when punching hole
  Btrfs: fix fsync not persisting dentry deletions due to inode evictions
  Btrfs: fix data loss after inode eviction, renaming it, and fsync it
  PCI: qcom: Ensure that PERST is asserted for at least 100 ms
  PCI: Do not poll for PME if the device is in D3cold
  PCI: hv: Fix a use-after-free bug in hv_eject_device_work()
  intel_th: pci: Add Ice Lake NNPI support
  drm/edid: parse CEA blocks embedded in DisplayID
  perf/x86/amd/uncore: Set the thread mask for F17h L3 PMCs
  perf/x86/amd/uncore: Do not set 'ThreadMask' and 'SliceMask' for non-L3 PMCs
  perf/x86/intel: Fix spurious NMI on fixed counter
  x86/boot: Fix memory leak in default_get_smp_config()
  9p/virtio: Add cleanup path in p9_virtio_init
  9p/xen: Add cleanup path in p9_trans_xen_init
  xen/events: fix binding user event channels to cpus
  dm zoned: fix zone state management race
  padata: use smp_mb in padata_reorder to avoid orphaned padata jobs
  drm/nouveau/i2c: Enable i2c pads & busses during preinit
  kconfig: fix missing choice values in auto.conf
  fs/proc/proc_sysctl.c: fix the default values of i_uid/i_gid on /proc/sys inodes.
  arm64: tegra: Fix AGIC register range
  KVM: x86/vPMU: refine kvm_pmu err msg when event creation failed
  media: videobuf2-dma-sg: Prevent size from overflowing
  media: videobuf2-core: Prevent size alignment wrapping buffer size to 0
  media: coda: Remove unbalanced and unneeded mutex unlock
  media: v4l2: Test type instead of cfg->type in v4l2_ctrl_new_custom()
  ALSA: hda/realtek: apply ALC891 headset fixup to one Dell machine
  ALSA: hda/realtek - Fixed Headphone Mic can't record on Dell platform
  ALSA: seq: Break too long mutex context in the write loop
  raid5-cache: Need to do start() part job after adding journal device
  ASoC: dapm: Adapt for debugfs API change
  lib/scatterlist: Fix mapping iterator when sg->offset is greater than PAGE_SIZE
  pnfs: Fix a problem where we gratuitously start doing I/O through the MDS
  pNFS: Fix a typo in pnfs_update_layout
  pnfs/flexfiles: Fix PTR_ERR() dereferences in ff_layout_track_ds_error
  NFSv4: Handle the special Linux file open access mode
  iwlwifi: fix RF-Kill interrupt while FW load for gen2 devices
  iwlwifi: don't WARN when calling iwl_get_shared_mem_conf with RF-Kill
  iwlwifi: pcie: fix ALIVE interrupt handling for gen2 devices w/o MSI-X
  iwlwifi: pcie: don't service an interrupt that was masked
  arm64: tegra: Update Jetson TX1 GPU regulator timings
  regulator: s2mps11: Fix buck7 and buck8 wrong voltages
  Input: alps - fix a mismatch between a condition check and its comment
  Input: synaptics - whitelist Lenovo T580 SMBus intertouch
  Input: alps - don't handle ALPS cs19 trackpoint-only device
  Input: gtco - bounds check collection indent level
  bcache: destroy dc->writeback_write_wq if failed to create dc->writeback_thread
  bcache: fix mistaken sysfs entry for io_error counter
  bcache: ignore read-ahead request failure on backing device
  bcache: Revert "bcache: free heap cache_set->flush_btree in bch_journal_free"
  bcache: Revert "bcache: fix high CPU occupancy during journal"
  Revert "bcache: set CACHE_SET_IO_DISABLE in bch_cached_dev_error()"
  crypto: crypto4xx - fix a potential double free in ppc4xx_trng_probe
  crypto: ccp/gcm - use const time tag comparison.
  crypto: ccp - memset structure fields to zero before reuse
  crypto: crypto4xx - block ciphers should only accept complete blocks
  crypto: crypto4xx - fix blocksize for cfb and ofb
  crypto: crypto4xx - fix AES CTR blocksize value
  crypto: chacha20poly1305 - fix atomic sleep when using async algorithm
  crypto: arm64/sha2-ce - correct digest for empty data in finup
  crypto: arm64/sha1-ce - correct digest for empty data in finup
  crypto: ccp - Validate the the error value used to index error messages
  crypto: ghash - fix unaligned memory access in ghash_setkey()
  scsi: mac_scsi: Fix pseudo DMA implementation, take 2
  scsi: mac_scsi: Increase PIO/PDMA transfer length threshold
  scsi: megaraid_sas: Fix calculation of target ID
  scsi: core: Fix race on creating sense cache
  Revert "scsi: ncr5380: Increase register polling limit"
  scsi: NCR5380: Always re-enable reselection interrupt
  scsi: NCR5380: Reduce goto statements in NCR5380_select()
  xen: let alloc_xenballooned_pages() fail if not enough memory free
  floppy: fix out-of-bounds read in copy_buffer
  floppy: fix invalid pointer dereference in drive_name
  floppy: fix out-of-bounds read in next_valid_format
  floppy: fix div-by-zero in setup_format_params
  iavf: fix dereference of null rx_buffer pointer
  net: mvmdio: defer probe of orion-mdio if a clock is not ready
  gtp: fix use-after-free in gtp_newlink()
  gtp: fix use-after-free in gtp_encap_destroy()
  gtp: fix Illegal context switch in RCU read-side critical section.
  gtp: fix suspicious RCU usage
  Bluetooth: validate BLE connection interval updates
  gtp: add missing gtp_encap_disable_sock() in gtp_encap_enable()
  Bluetooth: Check state in l2cap_disconnect_rsp
  perf tests: Fix record+probe_libc_inet_pton.sh for powerpc64
  Bluetooth: 6lowpan: search for destination address in all peers
  Bluetooth: Add new 13d3:3501 QCA_ROME device
  Bluetooth: Add new 13d3:3491 QCA_ROME device
  Bluetooth: hci_bcsp: Fix memory leak in rx_skb
  tools: bpftool: Fix json dump crash on powerpc
  gpiolib: Fix references to gpiod_[gs]et_*value_cansleep() variants
  bonding: validate ip header before check IPPROTO_IGMP
  selftests: bpf: fix inlines in test_lwt_seg6local
  bpf, libbpf, smatch: Fix potential NULL pointer dereference
  rxrpc: Fix oops in tracepoint
  net: usb: asix: init MAC address buffers
  bnx2x: Prevent ptp_task to be rescheduled indefinitely
  perf stat: Fix group lookup for metric group
  perf stat: Make metric event lookup more robust
  bpf: fix uapi bpf_prog_info fields alignment
  iwlwifi: mvm: Drop large non sta frames
  igb: clear out skb->tstamp after reading the txtime
  net: mvpp2: prs: Don't override the sign bit in SRAM parser shift
  ath10k: destroy sdio workqueue while remove sdio module
  net: hns3: add some error checking in hclge_tm module
  net: hns3: fix a -Wformat-nonliteral compile warning
  bcache: fix potential deadlock in cached_def_free()
  bcache: check c->gc_thread by IS_ERR_OR_NULL in cache_set_flush()
  bcache: acquire bch_register_lock later in cached_dev_free()
  bcache: check CACHE_SET_IO_DISABLE bit in bch_journal()
  bcache: check CACHE_SET_IO_DISABLE in allocator code
  EDAC: Fix global-out-of-bounds write when setting edac_mc_poll_msec
  wil6210: drop old event after wmi_call timeout
  crypto: asymmetric_keys - select CRYPTO_HASH where needed
  crypto: serpent - mark __serpent_setkey_sbox noinline
  ixgbe: Check DDM existence in transceiver before access
  rslib: Fix handling of of caller provided syndrome
  rslib: Fix decoding of shortened codes
  xsk: Properly terminate assignment in xskq_produce_flush_desc
  clocksource/drivers/exynos_mct: Increase priority over ARM arch timer
  libata: don't request sense data on !ZAC ATA devices
  ASoC: Intel: hdac_hdmi: Set ops to NULL on remove
  perf tools: Increase MAX_NR_CPUS and MAX_CACHES
  ath10k: fix PCIE device wake up failed
  ath10k: add missing error handling
  ipvs: fix tinfo memory leak in start_sync_thread
  mt7601u: fix possible memory leak when the device is disconnected
  x86/build: Add 'set -e' to mkcapflags.sh to delete broken capflags.c
  mt7601u: do not schedule rx_tasklet when the device has been disconnected
  rtlwifi: rtl8192cu: fix error handle when usb probe failed
  net: stmmac: sun8i: force select external PHY when no internal one
  media: hdpvr: fix locking and a missing msleep
  media: vimc: cap: check v4l2_fill_pixfmt return value
  media: coda: increment sequence offset for the last returned frame
  media: coda: fix last buffer handling in V4L2_ENC_CMD_STOP
  media: coda: fix mpeg2 sequence number handling
  acpi/arm64: ignore 5.1 FADTs that are reported as 5.0
  timer_list: Guard procfs specific code
  ntp: Limit TAI-UTC offset
  media: i2c: fix warning same module names
  media: s5p-mfc: Make additional clocks optional
  ipvs: defer hook registration to avoid leaks
  ipsec: select crypto ciphers for xfrm_algo
  arm64: Do not enable IRQs for ct_user_exit
  lightnvm: pblk: fix freeing of merged pages
  nvme-pci: set the errno on ctrl state change error
  nvme-pci: properly report state change failure in nvme_reset_work
  nvme: fix possible io failures when removing multipathed ns
  EDAC/sysfs: Fix memory leak when creating a csrow object
  ACPICA: Clear status of GPEs on first direct enable
  blk-iolatency: only account submitted bios
  x86/cacheinfo: Fix a -Wtype-limits warning
  ipoib: correcly show a VF hardware address
  vhost_net: disable zerocopy by default
  perf evsel: Make perf_evsel__name() accept a NULL argument
  x86/atomic: Fix smp_mb__{before,after}_atomic()
  perf/x86/intel/uncore: Handle invalid event coding for free-running counter
  sched/fair: Fix "runnable_avg_yN_inv" not used warnings
  sched/core: Add __sched tag for io_schedule()
  xfrm: fix sa selector validation
  blkcg, writeback: dead memcgs shouldn't contribute to writeback ownership arbitration
  block: null_blk: fix race condition for null_del_dev
  net: hns3: fix for skb leak when doing selftest
  qed: iWARP - Fix tc for MPA ll2 connection
  x86/cpufeatures: Add FDP_EXCPTN_ONLY and ZERO_FCS_FDS
  rcu: Force inlining of rcu_read_lock()
  ASoC: meson: axg-tdm: fix sample clock inversion
  x86/cpu: Add Ice Lake NNPI to Intel family
  selinux: fix empty write to keycreate file
  media: s5p-mfc: fix reading min scratch buffer size on MFC v6/v7
  bpf: silence warning messages in core
  regmap: fix bulk writes on paged registers
  gpio: omap: ensure irq is enabled before wakeup
  gpio: omap: fix lack of irqstatus_raw0 for OMAP4
  iommu: Fix a leak in iommu_insert_resv_region
  media: fdp1: Support M3N and E3 platforms
  media: uvcvideo: Fix access to uninitialized fields on probe error
  irqchip/meson-gpio: Add support for Meson-G12A SoC
  perf report: Fix OOM error in TUI mode on s390
  perf test 6: Fix missing kvm module load for s390
  perf cs-etm: Properly set the value of 'old' and 'head' in snapshot mode
  ipset: Fix memory accounting for hash types on resize
  net: sfp: add mutex to prevent concurrent state checks
  RAS/CEC: Fix pfn insertion
  s390/qdio: handle PENDING state for QEBSM devices
  net: axienet: Fix race condition causing TX hang
  net: fec: Do not use netdev messages too early
  crypto: inside-secure - do not rely on the hardware last bit for result descriptors
  net: stmmac: modify default value of tx-frames
  net: stmmac: dwmac4: fix flow control issue
  perf jvmti: Address gcc string overflow warning for strncpy()
  arm64: mm: make CONFIG_ZONE_DMA32 configurable
  cpupower : frequency-set -r option misses the last cpu in related cpu list
  net: hns3: set ops to null when unregister ad_dev
  media: wl128x: Fix some error handling in fm_v4l2_init_video_device()
  locking/lockdep: Fix merging of hlocks with non-zero references
  batman-adv: Fix duplicated OGMs on NETDEV_UP
  tua6100: Avoid build warnings.
  crypto: talitos - Align SEC1 accesses to 32 bits boundaries.
  crypto: talitos - properly handle split ICV.
  net: phy: Check against net_device being NULL
  media: staging: media: davinci_vpfe: - Fix for memory leak if decoder initialization fails.
  media: saa7164: fix remove_proc_entry warning
  media: mc-device.c: don't memset __user pointer contents
  perf annotate TUI browser: Do not use member from variable within its own initialization
  fscrypt: clean up some BUG_ON()s in block encryption/decryption
  xfrm: Fix xfrm sel prefix length validation
  af_key: fix leaks in key_pol_get_resp and dump_sp.
  signal/pid_namespace: Fix reboot_pid_ns to use send_sig not force_sig
  qed: Set the doorbell address correctly
  net: stmmac: dwmac4/5: Clear unused address entries
  net: stmmac: dwmac1000: Clear unused address entries
  media: media_device_enum_links32: clean a reserved field
  media: vpss: fix a potential NULL pointer dereference
  media: marvell-ccic: fix DMA s/g desc number calculation
  media: ov7740: avoid invalid framesize setting
  crypto: talitos - fix skcipher failure due to wrong output IV
  media: spi: IR LED: add missing of table registration
  media: dvb: usb: fix use after free in dvb_usb_device_exit
  batman-adv: fix for leaked TVLV handler.
  regmap: debugfs: Fix memory leak in regmap_debugfs_init
  ath: DFS JP domain W56 fixed pulse type 3 RADAR detection
  wil6210: fix spurious interrupts in 3-msi
  ath10k: add peer id check in ath10k_peer_find_by_id
  ath6kl: add some bounds checking
  ath9k: Check for errors when reading SREV register
  ath10k: Do not send probe response template for mesh
  wil6210: fix potential out-of-bounds read
  dmaengine: imx-sdma: fix use-after-free on probe error path
  scsi: iscsi: set auth_protocol back to NULL if CHAP_A value is not supported
  arm64/efi: Mark __efistub_stext_offset as an absolute symbol explicitly
  MIPS: fix build on non-linux hosts
  MIPS: ath79: fix ar933x uart parity mode
  ANDROID: arm64: fix function types in COND_SYSCALL
  ANDROID: x86: fix function types in COND_SYSCALL
  ANDROID: kernel/Makefile: do not disable LTO for sys_ni.c with CFI
  UPSTREAM: binder: Set end of SG buffer area properly.

Conflicts:
	arch/arm64/Kconfig
	arch/x86/include/asm/syscall_wrapper.h
	drivers/mmc/host/sdhci-msm.c

Change-Id: If28d1c397b31023c16a571e0fe33682fe65759db
Signed-off-by: default avatarIvaylo Georgiev <irgeorgiev@codeaurora.org>
parents 77606b13 89c68c63
Loading
Loading
Loading
Loading
+3 −0
Original line number Original line Diff line number Diff line
@@ -177,6 +177,9 @@ These helper barriers exist because architectures have varying implicit
ordering on their SMP atomic primitives. For example our TSO architectures
ordering on their SMP atomic primitives. For example our TSO architectures
provide full ordered atomics and these barriers are no-ops.
provide full ordered atomics and these barriers are no-ops.


NOTE: when the atomic RmW ops are fully ordered, they should also imply a
compiler barrier.

Thus:
Thus:


  atomic_fetch_add();
  atomic_fetch_add();
+2 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,8 @@ void calc_runnable_avg_yN_inv(void)
	int i;
	int i;
	unsigned int x;
	unsigned int x;


	printf("static const u32 runnable_avg_yN_inv[] = {");
	/* To silence -Wunused-but-set-variable warnings. */
	printf("static const u32 runnable_avg_yN_inv[] __maybe_unused = {");
	for (i = 0; i < HALFLIFE; i++) {
	for (i = 0; i < HALFLIFE; i++) {
		x = ((1UL<<32)-1)*pow(y, i);
		x = ((1UL<<32)-1)*pow(y, i);


+1 −1
Original line number Original line Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0
# SPDX-License-Identifier: GPL-2.0
VERSION = 4
VERSION = 4
PATCHLEVEL = 19
PATCHLEVEL = 19
SUBLEVEL = 60
SUBLEVEL = 61
EXTRAVERSION =
EXTRAVERSION =
NAME = "People's Front"
NAME = "People's Front"


+1 −3
Original line number Original line Diff line number Diff line
@@ -253,10 +253,8 @@ config GENERIC_CALIBRATE_DELAY
	def_bool y
	def_bool y


config ZONE_DMA32
config ZONE_DMA32
	bool "Enable or Disable Zone DMA"
	bool "Support DMA32 zone" if EXPERT
	default y
	default y
	help
	  This option is used to enable or disable the DMA zone.


config HAVE_GENERIC_GUP
config HAVE_GENERIC_GUP
	def_bool y
	def_bool y
+2 −1
Original line number Original line Diff line number Diff line
@@ -330,7 +330,8 @@
			regulator-max-microvolt = <1320000>;
			regulator-max-microvolt = <1320000>;
			enable-gpios = <&pmic 6 GPIO_ACTIVE_HIGH>;
			enable-gpios = <&pmic 6 GPIO_ACTIVE_HIGH>;
			regulator-ramp-delay = <80>;
			regulator-ramp-delay = <80>;
			regulator-enable-ramp-delay = <1000>;
			regulator-enable-ramp-delay = <2000>;
			regulator-settling-time-us = <160>;
		};
		};
	};
	};
};
};
Loading