Commit 7b76d058 authored by Sean Paul's avatar Sean Paul
Browse files

Merge drm/drm-next into drm-misc-next 



Backmerging 4.19-rc5 to pick up sun4i fix

Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
parents a74c0aa5 bf78296a

Documentation/ABI/stable/sysfs-bus-xen-backend

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

Description:

                Number of sectors written by the frontend.



What:		/sys/bus/xen-backend/devices/*/state

Date:		August 2018

KernelVersion:	4.19

Contact:	Joe Jin <joe.jin@oracle.com>

Description:

                The state of the device. One of: 'Unknown',

                'Initialising', 'Initialised', 'Connected', 'Closing',

                'Closed', 'Reconfiguring', 'Reconfigured'.

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

+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.

Documentation/ABI/testing/sysfs-driver-xen-blkback

+10 −0
Original line number Diff line number Diff line
@@ -15,3 +15,13 @@ Description: 
                blkback. If the frontend tries to use more than

                max_persistent_grants, the LRU kicks in and starts

                removing 5% of max_persistent_grants every 100ms.



What:           /sys/module/xen_blkback/parameters/persistent_grant_unused_seconds

Date:           August 2018

KernelVersion:  4.19

Contact:        Roger Pau Monné <roger.pau@citrix.com>

Description:

                How long a persistent grant is allowed to remain

                allocated without being in use. The time is in

                seconds, 0 means indefinitely long.

                The default is 60 seconds.

Documentation/admin-guide/kernel-parameters.txt

+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>]]]

Documentation/arm64/sve.txt

+2 −2
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ prctl(PR_SVE_SET_VL, unsigned long arg) 
      thread.



    * Changing the vector length causes all of P0..P15, FFR and all bits of

      Z0..V31 except for Z0 bits [127:0] .. Z31 bits [127:0] to become

      Z0..Z31 except for Z0 bits [127:0] .. Z31 bits [127:0] to become

      unspecified.  Calling PR_SVE_SET_VL with vl equal to the thread's current

      vector length, or calling PR_SVE_SET_VL with the PR_SVE_SET_VL_ONEXEC

      flag, does not constitute a change to the vector length for this purpose.
@@ -500,7 +500,7 @@ References 
[2] arch/arm64/include/uapi/asm/ptrace.h

    AArch64 Linux ptrace ABI definitions



[3] linux/Documentation/arm64/cpu-feature-registers.txt

[3] Documentation/arm64/cpu-feature-registers.txt



[4] ARM IHI0055C

    http://infocenter.arm.com/help/topic/com.arm.doc.ihi0055c/IHI0055C_beta_aapcs64.pdf