Commit f96271ce authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Merge branch 'master' into next 

Merge master back into next, this allows us to resolve some conflicts in
arch/powerpc/Kconfig, and also re-sort the symbols under config PPC so
that they are in alphabetical order again.
parents 32b48bf8 dd860052

Documentation/ABI/testing/sysfs-bus-event_source-devices-dsa

0 → 100644
+30 −0
Original line number Diff line number Diff line 
What:		/sys/bus/event_source/devices/dsa*/format

Date:		April 2021

KernelVersion:  5.13

Contact:	Tom Zanussi <tom.zanussi@linux.intel.com>

Description:	Read-only.  Attribute group to describe the magic bits

		that go into perf_event_attr.config or

		perf_event_attr.config1 for the IDXD DSA pmu.  (See also

		ABI/testing/sysfs-bus-event_source-devices-format).



		Each attribute in this group defines a bit range in

		perf_event_attr.config or perf_event_attr.config1.

		All supported attributes are listed below (See the

		IDXD DSA Spec for possible attribute values)::



		    event_category = "config:0-3"    - event category

		    event          = "config:4-31"   - event ID



		    filter_wq      = "config1:0-31"  - workqueue filter

		    filter_tc      = "config1:32-39" - traffic class filter

		    filter_pgsz    = "config1:40-43" - page size filter

		    filter_sz      = "config1:44-51" - transfer size filter

		    filter_eng     = "config1:52-59" - engine filter



What:		/sys/bus/event_source/devices/dsa*/cpumask

Date:		April 2021

KernelVersion:  5.13

Contact:	Tom Zanussi <tom.zanussi@linux.intel.com>

Description:    Read-only.  This file always returns the cpu to which the

                IDXD DSA pmu is bound for access to all dsa pmu

		performance monitoring events.

Documentation/ABI/testing/sysfs-devices-system-cpu

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ Description: Disable L3 cache indices 


		All AMD processors with L3 caches provide this functionality.

		For details, see BKDGs at

		http://developer.amd.com/documentation/guides/Pages/default.aspx

                https://www.amd.com/en/support/tech-docs?keyword=bios+kernel





What:		/sys/devices/system/cpu/cpufreq/boost

Documentation/ABI/testing/sysfs-driver-input-exc3000

+9 −0
Original line number Diff line number Diff line
@@ -15,3 +15,12 @@ Description: Reports the model identification provided by the touchscreen, fo 
		Access: Read



		Valid values: Represented as string



What:		/sys/bus/i2c/devices/xxx/type

Date:		Jan 2021

Contact:	linux-input@vger.kernel.org

Description:	Reports the type identification provided by the touchscreen, for example "PCAP82H80 Series"



		Access: Read



		Valid values: Represented as string

Documentation/ABI/testing/sysfs-fs-f2fs

+30 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ Date April 2019 
Contact:	"Daniel Rosenberg" <drosen@google.com>

Description:	If checkpoint=disable, it displays the number of blocks that

		are unusable.

		If checkpoint=enable it displays the enumber of blocks that

		If checkpoint=enable it displays the number of blocks that

		would be unusable if checkpoint=disable were to be set.



What:		/sys/fs/f2fs/<disk>/encoding
@@ -409,3 +409,32 @@ Description: Give a way to change checkpoint merge daemon's io priority. 
		I/O priority "3". We can select the class between "rt" and "be",

		and set the I/O priority within valid range of it. "," delimiter

		is necessary in between I/O class and priority number.



What:		/sys/fs/f2fs/<disk>/ovp_segments

Date:		March 2021

Contact:	"Jaegeuk Kim" <jaegeuk@kernel.org>

Description:	Shows the number of overprovision segments.



What:		/sys/fs/f2fs/<disk>/compr_written_block

Date:		March 2021

Contact:	"Daeho Jeong" <daehojeong@google.com>

Description:	Show the block count written after compression since mount. Note

		that when the compressed blocks are deleted, this count doesn't

		decrease. If you write "0" here, you can initialize

		compr_written_block and compr_saved_block to "0".



What:		/sys/fs/f2fs/<disk>/compr_saved_block

Date:		March 2021

Contact:	"Daeho Jeong" <daehojeong@google.com>

Description:	Show the saved block count with compression since mount. Note

		that when the compressed blocks are deleted, this count doesn't

		decrease. If you write "0" here, you can initialize

		compr_written_block and compr_saved_block to "0".



What:		/sys/fs/f2fs/<disk>/compr_new_inode

Date:		March 2021

Contact:	"Daeho Jeong" <daehojeong@google.com>

Description:	Show the count of inode newly enabled for compression since mount.

		Note that when the compression is disabled for the files, this count

		doesn't decrease. If you write "0" here, you can initialize

		compr_new_inode to "0".

Documentation/ABI/testing/sysfs-kernel-mm-cma

0 → 100644
+25 −0
Original line number Diff line number Diff line 
What:		/sys/kernel/mm/cma/

Date:		Feb 2021

Contact:	Minchan Kim <minchan@kernel.org>

Description:

		/sys/kernel/mm/cma/ contains a subdirectory for each CMA

		heap name (also sometimes called CMA areas).



		Each CMA heap subdirectory (that is, each

		/sys/kernel/mm/cma/<cma-heap-name> directory) contains the

		following items:



			alloc_pages_success

			alloc_pages_fail



What:		/sys/kernel/mm/cma/<cma-heap-name>/alloc_pages_success

Date:		Feb 2021

Contact:	Minchan Kim <minchan@kernel.org>

Description:

		the number of pages CMA API succeeded to allocate



What:		/sys/kernel/mm/cma/<cma-heap-name>/alloc_pages_fail

Date:		Feb 2021

Contact:	Minchan Kim <minchan@kernel.org>

Description:

		the number of pages CMA API failed to allocate