---

yaml
---
r: 347278
b: refs/heads/master
c: 80c2022
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcd6a97d1d821335051cbf35b1e2be54955d6276
+refs/heads/master: 80c2022e5645a1a789531d13010292c5c18bf1db

trunk/Documentation/ABI/testing/ima_policy

@@ -23,7 +23,7 @@ Description:
 			lsm:	[[subj_user=] [subj_role=] [subj_type=]
 				 [obj_user=] [obj_role=] [obj_type=]]
 
-		base: 	func:= [BPRM_CHECK][FILE_MMAP][FILE_CHECK][MODULE_CHECK]
+		base: 	func:= [BPRM_CHECK][FILE_MMAP][FILE_CHECK]
 			mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]
 			fsmagic:= hex value
 			uid:= decimal value
@@ -53,7 +53,6 @@ Description:
 			measure func=BPRM_CHECK
 			measure func=FILE_MMAP mask=MAY_EXEC
 			measure func=FILE_CHECK mask=MAY_READ uid=0
-			measure func=MODULE_CHECK uid=0
 			appraise fowner=0
 
 		The default policy measures all executables in bprm_check,

trunk/Documentation/devicetree/bindings/arm/davinci/nand.txt

@@ -23,9 +23,6 @@ Recommended properties :
 - ti,davinci-nand-buswidth: buswidth 8 or 16
 - ti,davinci-nand-use-bbt: use flash based bad block table support.
 
-nand device bindings may contain additional sub-nodes describing
-partitions of the address space. See partition.txt for more detail.
-
 Example(da850 EVM ):
 nand_cs3@62000000 {
 	compatible = "ti,davinci-nand";
@@ -38,9 +35,4 @@ nand_cs3@62000000 {
 	ti,davinci-ecc-mode = "hw";
 	ti,davinci-ecc-bits = <4>;
 	ti,davinci-nand-use-bbt;
-
-	partition@180000 {
-		label = "ubifs";
-		reg = <0x180000 0x7e80000>;
-	};
 };

trunk/Documentation/devicetree/bindings/mtd/fsmc-nand.txt

@@ -3,7 +3,9 @@
 Required properties:
 - compatible : "st,spear600-fsmc-nand"
 - reg : Address range of the mtd chip
-- reg-names: Should contain the reg names "fsmc_regs", "nand_data", "nand_addr" and "nand_cmd"
+- reg-names: Should contain the reg names "fsmc_regs" and "nand_data"
+- st,ale-off : Chip specific offset to ALE
+- st,cle-off : Chip specific offset to CLE
 
 Optional properties:
 - bank-width : Width (in bytes) of the device.  If not present, the width
@@ -17,10 +19,10 @@ Example:
 		#address-cells = <1>;
 		#size-cells = <1>;
 		reg = <0xd1800000 0x1000	/* FSMC Register */
-		       0xd2000000 0x0010	/* NAND Base DATA */
-		       0xd2020000 0x0010	/* NAND Base ADDR */
-		       0xd2010000 0x0010>;	/* NAND Base CMD */
-		reg-names = "fsmc_regs", "nand_data", "nand_addr", "nand_cmd";
+		       0xd2000000 0x4000>;	/* NAND Base */
+		reg-names = "fsmc_regs", "nand_data";
+		st,ale-off = <0x20000>;
+		st,cle-off = <0x10000>;
 
 		bank-width = <1>;
 		nand-skip-bbtscan;

trunk/Documentation/devicetree/bindings/mtd/mtd-physmap.txt

@@ -23,9 +23,6 @@ file systems on embedded devices.
    unaligned accesses as implemented in the JFFS2 code via memcpy().
    By defining "no-unaligned-direct-access", the flash will not be
    exposed directly to the MTD users (e.g. JFFS2) any more.
- - linux,mtd-name: allow to specify the mtd name for retro capability with
-   physmap-flash drivers as boot loader pass the mtd partition via the old
-   device name physmap-flash.
 
 For JEDEC compatible devices, the following additional properties
 are defined:

trunk/Documentation/devicetree/bindings/pwm/pwm.txt

@@ -37,21 +37,10 @@ device:
 		pwm-names = "backlight";
 	};
 
-Note that in the example above, specifying the "pwm-names" is redundant
-because the name "backlight" would be used as fallback anyway.
-
 pwm-specifier typically encodes the chip-relative PWM number and the PWM
-period in nanoseconds.
-
-Optionally, the pwm-specifier can encode a number of flags in a third cell:
-- bit 0: PWM signal polarity (0: normal polarity, 1: inverse polarity)
-
-Example with optional PWM specifier for inverse polarity
-
-	bl: backlight {
-		pwms = <&pwm 0 5000000 1>;
-		pwm-names = "backlight";
-	};
+period in nanoseconds. Note that in the example above, specifying the
+"pwm-names" is redundant because the name "backlight" would be used as
+fallback anyway.
 
 2) PWM controller nodes
 -----------------------

trunk/Documentation/x86/boot.txt

@@ -373,15 +373,14 @@ Protocol:	2.00+
 	1  Loadlin
 	2  bootsect-loader	(0x20, all other values reserved)
 	3  Syslinux
-	4  Etherboot/gPXE/iPXE
+	4  Etherboot/gPXE
 	5  ELILO
 	7  GRUB
 	8  U-Boot
 	9  Xen
 	A  Gujin
 	B  Qemu
 	C  Arcturus Networks uCbootloader
-	D  kexec-tools
 	E  Extended		(see ext_loader_type)
 	F  Special		(0xFF = undefined)
        10  Reserved