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

Commit 2d5f817a authored by Isaac J. Manjarres's avatar Isaac J. Manjarres
Browse files

Merge remote-tracking branch 'remotes/origin/tmp-e9a2c5dd' into msm-4.14



* remotes/origin/tmp-e9a2c5dd:
  Linux 4.14.36
  writeback: safer lock nesting
  media: staging: lirc_zilog: incorrect reference counting
  Revert "media: lirc_zilog: driver only sends LIRCCODE"
  iwlwifi: add a bunch of new 9000 PCI IDs
  iwlwifi: add shared clock PHY config flag for some devices
  net: dsa: Discard frames from unused ports
  mm/filemap.c: fix NULL pointer in page_cache_tree_insert()
  autofs: mount point create should honour passed in mode
  Don't leak MNT_INTERNAL away from internal mounts
  rpc_pipefs: fix double-dput()
  orangefs_kill_sb(): deal with allocation failures
  hypfs_kill_super(): deal with failed allocations
  jffs2_kill_sb(): deal with failed allocations
  drm/i915: Correctly handle limited range YCbCr data on VLV/CHV
  mmc: sdhci-pci: Only do AMD tuning for HS200
  fanotify: fix logic of events on child
  udf: Fix leak of UTF-16 surrogates into encoded strings
  powerpc/lib: Fix off-by-one in alternate feature patching
  powerpc/xive: Fix trying to "push" an already active pool VP
  powerpc/eeh: Fix enabling bridge MMIO windows
  MIPS: memset.S: Fix clobber of v1 in last_fixup
  MIPS: memset.S: Fix return of __clear_user from Lpartial_fixup
  MIPS: memset.S: EVA & fault support for small_memset
  MIPS: uaccess: Add micromips clobbers to bzero invocation
  HID: wacom: bluetooth: send exit report for recent Bluetooth devices
  HID: hidraw: Fix crash on HIDIOCGFEATURE with a destroyed device
  HID: input: fix battery level reporting on BT mice
  random: add new ioctl RNDRESEEDCRNG
  random: crng_reseed() should lock the crng instance that it is modifying
  random: use a different mixing algorithm for add_device_randomness()
  random: fix crng_ready() test
  ALSA: hda/realtek - adjust the location of one mic
  ALSA: hda/realtek - set PINCFG_HEADSET_MIC to parse_flags
  ALSA: hda - New VIA controller suppor no-snoop path
  ALSA: rawmidi: Fix missing input substream checks in compat ioctls
  ALSA: line6: Use correct endpoint type for midi output
  drm/radeon: Fix PCIe lane width calculation
  drm/radeon: add PX quirk for Asus K73TK
  drm/rockchip: Clear all interrupts before requesting the IRQ
  drm/amdgpu/si: implement get/set pcie_lanes asic callback
  drm/amdgpu: Fix PCIe lane width calculation
  drm/amdgpu/sdma: fix mask in emit_pipeline_sync
  drm/amdgpu: Fix always_valid bos multiple LRU insertions.
  drm/amdgpu: Add an ATPX quirk for hybrid laptop
  ALSA: pcm: Fix endless loop for XRUN recovery in OSS emulation
  ALSA: pcm: Fix mutex unbalance in OSS emulation ioctls
  ALSA: pcm: Return -EBUSY for OSS ioctls changing busy streams
  ALSA: pcm: Avoid potential races between OSS ioctls and read/write
  ALSA: pcm: Use ERESTARTSYS instead of EINTR in OSS emulation
  vfio/pci: Virtualize Maximum Read Request Size
  watchdog: f71808e_wdt: Fix WD_EN register read
  dt-bindings: clock: mediatek: add binding for fixed-factor clock axisel_d4
  thermal: imx: Fix race condition in imx_thermal_probe()
  pwm: rcar: Fix a condition to prevent mismatch value setting to duty
  clk: bcm2835: De-assert/assert PLL reset signal when appropriate
  clk: mediatek: fix PWM clock source by adding a fixed-factor clock
  clk: fix false-positive Wmaybe-uninitialized warning
  clk: mvebu: armada-38x: add support for missing clocks
  PCI: Mark Broadcom HT1100 and HT2000 Root Port Extended Tags as broken
  mmc: tmio: Fix error handling when issuing CMD23
  mmc: jz4740: Fix race condition in IRQ mask update
  iommu/vt-d: Fix a potential memory leak
  um: Use POSIX ucontext_t instead of struct ucontext
  um: Compile with modern headers
  ring-buffer: Check if memory is available before allocation
  nfit: skip region registration for incomplete control regions
  nfit, address-range-scrub: fix scrub in-progress reporting
  libnvdimm, namespace: use a safe lookup for dimm device name
  libnvdimm, dimm: fix dpa reservation vs uninitialized label area
  tpm: self test failure should not cause suspend to fail
  cxl: Fix possible deadlock when processing page faults from cxllib
  dmaengine: at_xdmac: fix rare residue corruption
  IB/srp: Fix completion vector assignment algorithm
  IB/srp: Fix srp_abort()
  ALSA: pcm: Fix UAF at PCM release via PCM timer access
  RDMA/rxe: Fix an out-of-bounds read
  RDMA/mlx5: Protect from NULL pointer derefence
  RDMA/ucma: Don't allow setting RDMA_OPTION_IB_PATH without an RDMA device
  dm crypt: limit the number of allocated pages
  ext4: add extra checks to ext4_xattr_block_get()
  ext4: add bounds checking to ext4_xattr_find_entry()
  ext4: move call to ext4_error() into ext4_xattr_check_block()
  ext4: don't allow r/w mounts if metadata blocks overlap the superblock
  ext4: always initialize the crc32c checksum driver
  ext4: fail ext4_iget for root directory if unallocated
  ext4: limit xattr size to INT_MAX
  ext4: protect i_disksize update by i_data_sem in direct write path
  ext4: don't update checksum of new initialized bitmaps
  ext4: pass -ESHUTDOWN code to jbd2 layer
  ext4: eliminate sleep from shutdown ioctl
  ext4: shutdown should not prevent get_write_access
  jbd2: if the journal is aborted then don't allow update of the log tail
  block: use 32-bit blk_status_t on Alpha
  extcon: intel-cht-wc: Set direction and drv flags for V5 boost GPIO
  random: use a tighter cap in credit_entropy_bits_safe()
  irqchip/gic: Take lock when updating irq type
  thunderbolt: Prevent crash when ICM firmware is not running
  thunderbolt: Resume control channel after hibernation image is created
  thunderbolt: Serialize PCIe tunnel creation with PCI rescan
  thunderbolt: Wait a bit longer for ICM to authenticate the active NVM
  ASoC: topology: Fix kcontrol name string handling
  ASoC: ssm2602: Replace reg_default_raw with reg_default
  soc: mediatek: fix the mistaken pointer accessed when subdomains are added
  HID: core: Fix size as type u32
  HID: Fix hid_report_len usage
  powerpc/powernv: Fix OPAL NVRAM driver OPAL_BUSY loops
  powerpc/powernv: define a standard delay for OPAL_BUSY type retry loops
  powerpc/kexec_file: Fix error code when trying to load kdump kernel
  powerpc/kprobes: Fix call trace due to incorrect preempt count
  powerpc/64: Fix smp_wmb barrier definition use use lwsync consistently
  powerpc/64: Call H_REGISTER_PROC_TBL when running as a HPT guest on POWER9
  powerpc/64s: Fix dt_cpu_ftrs to have restore_cpu clear unwanted LPCR bits
  powerpc/powernv: Handle unknown OPAL errors in opal_nvram_write()
  CIFS: fix sha512 check in cifs_crypto_secmech_release
  CIFS: add sha512 secmech
  CIFS: refactor crypto shash/sdesc allocation&free
  i2c: i801: Restore configuration at shutdown
  i2c: i801: Save register SMBSLVCMD value only once
  HID: i2c-hid: fix size check and type usage
  smb3: Fix root directory when server returns inode number of zero
  fix smb3-encryption breakage when CONFIG_DEBUG_SG=y
  cifs: fix memory leak in SMB2_open()
  usb: dwc3: gadget: never call ->complete() from ->ep_queue()
  usb: dwc3: pci: Properly cleanup resource
  usb: dwc3: prevent setting PRTCAP to OTG from debugfs
  USB:fix USB3 devices behind USB3 hubs not resuming at hibernate thaw
  USB: gadget: f_midi: fixing a possible double-free in f_midi
  ACPI / hotplug / PCI: Check presence of slot itself in get_slot_status()
  ACPI / video: Add quirk to force acpi-video backlight on Samsung 670Z5E
  regmap: Fix reversed bounds check in regmap_raw_write()
  xen-netfront: Fix hang on device removal
  x86/xen: Delay get_cpu_cap until stack canary is established
  media: vsp1: Fix BRx conditional path in WPF
  media: vivid: check if the cec_adapter is valid
  media: atomisp_fops.c: disable atomisp_compat_ioctl32
  spi: Fix unregistration of controller with fixed SPI bus number
  spi: Fix scatterlist elements size in spi_map_buf
  spi: atmel: init FIFOs before spi enable
  ARM: dts: at91: sama5d4: fix pinctrl compatible string
  ARM: dts: exynos: Fix IOMMU support for GScaler devices on Exynos5250
  ARM: dts: at91: at91sam9g25: fix mux-mask pinctrl property
  arm: dts: mt7623: fix USB initialization fails on bananapi-r2
  ARM: EXYNOS: Fix coupled CPU idle freeze on Exynos4210
  ARM: dts: da850-lego-ev3: Fix battery voltage gpio
  KVM: arm/arm64: vgic-its: Fix potential overrun in vgic_copy_lpi_list
  ARM64: dts: meson: reduce odroid-c2 eMMC maximum rate
  usb: gadget: udc: core: update usb_ep_queue() documentation
  phy: allwinner: sun4i-usb: poll vbus changes on A23/A33 when driving VBUS
  usb: musb: gadget: misplaced out of bounds check
  mm, slab: reschedule cache_reap() on the same CPU
  ipc/shm: fix use-after-free of shm file via remap_file_pages()
  resource: fix integer overflow at reallocation
  fs/reiserfs/journal.c: add missing resierfs_warning() arg
  task_struct: only use anon struct under randstruct plugin
  mm/hmm: hmm_pfns_bad() was accessing wrong struct
  mm/hmm: fix header file if/else/endif maze
  mm/ksm.c: fix inconsistent accounting of zero pages
  ubi: Reject MLC NAND
  ubi: Fix error for write access
  ubi: fastmap: Don't flush fastmap work on detach
  ubifs: Check ubifs_wbuf_sync() return code
  cpufreq: CPPC: Use transition_delay_us depending transition_latency
  tty: make n_tty_read() always abort if hangup is in progress
  f2fs: check cap_resource only for data blocks
  Revert "f2fs: introduce f2fs_set_page_dirty_nobuffer"
  f2fs: clear PageError on writepage
  BACKPORT: dm verity: add 'check_at_most_once' option to only validate hashes once
  f2fs: call unlock_new_inode() before d_instantiate()
  f2fs: refactor read path to allow multiple postprocessing steps
  fscrypt: allow synchronous bio decryption
  FROMLIST: arm64: kvm: use -fno-jump-tables with clang

Conflicts:
	drivers/usb/dwc3/core.c
	drivers/usb/dwc3/gadget.c

Change-Id: I1fa31836c6eac9b700c8c7899d741fddc26b24f8
Signed-off-by: default avatarIsaac J. Manjarres <isaacm@codeaurora.org>
parents 1f6b5c0e e9a2c5dd
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
@@ -109,6 +109,17 @@ fec_start <offset>
    This is the offset, in <data_block_size> blocks, from the start of the
    FEC device to the beginning of the encoding data.

check_at_most_once
    Verify data blocks only the first time they are read from the data device,
    rather than every time.  This reduces the overhead of dm-verity so that it
    can be used on systems that are memory and/or CPU constrained.  However, it
    provides a reduced level of security because only offline tampering of the
    data device's content will be detected, not online tampering.

    Hash blocks are still verified each time they are read from the hash device,
    since verification of hash blocks is less performance critical than data
    blocks, and a hash block will not be verified any more after all the data
    blocks it covers have been verified anyway.

Theory of operation
===================
+1 −1
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0
VERSION = 4
PATCHLEVEL = 14
SUBLEVEL = 35
SUBLEVEL = 36
EXTRAVERSION =
NAME = Petit Gorille

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@
				atmel,mux-mask = <
				      /*    A         B          C     */
				       0xffffffff 0xffe0399f 0xc000001c  /* pioA */
				       0x0007ffff 0x8000fe3f 0x00000000  /* pioB */
				       0x0007ffff 0x00047e3f 0x00000000  /* pioB */
				       0x80000000 0x07c0ffff 0xb83fffff  /* pioC */
				       0x003fffff 0x003f8000 0x00000000  /* pioD */
				      >;
+2 −2
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@
	 */
	battery {
		pinctrl-names = "default";
		pintctrl-0 = <&battery_pins>;
		pinctrl-0 = <&battery_pins>;
		compatible = "lego,ev3-battery";
		io-channels = <&adc 4>, <&adc 3>;
		io-channel-names = "voltage", "current";
@@ -392,7 +392,7 @@
	batt_volt_en {
		gpio-hog;
		gpios = <6 GPIO_ACTIVE_HIGH>;
		output-low;
		output-high;
	};
};

+4 −4
Original line number Diff line number Diff line
@@ -643,7 +643,7 @@
			power-domains = <&pd_gsc>;
			clocks = <&clock CLK_GSCL0>;
			clock-names = "gscl";
			iommu = <&sysmmu_gsc0>;
			iommus = <&sysmmu_gsc0>;
		};

		gsc_1:  gsc@13e10000 {
@@ -653,7 +653,7 @@
			power-domains = <&pd_gsc>;
			clocks = <&clock CLK_GSCL1>;
			clock-names = "gscl";
			iommu = <&sysmmu_gsc1>;
			iommus = <&sysmmu_gsc1>;
		};

		gsc_2:  gsc@13e20000 {
@@ -663,7 +663,7 @@
			power-domains = <&pd_gsc>;
			clocks = <&clock CLK_GSCL2>;
			clock-names = "gscl";
			iommu = <&sysmmu_gsc2>;
			iommus = <&sysmmu_gsc2>;
		};

		gsc_3:  gsc@13e30000 {
@@ -673,7 +673,7 @@
			power-domains = <&pd_gsc>;
			clocks = <&clock CLK_GSCL3>;
			clock-names = "gscl";
			iommu = <&sysmmu_gsc3>;
			iommus = <&sysmmu_gsc3>;
		};

		hdmi: hdmi@14530000 {
Loading