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

Commit 281d1bbd authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge remote-tracking branch 'origin/master' into drm-next 

Backmerge Linus tree after rc5 + drm-fixes went in.

There were a few amdkfd conflicts I wanted to avoid,
and Ben requested this for nouveau also.

Conflicts:
	drivers/gpu/drm/amd/amdkfd/Makefile
	drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
	drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
	drivers/gpu/drm/amd/amdkfd/kfd_priv.h
	drivers/gpu/drm/amd/include/kgd_kfd_interface.h
	drivers/gpu/drm/i915/intel_runtime_pm.c
	drivers/gpu/drm/radeon/radeon_kfd.c
parents bfa55bd4 b942c653

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ Greg Kroah-Hartman <gregkh@suse.de> 
Greg Kroah-Hartman <greg@kroah.com>

Henk Vergonet <Henk.Vergonet@gmail.com>

Henrik Kretzschmar <henne@nachtwindheim.de>

Henrik Rydberg <rydberg@bitmath.org>

Herbert Xu <herbert@gondor.apana.org.au>

Jacob Shin <Jacob.Shin@amd.com>

James Bottomley <jejb@mulgrave.(none)>

Documentation/ABI/testing/sysfs-class-mei

+15 −0
Original line number Diff line number Diff line
@@ -14,3 +14,18 @@ Description: 
		The /sys/class/mei/meiN directory is created for

		each probed mei device



What:		/sys/class/mei/meiN/fw_status

Date:		Nov 2014

KernelVersion:	3.19

Contact:	Tomas Winkler <tomas.winkler@intel.com>

Description:	Display fw status registers content



		The ME FW writes its status information into fw status

		registers for BIOS and OS to monitor fw health.



		The register contains running state, power management

		state, error codes, and others. The way the registers

		are decoded depends on PCH or SoC generation.

		Also number of registers varies between 1 and 6

		depending on generation.

Documentation/devicetree/bindings/net/davinci_emac.txt

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ This file provides information, what the device node 
for the davinci_emac interface contains.



Required properties:

- compatible: "ti,davinci-dm6467-emac" or "ti,am3517-emac"

- compatible: "ti,davinci-dm6467-emac", "ti,am3517-emac" or

  "ti,dm816-emac"

- reg: Offset and length of the register set for the device

- ti,davinci-ctrl-reg-offset: offset to control register

- ti,davinci-ctrl-mod-reg-offset: offset to control module register

Documentation/kernel-parameters.txt

+1 −0
Original line number Diff line number Diff line
@@ -1277,6 +1277,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
	i8042.notimeout	[HW] Ignore timeout condition signalled by controller

	i8042.reset	[HW] Reset the controller during init and cleanup

	i8042.unlock	[HW] Unlock (ignore) the keylock

	i8042.kbdreset  [HW] Reset device connected to KBD port



	i810=		[HW,DRM]

Documentation/networking/ip-sysctl.txt

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ fwmark_reflect - BOOLEAN 
route/max_size - INTEGER

	Maximum number of routes allowed in the kernel.  Increase

	this when using large numbers of interfaces and/or routes.

	From linux kernel 3.6 onwards, this is deprecated for ipv4

	as route cache is no longer used.



neigh/default/gc_thresh1 - INTEGER

	Minimum number of entries to keep.  Garbage collector will not