Merge branch 'master' into for-linus (2e6713c7) · Commits · e / devices / android_kernel_oneplus_sm8150

CREDITS

+6 −0

Original line number	Diff line number	Diff line
		@@ -2006,6 +2006,9 @@ E: paul@laufernet.com
		D: Soundblaster driver fixes, ISAPnP quirk
		S: California, USA

		N: Jonathan Layes
		D: ARPD support

		N: Tom Lees
		E: tom@lpsg.demon.co.uk
		W: http://www.lpsg.demon.co.uk/
		@@ -3802,6 +3805,9 @@ S: van Bronckhorststraat 12
		S: 2612 XV Delft
		S: The Netherlands

		N: Thomas Woller
		D: CS461x Cirrus Logic sound driver

		N: David Woodhouse
		E: dwmw2@infradead.org
		D: JFFS2 file system, Memory Technology Device subsystem,

+2 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,8 @@ interface.
		Using sysfs
		~~~~~~~~~~~

		sysfs is always compiled in. You can access it by doing:
		sysfs is always compiled in if CONFIG_SYSFS is defined. You can access
		it by doing:

		mount -t sysfs sysfs /sys

+4 −3

Original line number	Diff line number	Diff line
		@@ -66,7 +66,8 @@ On all - write a character to /proc/sysrq-trigger. e.g.:
		'b' - Will immediately reboot the system without syncing or unmounting
		your disks.

		'c' - Will perform a kexec reboot in order to take a crashdump.
		'c' - Will perform a system crash by a NULL pointer dereference.
		A crashdump will be taken if configured.

		'd' - Shows all locks that are held.

		@@ -141,8 +142,8 @@ useful when you want to exit a program that will not let you switch consoles.
		re'B'oot is good when you're unable to shut down. But you should also 'S'ync
		and 'U'mount first.

		'C'rashdump can be used to manually trigger a crashdump when the system is hung.
		The kernel needs to have been built with CONFIG_KEXEC enabled.
		'C'rash can be used to manually trigger a crashdump when the system is hung.
		Note that this just triggers a crash if there is no dump mechanism available.

		'S'ync is great when your system is locked up, it allows you to sync your
		disks and will certainly lessen the chance of data loss and fscking. Note

+924 −1845

File changed.

Preview size limit exceeded, changes collapsed.

+1 −0

Original line number	Diff line number	Diff line
		@@ -103,6 +103,7 @@ EXPORT_SYMBOL(kmap);
		EXPORT_SYMBOL(kunmap);
		EXPORT_SYMBOL(kmap_atomic);
		EXPORT_SYMBOL(kunmap_atomic);
		EXPORT_SYMBOL(kmap_atomic_prot);

		void __init set_highmem_pages_init(void)
		{