Merge branch 'master' of... (0c17e4ce) · Commits · e / devices / android_kernel_fairphone_FP4

.gitignore

+9 −3

Original line number	Diff line number	Diff line
		@@ -3,6 +3,10 @@
		# subdirectories here. Add them in the ".gitignore" file
		# in that subdirectory instead.
		#
		# NOTE! Please use 'git-ls-files -i --exclude-standard'
		# command after changing this file, to see if there are
		# any tracked files which get ignored after the change.
		#
		# Normal rules
		#
		.*
		@@ -18,19 +22,21 @@
		*.lst
		*.symtypes
		*.order
		*.elf
		*.bin
		*.gz

		#
		# Top-level generic files
		#
		tags
		TAGS
		vmlinux*
		!vmlinux.lds.S
		!vmlinux.lds.h
		vmlinux
		System.map
		Module.markers
		Module.symvers
		!.gitignore
		!.mailmap

		#
		# Generated include files

CREDITS

+3 −2

Original line number	Diff line number	Diff line
		@@ -2611,8 +2611,9 @@ S: Perth, Western Australia
		S: Australia

		N: Miguel Ojeda Sandonis
		E: maxextreme@gmail.com
		W: http://maxextreme.googlepages.com/
		E: miguel.ojeda.sandonis@gmail.com
		W: http://miguelojeda.es
		W: http://jair.lab.fi.uva.es/~migojed/
		D: Author of the ks0108, cfag12864b and cfag12864bfb auxiliary display drivers.
		D: Maintainer of the auxiliary display drivers tree (drivers/auxdisplay/*)
		S: C/ Mieses 20, 9-B

Documentation/ABI/testing/sysfs-block

+34 −0

Original line number	Diff line number	Diff line
		@@ -26,3 +26,37 @@ Description:
		I/O statistics of partition <part>. The format is the
		same as the above-written /sys/block/<disk>/stat
		format.


		What: /sys/block/<disk>/integrity/format
		Date: June 2008
		Contact: Martin K. Petersen <martin.petersen@oracle.com>
		Description:
		Metadata format for integrity capable block device.
		E.g. T10-DIF-TYPE1-CRC.


		What: /sys/block/<disk>/integrity/read_verify
		Date: June 2008
		Contact: Martin K. Petersen <martin.petersen@oracle.com>
		Description:
		Indicates whether the block layer should verify the
		integrity of read requests serviced by devices that
		support sending integrity metadata.


		What: /sys/block/<disk>/integrity/tag_size
		Date: June 2008
		Contact: Martin K. Petersen <martin.petersen@oracle.com>
		Description:
		Number of bytes of integrity tag space available per
		512 bytes of data.


		What: /sys/block/<disk>/integrity/write_generate
		Date: June 2008
		Contact: Martin K. Petersen <martin.petersen@oracle.com>
		Description:
		Indicates whether the block layer should automatically
		generate checksums for write requests bound for
		devices that support receiving integrity metadata.

Documentation/ABI/testing/sysfs-bus-css

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		What: /sys/bus/css/devices/.../type
		Date: March 2008
		Contact: Cornelia Huck <cornelia.huck@de.ibm.com>
		linux-s390@vger.kernel.org
		Description: Contains the subchannel type, as reported by the hardware.
		This attribute is present for all subchannel types.

		What: /sys/bus/css/devices/.../modalias
		Date: March 2008
		Contact: Cornelia Huck <cornelia.huck@de.ibm.com>
		linux-s390@vger.kernel.org
		Description: Contains the module alias as reported with uevents.
		It is of the format css:t<type> and present for all
		subchannel types.

		What: /sys/bus/css/drivers/io_subchannel/.../chpids
		Date: December 2002
		Contact: Cornelia Huck <cornelia.huck@de.ibm.com>
		linux-s390@vger.kernel.org
		Description: Contains the ids of the channel paths used by this
		subchannel, as reported by the channel subsystem
		during subchannel recognition.
		Note: This is an I/O-subchannel specific attribute.
		Users: s390-tools, HAL

		What: /sys/bus/css/drivers/io_subchannel/.../pimpampom
		Date: December 2002
		Contact: Cornelia Huck <cornelia.huck@de.ibm.com>
		linux-s390@vger.kernel.org
		Description: Contains the PIM/PAM/POM values, as reported by the
		channel subsystem when last queried by the common I/O
		layer (this implies that this attribute is not neccessarily
		in sync with the values current in the channel subsystem).
		Note: This is an I/O-subchannel specific attribute.
		Users: s390-tools, HAL

Documentation/ABI/testing/sysfs-firmware-memmap

0 → 100644

+71 −0

Original line number	Diff line number	Diff line
		What: /sys/firmware/memmap/
		Date: June 2008
		Contact: Bernhard Walle <bwalle@suse.de>
		Description:
		On all platforms, the firmware provides a memory map which the
		kernel reads. The resources from that memory map are registered
		in the kernel resource tree and exposed to userspace via
		/proc/iomem (together with other resources).

		However, on most architectures that firmware-provided memory
		map is modified afterwards by the kernel itself, either because
		the kernel merges that memory map with other information or
		just because the user overwrites that memory map via command
		line.

		kexec needs the raw firmware-provided memory map to setup the
		parameter segment of the kernel that should be booted with
		kexec. Also, the raw memory map is useful for debugging. For
		that reason, /sys/firmware/memmap is an interface that provides
		the raw memory map to userspace.

		The structure is as follows: Under /sys/firmware/memmap there
		are subdirectories with the number of the entry as their name:

		/sys/firmware/memmap/0
		/sys/firmware/memmap/1
		/sys/firmware/memmap/2
		/sys/firmware/memmap/3
		...

		The maximum depends on the number of memory map entries provided
		by the firmware. The order is just the order that the firmware
		provides.

		Each directory contains three files:

		start : The start address (as hexadecimal number with the
		'0x' prefix).
		end : The end address, inclusive (regardless whether the
		firmware provides inclusive or exclusive ranges).
		type : Type of the entry as string. See below for a list of
		valid types.

		So, for example:

		/sys/firmware/memmap/0/start
		/sys/firmware/memmap/0/end
		/sys/firmware/memmap/0/type
		/sys/firmware/memmap/1/start
		...

		Currently following types exist:

		- System RAM
		- ACPI Tables
		- ACPI Non-volatile Storage
		- reserved

		Following shell snippet can be used to display that memory
		map in a human-readable format:

		-------------------- 8< ----------------------------------------
		#!/bin/bash
		cd /sys/firmware/memmap
		for dir in * ; do
		start=$(cat $dir/start)
		end=$(cat $dir/end)
		type=$(cat $dir/type)
		printf "%016x-%016x (%s)\n" $start $[ $end +1] "$type"
		done
		-------------------- >8 ----------------------------------------