Commit 5a94296b authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-5.14/amd-sfh' into for-linus 

- support for Renoir and Cezanne SoCs
- support for Ambient Light Sensor
- support for Human Presence Detection sensor

all from Basavaraj Natikar
parents 3b770932 24a31ea9

.gitignore

+5 −3
Original line number Diff line number Diff line
@@ -48,14 +48,11 @@ 
*.xz

*.zst

Module.symvers

modules.builtin

modules.order



#

# Top-level generic files

#

/tags

/TAGS

/linux

/modules-only.symvers

/vmlinux
@@ -66,6 +63,7 @@ modules.order 
/vmlinuz

/System.map

/Module.markers

/modules.builtin

/modules.builtin.modinfo

/modules.nsdeps
@@ -114,6 +112,10 @@ patches-* 
patches

series



# ctags files

tags

TAGS



# cscope files

cscope.*

ncscope.*

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ Jeff Layton <jlayton@kernel.org> <jlayton@primarydata.com> 
Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>

Jens Axboe <axboe@suse.de>

Jens Osterkamp <Jens.Osterkamp@de.ibm.com>

Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>

Jiri Slaby <jirislaby@kernel.org> <jirislaby@gmail.com>

Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>

Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>

CREDITS

+5 −0
Original line number Diff line number Diff line
@@ -1874,6 +1874,11 @@ S: Krosenska' 543 
S: 181 00 Praha 8

S: Czech Republic



N: Murali Karicheri

E: m-karicheri2@ti.com

D: Keystone NetCP driver

D: Keystone PCIe host controller driver



N: Jan "Yenya" Kasprzak

E: kas@fi.muni.cz

D: Author of the COSA/SRP sync serial board driver.

Documentation/ABI/obsolete/sysfs-class-dax

+1 −1
Original line number Diff line number Diff line 
What:           /sys/class/dax/

Date:           May, 2016

KernelVersion:  v4.7

Contact:        linux-nvdimm@lists.01.org

Contact:        nvdimm@lists.linux.dev

Description:	Device DAX is the device-centric analogue of Filesystem

		DAX (CONFIG_FS_DAX).  It allows memory ranges to be

		allocated and mapped without need of an intervening file

Documentation/ABI/obsolete/sysfs-kernel-fadump_registered

+1 −1
Original line number Diff line number Diff line 
This ABI is renamed and moved to a new location /sys/kernel/fadump/registered.¬

This ABI is renamed and moved to a new location /sys/kernel/fadump/registered.



What:		/sys/kernel/fadump_registered

Date:		Feb 2012