Merge drm/drm-fixes into drm-misc-fixes (14731a64) · Commits · git / linux-net

.mailmap

+5 −4

Original line number	Diff line number	Diff line
		@@ -337,10 +337,11 @@ Kalyan Thota <quic_kalyant@quicinc.com> <kalyan_t@codeaurora.org>
		Karthikeyan Periyasamy <quic_periyasa@quicinc.com> <periyasa@codeaurora.org>
		Kathiravan T <quic_kathirav@quicinc.com> <kathirav@codeaurora.org>
		Kay Sievers <kay.sievers@vrfy.org>
		Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>
		Kees Cook <keescook@chromium.org> <keescook@google.com>
		Kees Cook <keescook@chromium.org> <kees@outflux.net>
		Kees Cook <keescook@chromium.org> <kees@ubuntu.com>
		Kees Cook <kees@kernel.org> <kees.cook@canonical.com>
		Kees Cook <kees@kernel.org> <keescook@chromium.org>
		Kees Cook <kees@kernel.org> <keescook@google.com>
		Kees Cook <kees@kernel.org> <kees@outflux.net>
		Kees Cook <kees@kernel.org> <kees@ubuntu.com>
		Keith Busch <kbusch@kernel.org> <keith.busch@intel.com>
		Keith Busch <kbusch@kernel.org> <keith.busch@linux.intel.com>
		Kenneth W Chen <kenneth.w.chen@intel.com>

Documentation/admin-guide/LSM/tomoyo.rst

+11 −24

Original line number	Diff line number	Diff line
		@@ -9,8 +9,8 @@ TOMOYO is a name-based MAC extension (LSM module) for the Linux kernel.

		LiveCD-based tutorials are available at

		http://tomoyo.sourceforge.jp/1.8/ubuntu12.04-live.html
		http://tomoyo.sourceforge.jp/1.8/centos6-live.html
		https://tomoyo.sourceforge.net/1.8/ubuntu12.04-live.html
		https://tomoyo.sourceforge.net/1.8/centos6-live.html

		Though these tutorials use non-LSM version of TOMOYO, they are useful for you
		to know what TOMOYO is.
		@@ -21,45 +21,32 @@ How to enable TOMOYO?
		Build the kernel with ``CONFIG_SECURITY_TOMOYO=y`` and pass ``security=tomoyo`` on
		kernel's command line.

		Please see http://tomoyo.osdn.jp/2.5/ for details.
		Please see https://tomoyo.sourceforge.net/2.6/ for details.

		Where is documentation?
		=======================

		User <-> Kernel interface documentation is available at
		https://tomoyo.osdn.jp/2.5/policy-specification/index.html .
		https://tomoyo.sourceforge.net/2.6/policy-specification/index.html .

		Materials we prepared for seminars and symposiums are available at
		https://osdn.jp/projects/tomoyo/docs/?category_id=532&language_id=1 .
		https://sourceforge.net/projects/tomoyo/files/docs/ .
		Below lists are chosen from three aspects.

		What is TOMOYO?
		TOMOYO Linux Overview
		https://osdn.jp/projects/tomoyo/docs/lca2009-takeda.pdf
		https://sourceforge.net/projects/tomoyo/files/docs/lca2009-takeda.pdf
		TOMOYO Linux: pragmatic and manageable security for Linux
		https://osdn.jp/projects/tomoyo/docs/freedomhectaipei-tomoyo.pdf
		https://sourceforge.net/projects/tomoyo/files/docs/freedomhectaipei-tomoyo.pdf
		TOMOYO Linux: A Practical Method to Understand and Protect Your Own Linux Box
		https://osdn.jp/projects/tomoyo/docs/PacSec2007-en-no-demo.pdf
		https://sourceforge.net/projects/tomoyo/files/docs/PacSec2007-en-no-demo.pdf

		What can TOMOYO do?
		Deep inside TOMOYO Linux
		https://osdn.jp/projects/tomoyo/docs/lca2009-kumaneko.pdf
		https://sourceforge.net/projects/tomoyo/files/docs/lca2009-kumaneko.pdf
		The role of "pathname based access control" in security.
		https://osdn.jp/projects/tomoyo/docs/lfj2008-bof.pdf
		https://sourceforge.net/projects/tomoyo/files/docs/lfj2008-bof.pdf

		History of TOMOYO?
		Realities of Mainlining
		https://osdn.jp/projects/tomoyo/docs/lfj2008.pdf

		What is future plan?
		====================

		We believe that inode based security and name based security are complementary
		and both should be used together. But unfortunately, so far, we cannot enable
		multiple LSM modules at the same time. We feel sorry that you have to give up
		SELinux/SMACK/AppArmor etc. when you want to use TOMOYO.

		We hope that LSM becomes stackable in future. Meanwhile, you can use non-LSM
		version of TOMOYO, available at http://tomoyo.osdn.jp/1.8/ .
		LSM version of TOMOYO is a subset of non-LSM version of TOMOYO. We are planning
		to port non-LSM version's functionalities to LSM versions.
		https://sourceforge.net/projects/tomoyo/files/docs/lfj2008.pdf

Documentation/admin-guide/kernel-parameters.txt

+22 −0

Original line number	Diff line number	Diff line
		@@ -1921,6 +1921,28 @@
		Format:
		<bus_id>,<clkrate>

		i2c_touchscreen_props= [HW,ACPI,X86]
		Set device-properties for ACPI-enumerated I2C-attached
		touchscreen, to e.g. fix coordinates of upside-down
		mounted touchscreens. If you need this option please
		submit a drivers/platform/x86/touchscreen_dmi.c patch
		adding a DMI quirk for this.

		Format:
		<ACPI_HW_ID>:<prop_name>=<val>[:prop_name=val][:...]
		Where <val> is one of:
		Omit "=<val>" entirely Set a boolean device-property
		Unsigned number Set a u32 device-property
		Anything else Set a string device-property

		Examples (split over multiple lines):
		i2c_touchscreen_props=GDIX1001:touchscreen-inverted-x:
		touchscreen-inverted-y

		i2c_touchscreen_props=MSSL1680:touchscreen-size-x=1920:
		touchscreen-size-y=1080:touchscreen-inverted-y:
		firmware-name=gsl1680-vendor-model.fw:silead,home-button

		i8042.debug [HW] Toggle i8042 debug mode
		i8042.unmask_kbd_data
		[HW] Enable printing of interrupt data from the KBD port

Documentation/admin-guide/mm/transhuge.rst

+2 −2

Original line number	Diff line number	Diff line
		@@ -467,11 +467,11 @@ anon_fault_fallback_charge
		instead falls back to using huge pages with lower orders or
		small pages even though the allocation was successful.

		anon_swpout
		swpout
		is incremented every time a huge page is swapped out in one
		piece without splitting.

		anon_swpout_fallback
		swpout_fallback
		is incremented if a huge page has to be split before swapout.
		Usually because failed to allocate some continuous swap space
		for the huge page.

Documentation/arch/riscv/uabi.rst

+3 −1

Original line number	Diff line number	Diff line
		@@ -65,4 +65,6 @@ the extension, or may have deliberately removed it from the listing.
		Misaligned accesses
		-------------------

		Misaligned accesses are supported in userspace, but they may perform poorly.
		Misaligned scalar accesses are supported in userspace, but they may perform
		poorly. Misaligned vector accesses are only supported if the Zicclsm extension
		is supported.