Merge branch 'for-linus' into for-next (1e94320f) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,9 @@ Properties:
		Second cell specifies the irq distribution mode to cores
		0=Round Robin; 1=cpu0, 2=cpu1, 4=cpu2, 8=cpu3

		The second cell in interrupts property is deprecated and may be ignored by
		the kernel.

		intc accessed via the special ARC AUX register interface, hence "reg" property
		is not specified.

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ have dual GMAC each represented by a child node..
		* Ethernet controller node

		Required properties:
		- compatible: Should be "mediatek,mt7623-eth"
		- compatible: Should be "mediatek,mt2701-eth"
		- reg: Address and length of the register set for the device
		- interrupts: Should contain the three frame engines interrupts in numeric
		order. These are fe_int0, fe_int1 and fe_int2.

+3 −2

Original line number	Diff line number	Diff line
		@@ -19,8 +19,9 @@ Optional Properties:
		specifications. If neither of these are specified, the default is to
		assume clause 22.

		If the phy's identifier is known then the list may contain an entry
		of the form: "ethernet-phy-idAAAA.BBBB" where
		If the PHY reports an incorrect ID (or none at all) then the
		"compatible" list may contain an entry with the correct PHY ID in the
		form: "ethernet-phy-idAAAA.BBBB" where
		AAAA - The value of the 16 bit Phy Identifier 1 register as
		4 hex digits. This is the chip vendor OUI bits 3:18
		BBBB - The value of the 16 bit Phy Identifier 2 register as

+3 −2

Original line number	Diff line number	Diff line
		@@ -212,10 +212,11 @@ asynchronous manner and the value may not be very precise. To see a precise
		snapshot of a moment, you can see /proc/<pid>/smaps file and scan page table.
		It's slow but very precise.

		Table 1-2: Contents of the status files (as of 4.1)
		Table 1-2: Contents of the status files (as of 4.8)
		..............................................................................
		Field Content
		Name filename of the executable
		Umask file mode creation mask
		State state (R is running, S is sleeping, D is sleeping
		in an uninterruptible wait, Z is zombie,
		T is traced or stopped)
		@@ -226,7 +227,6 @@ Table 1-2: Contents of the status files (as of 4.1)
		TracerPid PID of process tracing this process (0 if not)
		Uid Real, effective, saved set, and file system UIDs
		Gid Real, effective, saved set, and file system GIDs
		Umask file mode creation mask
		FDSize number of file descriptor slots currently allocated
		Groups supplementary group list
		NStgid descendant namespace thread group ID hierarchy
		@@ -236,6 +236,7 @@ Table 1-2: Contents of the status files (as of 4.1)
		VmPeak peak virtual memory size
		VmSize total program size
		VmLck locked memory size
		VmPin pinned memory size
		VmHWM peak resident set size ("high water mark")
		VmRSS size of memory portions. It contains the three
		following parts (VmRSS = RssAnon + RssFile + RssShmem)

+1 −3

Original line number	Diff line number	Diff line
		@@ -35,9 +35,7 @@ only one way to cause the system to go into the Suspend-To-RAM state (write
		The default suspend mode (ie. the one to be used without writing anything into
		/sys/power/mem_sleep) is either "deep" (if Suspend-To-RAM is supported) or
		"s2idle", but it can be overridden by the value of the "mem_sleep_default"
		parameter in the kernel command line. On some ACPI-based systems, depending on
		the information in the FADT, the default may be "s2idle" even if Suspend-To-RAM
		is supported.
		parameter in the kernel command line.

		The properties of all of the sleep states are described below.