forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airli…
…ed/linux into v4l_for_linus * 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux: (9717 commits) media-bus: Fixup RGB444_1X12, RGB565_1X16, and YUV8_1X24 media bus format hexdump: avoid warning in test function fs: take i_mutex during prepare_binprm for set[ug]id executables smp: Fix error case handling in smp_call_function_*() iommu-common: Fix PARISC compile-time warnings sparc: Make LDC use common iommu poll management functions sparc: Make sparc64 use scalable lib/iommu-common.c functions Break up monolithic iommu table/lock into finer graularity pools and lock sparc: Revert generic IOMMU allocator. tools/power turbostat: correct dumped pkg-cstate-limit value tools/power turbostat: calculate TSC frequency from CPUID(0x15) on SKL tools/power turbostat: correct DRAM RAPL units on recent Xeon processors tools/power turbostat: Initial Skylake support tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support for O= option in Makefile tools/power turbostat: modprobe msr, if needed tools/power turbostat: dump MSR_TURBO_RATIO_LIMIT2 tools/power turbostat: use new MSR_TURBO_RATIO_LIMIT names Bluetooth: hidp: Fix regression with older userspace and flags validation config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected perf/x86/intel/pt: Fix and clean up error handling in pt_event_add() ... That solves several merge conflicts: Documentation/DocBook/media/v4l/subdev-formats.xml Documentation/devicetree/bindings/vendor-prefixes.txt drivers/staging/media/mn88473/mn88473.c include/linux/kconfig.h include/uapi/linux/media-bus-format.h The ones at subdev-formats.xml and media-bus-format.h are not trivial. That's why we opted to merge from DRM.
- Loading branch information
Showing
7,787 changed files
with
316,308 additions
and
156,694 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,6 +24,7 @@ | |
| *.order | ||
| *.elf | ||
| *.bin | ||
| *.tar | ||
| *.gz | ||
| *.bz2 | ||
| *.lzma | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| What: /sys/block/zram<id>/num_reads | ||
| Date: August 2015 | ||
| Contact: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> | ||
| Description: | ||
| The num_reads file is read-only and specifies the number of | ||
| reads (failed or successful) done on this device. | ||
| Now accessible via zram<id>/stat node. | ||
|
|
||
| What: /sys/block/zram<id>/num_writes | ||
| Date: August 2015 | ||
| Contact: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> | ||
| Description: | ||
| The num_writes file is read-only and specifies the number of | ||
| writes (failed or successful) done on this device. | ||
| Now accessible via zram<id>/stat node. | ||
|
|
||
| What: /sys/block/zram<id>/invalid_io | ||
| Date: August 2015 | ||
| Contact: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> | ||
| Description: | ||
| The invalid_io file is read-only and specifies the number of | ||
| non-page-size-aligned I/O requests issued to this device. | ||
| Now accessible via zram<id>/io_stat node. | ||
|
|
||
| What: /sys/block/zram<id>/failed_reads | ||
| Date: August 2015 | ||
| Contact: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> | ||
| Description: | ||
| The failed_reads file is read-only and specifies the number of | ||
| failed reads happened on this device. | ||
| Now accessible via zram<id>/io_stat node. | ||
|
|
||
| What: /sys/block/zram<id>/failed_writes | ||
| Date: August 2015 | ||
| Contact: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> | ||
| Description: | ||
| The failed_writes file is read-only and specifies the number of | ||
| failed writes happened on this device. | ||
| Now accessible via zram<id>/io_stat node. | ||
|
|
||
| What: /sys/block/zram<id>/notify_free | ||
| Date: August 2015 | ||
| Contact: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> | ||
| Description: | ||
| The notify_free file is read-only. Depending on device usage | ||
| scenario it may account a) the number of pages freed because | ||
| of swap slot free notifications or b) the number of pages freed | ||
| because of REQ_DISCARD requests sent by bio. The former ones | ||
| are sent to a swap block device when a swap slot is freed, which | ||
| implies that this disk is being used as a swap disk. The latter | ||
| ones are sent by filesystem mounted with discard option, | ||
| whenever some data blocks are getting discarded. | ||
| Now accessible via zram<id>/io_stat node. | ||
|
|
||
| What: /sys/block/zram<id>/zero_pages | ||
| Date: August 2015 | ||
| Contact: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> | ||
| Description: | ||
| The zero_pages file is read-only and specifies number of zero | ||
| filled pages written to this disk. No memory is allocated for | ||
| such pages. | ||
| Now accessible via zram<id>/mm_stat node. | ||
|
|
||
| What: /sys/block/zram<id>/orig_data_size | ||
| Date: August 2015 | ||
| Contact: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> | ||
| Description: | ||
| The orig_data_size file is read-only and specifies uncompressed | ||
| size of data stored in this disk. This excludes zero-filled | ||
| pages (zero_pages) since no memory is allocated for them. | ||
| Unit: bytes | ||
| Now accessible via zram<id>/mm_stat node. | ||
|
|
||
| What: /sys/block/zram<id>/compr_data_size | ||
| Date: August 2015 | ||
| Contact: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> | ||
| Description: | ||
| The compr_data_size file is read-only and specifies compressed | ||
| size of data stored in this disk. So, compression ratio can be | ||
| calculated using orig_data_size and this statistic. | ||
| Unit: bytes | ||
| Now accessible via zram<id>/mm_stat node. | ||
|
|
||
| What: /sys/block/zram<id>/mem_used_total | ||
| Date: August 2015 | ||
| Contact: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> | ||
| Description: | ||
| The mem_used_total file is read-only and specifies the amount | ||
| of memory, including allocator fragmentation and metadata | ||
| overhead, allocated for this disk. So, allocator space | ||
| efficiency can be calculated using compr_data_size and this | ||
| statistic. | ||
| Unit: bytes | ||
| Now accessible via zram<id>/mm_stat node. | ||
|
|
||
| What: /sys/block/zram<id>/mem_used_max | ||
| Date: August 2015 | ||
| Contact: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> | ||
| Description: | ||
| The mem_used_max file is read/write and specifies the amount | ||
| of maximum memory zram have consumed to store compressed data. | ||
| For resetting the value, you should write "0". Otherwise, | ||
| you could see -EINVAL. | ||
| Unit: bytes | ||
| Downgraded to write-only node: so it's possible to set new | ||
| value only; its current value is stored in zram<id>/mm_stat | ||
| node. | ||
|
|
||
| What: /sys/block/zram<id>/mem_limit | ||
| Date: August 2015 | ||
| Contact: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> | ||
| Description: | ||
| The mem_limit file is read/write and specifies the maximum | ||
| amount of memory ZRAM can use to store the compressed data. | ||
| The limit could be changed in run time and "0" means disable | ||
| the limit. No limit is the initial state. Unit: bytes | ||
| Downgraded to write-only node: so it's possible to set new | ||
| value only; its current value is stored in zram<id>/mm_stat | ||
| node. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| # Note: This documents additional properties of any device beyond what | ||
| # is documented in Documentation/sysfs-rules.txt | ||
|
|
||
| What: /sys/devices/*/of_path | ||
| Date: February 2015 | ||
| Contact: Device Tree mailing list <devicetree@vger.kernel.org> | ||
| Description: | ||
| Any device associated with a device-tree node will have | ||
| an of_path symlink pointing to the corresponding device | ||
| node in /sys/firmware/devicetree/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| What: /config/usb-gadget/gadget/functions/printer.name | ||
| Date: Apr 2015 | ||
| KernelVersion: 4.1 | ||
| Description: | ||
| The attributes: | ||
|
|
||
| pnp_string - Data to be passed to the host in pnp string | ||
| q_len - Number of requests per endpoint | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.