Commit facbf0b9 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

Merge remote-tracking branch 'torvalds/master' into perf/core 



To pick up fixes and move perf/core forward, minor conflict as
perf_evlist__add_dummy() lost its 'perf_' prefix as it operates on a
'struct evlist', not on a 'struct perf_evlist', i.e. its tools/perf/
specific, it is not in libperf.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents 19bf119c dcde237b

.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

Documentation/ABI/testing/sysfs-platform-chipidea-usb-otg

+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

Documentation/admin-guide/cgroup-v2.rst

+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

Documentation/admin-guide/device-mapper/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Device Mapper 
    dm-clone

    dm-crypt

    dm-dust

    dm-ebs

    dm-flakey

    dm-init

    dm-integrity

Documentation/admin-guide/mm/transhuge.rst

+1 −2
Original line number Diff line number Diff line
@@ -305,8 +305,7 @@ monitor how successfully the system is providing huge pages for use. 


thp_fault_alloc

	is incremented every time a huge page is successfully

	allocated to handle a page fault. This applies to both the

	first time a page is faulted and for COW faults.

	allocated to handle a page fault.



thp_collapse_alloc

	is incremented by khugepaged when it has found