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

Commit 1652a83f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19-rc4 into usb-next



We need the USB fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents d6142b91 7876320f
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -75,3 +75,12 @@ Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Description:
		Amount (in KiB) of low (or normal) memory in the
		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.
+12 −0
Original line number Diff line number Diff line
@@ -3523,6 +3523,12 @@
	ramdisk_size=	[RAM] Sizes of RAM disks in kilobytes
			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

		cec_disable	[X86]
@@ -4994,6 +5000,12 @@
			Disables the PV optimizations forcing the HVM guest to
			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]
			Format:
			<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]
+4 −0
Original line number 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
	state races.
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.
+1 −2
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@
Required properties:
- compatible :
  - "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
- interrupts : lpi2c interrupt
- clocks : lpi2c clock specifier
@@ -11,7 +10,7 @@ Required properties:
Examples:

lpi2c7: lpi2c7@40a50000 {
	compatible = "fsl,imx8dv-lpi2c";
	compatible = "fsl,imx7ulp-lpi2c";
	reg = <0x40A50000 0x10000>;
	interrupt-parent = <&intc>;
	interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ Required properties:
- slaves		: Specifies number for slaves
- active_slave		: Specifies the slave to use for time stamping,
			  ethtool and SIOCGMIIPHY
- cpsw-phy-sel		: Specifies the phandle to the CPSW phy mode selection
			  device. See also cpsw-phy-sel.txt for it's binding.
			  Note that in legacy cases cpsw-phy-sel may be
			  a child device instead of a phandle.

Optional properties:
- ti,hwmods		: Must be "cpgmac0"
@@ -75,6 +79,7 @@ Examples:
		cpts_clock_mult = <0x80000000>;
		cpts_clock_shift = <29>;
		syscon = <&cm>;
		cpsw-phy-sel = <&phy_sel>;
		cpsw_emac0: slave@0 {
			phy_id = <&davinci_mdio>, <0>;
			phy-mode = "rgmii-txid";
@@ -103,6 +108,7 @@ Examples:
		cpts_clock_mult = <0x80000000>;
		cpts_clock_shift = <29>;
		syscon = <&cm>;
		cpsw-phy-sel = <&phy_sel>;
		cpsw_emac0: slave@0 {
			phy_id = <&davinci_mdio>, <0>;
			phy-mode = "rgmii-txid";
Loading