Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4bec970 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android

parents 717ba911 2b090d94

Documentation/ABI/testing/ima_policy

+4 −2
Original line number Diff line number Diff line
@@ -20,17 +20,19 @@ Description: 
		action: measure | dont_measure | appraise | dont_appraise | audit

		condition:= base | lsm  [option]

			base:	[[func=] [mask=] [fsmagic=] [fsuuid=] [uid=]

				 [fowner]]

				[euid=] [fowner=]]

			lsm:	[[subj_user=] [subj_role=] [subj_type=]

				 [obj_user=] [obj_role=] [obj_type=]]

			option:	[[appraise_type=]] [permit_directio]



		base: 	func:= [BPRM_CHECK][MMAP_CHECK][FILE_CHECK][MODULE_CHECK]

				[FIRMWARE_CHECK]

			mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]

			mask:= [[^]MAY_READ] [[^]MAY_WRITE] [[^]MAY_APPEND]

			       [[^]MAY_EXEC]

			fsmagic:= hex value

			fsuuid:= file system UUID (e.g 8bcbe394-4f13-4144-be8e-5aa9ea2ce2f6)

			uid:= decimal value

			euid:= decimal value

			fowner:=decimal value

		lsm:  	are LSM specific

		option:	appraise_type:= [imasig]

Documentation/ABI/testing/sysfs-ata

+11 −0
Original line number Diff line number Diff line
@@ -90,6 +90,17 @@ gscr 
	130:	SATA_PMP_GSCR_SII_GPIO

	Only valid if the device is a PM.



trim



	Shows the DSM TRIM mode currently used by the device. Valid

	values are:

	unsupported:		Drive does not support DSM TRIM

	unqueued:		Drive supports unqueued DSM TRIM only

	queued:			Drive supports queued DSM TRIM

	forced_unqueued:	Drive's unqueued DSM support is known to be

				buggy and only unqueued TRIM commands

				are sent



spdn_cnt



	Number of time libata decided to lower the speed of link due to errors.

Documentation/devicetree/bindings/clock/keystone-pll.txt

+4 −4
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ Required properties: 
- compatible : shall be "ti,keystone,main-pll-clock" or "ti,keystone,pll-clock"

- clocks : parent clock phandle

- reg - pll control0 and pll multipler registers

- reg-names : control and multiplier. The multiplier is applicable only for

		main pll clock

- reg-names : control, multiplier and post-divider. The multiplier and

		post-divider registers are applicable only for main pll clock

- fixed-postdiv : fixed post divider value. If absent, use clkod register bits

		for postdiv
@@ -25,8 +25,8 @@ Example: 
		#clock-cells = <0>;

		compatible = "ti,keystone,main-pll-clock";

		clocks = <&refclksys>;

		reg = <0x02620350 4>, <0x02310110 4>;

		reg-names = "control", "multiplier";

		reg = <0x02620350 4>, <0x02310110 4>, <0x02310108 4>;

		reg-names = "control", "multiplier", "post-divider";

		fixed-postdiv = <2>;

	};

Documentation/i2c/busses/i2c-i801

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ Supported adapters: 
  * Intel Wildcat Point-LP (PCH)

  * Intel BayTrail (SOC)

  * Intel Sunrise Point-H (PCH)

  * Intel Sunrise Point-LP (PCH)

   Datasheets: Publicly available at the Intel website



On Intel Patsburg and later chipsets, both the normal host SMBus controller

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 18

SUBLEVEL = 20

SUBLEVEL = 22

EXTRAVERSION =

NAME = Shuffling Zombie Juror