Commit a600ffe6 authored Oct 23, 2018 by Jiri Kosina

Merge branch 'for-4.20/google' into for-linus

Whisker device specific fixes to hid-google driver

parents d19031d3 23e542e5

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

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5000,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/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";

Documentation/devicetree/bindings/net/macb.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -10,6 +10,7 @@ Required properties:
	Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on		Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on
	the Cadence GEM, or the generic form: "cdns,gem".		the Cadence GEM, or the generic form: "cdns,gem".
	Use "atmel,sama5d2-gem" for the GEM IP (10/100) available on Atmel sama5d2 SoCs.		Use "atmel,sama5d2-gem" for the GEM IP (10/100) available on Atmel sama5d2 SoCs.
			Use "atmel,sama5d3-macb" for the 10/100Mbit IP available on Atmel sama5d3 SoCs.
	Use "atmel,sama5d3-gem" for the Gigabit IP available on Atmel sama5d3 SoCs.		Use "atmel,sama5d3-gem" for the Gigabit IP available on Atmel sama5d3 SoCs.
	Use "atmel,sama5d4-gem" for the GEM IP (10/100) available on Atmel sama5d4 SoCs.		Use "atmel,sama5d4-gem" for the GEM IP (10/100) available on Atmel sama5d4 SoCs.
	Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC.		Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC.