Commit c0aac682 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'v4.19-rc6' into for-4.20/block 



Merge -rc6 in, for two reasons:

1) Resolve a trivial conflict in the blk-mq-tag.c documentation
2) A few important regression fixes went into upstream directly, so
   they aren't in the 4.20 branch.

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>

* tag 'v4.19-rc6': (780 commits)
  Linux 4.19-rc6
  MAINTAINERS: fix reference to moved drivers/{misc => auxdisplay}/panel.c
  cpufreq: qcom-kryo: Fix section annotations
  perf/core: Add sanity check to deal with pinned event failure
  xen/blkfront: correct purging of persistent grants
  Revert "xen/blkfront: When purging persistent grants, keep them in the buffer"
  selftests/powerpc: Fix Makefiles for headers_install change
  blk-mq: I/O and timer unplugs are inverted in blktrace
  dax: Fix deadlock in dax_lock_mapping_entry()
  x86/boot: Fix kexec booting failure in the SEV bit detection code
  bcache: add separate workqueue for journal_write to avoid deadlock
  drm/amd/display: Fix Edid emulation for linux
  drm/amd/display: Fix Vega10 lightup on S3 resume
  drm/amdgpu: Fix vce work queue was not cancelled when suspend
  Revert "drm/panel: Add device_link from panel device to DRM device"
  xen/blkfront: When purging persistent grants, keep them in the buffer
  clocksource/drivers/timer-atmel-pit: Properly handle error cases
  block: fix deadline elevator drain for zoned block devices
  ACPI / hotplug / PCI: Don't scan for non-hotplug bridges if slot is not bridge
  drm/syncobj: Don't leak fences when WAIT_FOR_SUBMIT is set
  ...

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parents 451bb7c3 17b57b18

Documentation/ABI/stable/sysfs-devices-system-xen_memory

+9 −0
Original line number Original line Diff line number Diff line
@@ -75,3 +75,12 @@ Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> 
Description:

Description:

		Amount (in KiB) of low (or normal) memory in the

		Amount (in KiB) of low (or normal) memory in the

		balloon.

		balloon.



What:		/sys/devices/system/xen_memory/xen_memory0/scrub_pages

Date:		September 2018

KernelVersion:	4.20

Contact:	xen-devel@lists.xenproject.org

Description:

		Control scrubbing pages before returning them to Xen for others domains

		use. Can be set with xen_scrub_pages cmdline

		parameter. Default value controlled with CONFIG_XEN_SCRUB_PAGES_DEFAULT.

Documentation/admin-guide/kernel-parameters.txt

+12 −0
Original line number Original line Diff line number Diff line
@@ -3523,6 +3523,12 @@ 
	ramdisk_size=	[RAM] Sizes of RAM disks in kilobytes

	ramdisk_size=	[RAM] Sizes of RAM disks in kilobytes

			See Documentation/blockdev/ramdisk.txt.

			See Documentation/blockdev/ramdisk.txt.





	random.trust_cpu={on,off}

			[KNL] Enable or disable trusting the use of the

			CPU's random number generator (if available) to

			fully seed the kernel's CRNG. Default is controlled

			by CONFIG_RANDOM_TRUST_CPU.



	ras=option[,option,...]	[KNL] RAS-specific options

	ras=option[,option,...]	[KNL] RAS-specific options





		cec_disable	[X86]

		cec_disable	[X86]
@@ -4994,6 +5000,12 @@ 
			Disables the PV optimizations forcing the HVM guest to

			Disables the PV optimizations forcing the HVM guest to

			run as generic HVM guest with no PV drivers.

			run as generic HVM guest with no PV drivers.





	xen_scrub_pages=	[XEN]

			Boolean option to control scrubbing pages before giving them back

			to Xen, for use by other domains. Can be also changed at runtime

			with /sys/devices/system/xen_memory/xen_memory0/scrub_pages.

			Default value controlled with CONFIG_XEN_SCRUB_PAGES_DEFAULT.



	xirc2ps_cs=	[NET,PCMCIA]

	xirc2ps_cs=	[NET,PCMCIA]

			Format:

			Format:

			<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]

			<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]

Documentation/device-mapper/dm-raid.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -348,3 +348,7 @@ Version History 
1.13.1  Fix deadlock caused by early md_stop_writes().  Also fix size an

1.13.1  Fix deadlock caused by early md_stop_writes().  Also fix size an

	state races.

	state races.

1.13.2  Fix raid redundancy validation and avoid keeping raid set frozen

1.13.2  Fix raid redundancy validation and avoid keeping raid set frozen

1.14.0  Fix reshape race on small devices.  Fix stripe adding reshape

	deadlock/potential data corruption.  Update superblock when

	specific devices are requested via rebuild.  Fix RAID leg

	rebuild errors.

Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.txt

+1 −2
Original line number Original line Diff line number Diff line
@@ -3,7 +3,6 @@ 
Required properties:

Required properties:

- compatible :

- compatible :

  - "fsl,imx7ulp-lpi2c" for LPI2C compatible with the one integrated on i.MX7ULP soc

  - "fsl,imx7ulp-lpi2c" for LPI2C compatible with the one integrated on i.MX7ULP soc

  - "fsl,imx8dv-lpi2c" for LPI2C compatible with the one integrated on i.MX8DV soc

- reg : address and length of the lpi2c master registers

- reg : address and length of the lpi2c master registers

- interrupts : lpi2c interrupt

- interrupts : lpi2c interrupt

- clocks : lpi2c clock specifier

- clocks : lpi2c clock specifier
@@ -11,7 +10,7 @@ Required properties: 
Examples:

Examples:





lpi2c7: lpi2c7@40a50000 {

lpi2c7: lpi2c7@40a50000 {

	compatible = "fsl,imx8dv-lpi2c";

	compatible = "fsl,imx7ulp-lpi2c";

	reg = <0x40A50000 0x10000>;

	reg = <0x40A50000 0x10000>;

	interrupt-parent = <&intc>;

	interrupt-parent = <&intc>;

	interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

	interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

Documentation/devicetree/bindings/input/gpio-keys.txt

+1 −1
Original line number Original line Diff line number Diff line 
Device-Tree bindings for input/gpio_keys.c keyboard driver

Device-Tree bindings for input/keyboard/gpio_keys.c keyboard driver





Required properties:

Required properties:

	- compatible = "gpio-keys";

	- compatible = "gpio-keys";