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

Commit f95b23a1 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/urgent' into x86/asm, to pick up dependent fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents da20ab35 58c3862b

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ Jacob Shin <Jacob.Shin@amd.com> 
James Bottomley <jejb@mulgrave.(none)>

James Bottomley <jejb@titanic.il.steeleye.com>

James E Wilson <wilson@specifix.com>

James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>

James Hogan <jhogan@kernel.org> <james@albanarts.com>

James Ketrenos <jketreno@io.(none)>

Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>

<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>

Documentation/ABI/testing/sysfs-kernel-mm-swap

+0 −10
Original line number Diff line number Diff line
@@ -14,13 +14,3 @@ Description: Enable/disable VMA based swap readahead. 
		still used for tmpfs etc. other users.  If set to

		false, the global swap readahead algorithm will be

		used for all swappable pages.
 


What:		/sys/kernel/mm/swap/vma_ra_max_order

Date:		August 2017

Contact:	Linux memory management mailing list <linux-mm@kvack.org>

Description:	The max readahead size in order for VMA based swap readahead



		VMA based swap readahead algorithm will readahead at

		most 1 << max_order pages for each readahead.  The

		real readahead size for each readahead will be scaled

		according to the estimation algorithm.

Documentation/ABI/testing/sysfs-power

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ Description: 


What;		/sys/power/pm_trace_dev_match

Date:		October 2010

Contact:	James Hogan <james@albanarts.com>

Contact:	James Hogan <jhogan@kernel.org>

Description:

		The /sys/power/pm_trace_dev_match file contains the name of the

		device associated with the last PM event point saved in the RTC

Documentation/device-mapper/dm-raid.txt

+1 −0
Original line number Diff line number Diff line
@@ -344,3 +344,4 @@ Version History 
	(wrong raid10_copies/raid10_format sequence)

1.11.1  Add raid4/5/6 journal write-back support via journal_mode option

1.12.1  fix for MD deadlock between mddev_suspend() and md_write_start() available

1.13.0  Fix dev_health status at end of "recover" (was 'a', now 'A')

Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt

+7 −5
Original line number Diff line number Diff line
@@ -16,11 +16,13 @@ Required Properties: 


- clocks:

  Array of clocks required for SDHC.

  Require at least input clock for Xenon IP core.

  Require at least input clock for Xenon IP core. For Armada AP806 and

  CP110, the AXI clock is also mandatory.



- clock-names:

  Array of names corresponding to clocks property.

  The input clock for Xenon IP core should be named as "core".

  The input clock for the AXI bus must be named as "axi".



- reg:

  * For "marvell,armada-3700-sdhci", two register areas.
@@ -106,8 +108,8 @@ Example: 
		compatible = "marvell,armada-ap806-sdhci";

		reg = <0xaa0000 0x1000>;

		interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>

		clocks = <&emmc_clk>;

		clock-names = "core";

		clocks = <&emmc_clk>,<&axi_clk>;

		clock-names = "core", "axi";

		bus-width = <4>;

		marvell,xenon-phy-slow-mode;

		marvell,xenon-tun-count = <11>;
@@ -126,8 +128,8 @@ Example: 
		interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>

		vqmmc-supply = <&sd_vqmmc_regulator>;

		vmmc-supply = <&sd_vmmc_regulator>;

		clocks = <&sdclk>;

		clock-names = "core";

		clocks = <&sdclk>, <&axi_clk>;

		clock-names = "core", "axi";

		bus-width = <4>;

		marvell,xenon-tun-count = <9>;

	};