Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (71930d61) · Commits · 戴 / test

.gitignore

+3 −0

Original line number	Diff line number	Diff line
		@@ -143,6 +143,9 @@ x509.genkey
		/allrandom.config
		/allyes.config

		# Kconfig savedefconfig output
		/defconfig

		# Kdevelop4
		*.kdev4

+5 −0

Original line number	Diff line number	Diff line
		@@ -90,11 +90,16 @@ Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>
		Frank Zago <fzago@systemfabricworks.com>
		Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com>
		Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>
		Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>
		Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>
		Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@linux.vnet.ibm.com>
		Greg Kroah-Hartman <greg@echidna.(none)>
		Greg Kroah-Hartman <gregkh@suse.de>
		Greg Kroah-Hartman <greg@kroah.com>
		Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>
		Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>
		Heiko Carstens <hca@linux.ibm.com> <h.carstens@de.ibm.com>
		Heiko Carstens <hca@linux.ibm.com> <heiko.carstens@de.ibm.com>
		Henk Vergonet <Henk.Vergonet@gmail.com>
		Henrik Kretzschmar <henne@nachtwindheim.de>
		Henrik Rydberg <rydberg@bitmath.org>

+4 −4

Original line number	Diff line number	Diff line
		What: /sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_req
		Date: Feb 2014
		Contact: Li Jun <b47624@freescale.com>
		Contact: Li Jun <jun.li@nxp.com>
		Description:
		Can be set and read.
		Set a_bus_req(A-device bus request) input to be 1 if
		@@ -17,7 +17,7 @@ Description:

		What: /sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_drop
		Date: Feb 2014
		Contact: Li Jun <b47624@freescale.com>
		Contact: Li Jun <jun.li@nxp.com>
		Description:
		Can be set and read
		The a_bus_drop(A-device bus drop) input is 1 when the
		@@ -32,7 +32,7 @@ Description:

		What: /sys/bus/platform/devices/ci_hdrc.0/inputs/b_bus_req
		Date: Feb 2014
		Contact: Li Jun <b47624@freescale.com>
		Contact: Li Jun <jun.li@nxp.com>
		Description:
		Can be set and read.
		The b_bus_req(B-device bus request) input is 1 during the time
		@@ -47,7 +47,7 @@ Description:

		What: /sys/bus/platform/devices/ci_hdrc.0/inputs/a_clr_err
		Date: Feb 2014
		Contact: Li Jun <b47624@freescale.com>
		Contact: Li Jun <jun.li@nxp.com>
		Description:
		Only can be set.
		The a_clr_err(A-device Vbus error clear) input is used to clear

+1 −1

Original line number	Diff line number	Diff line
		@@ -258,7 +258,7 @@ Configuring the kernel
		Compiling the kernel
		--------------------

		- Make sure you have at least gcc 4.6 available.
		- Make sure you have at least gcc 4.9 available.
		For more information, refer to :ref:`Documentation/process/changes.rst <changes>`.

		Please note that you can still run a.out user programs with this kernel.

+2 −2

Original line number	Diff line number	Diff line
		@@ -1356,8 +1356,8 @@ PAGE_SIZE multiple when read back.

		thp_fault_alloc
		Number of transparent hugepages which were allocated to satisfy
		a page fault, including COW faults. This counter is not present
		when CONFIG_TRANSPARENT_HUGEPAGE is not set.
		a page fault. This counter is not present when CONFIG_TRANSPARENT_HUGEPAGE
		is not set.

		thp_collapse_alloc
		Number of transparent hugepages which were allocated to allow