---

yaml
---
r: 166212
b: refs/heads/master
c: 8b1c9be
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e44e4347735229b518cc02938c351428bcd7492
+refs/heads/master: 8b1c9befbfbd443bd95e77db01c70f1741aa2511

trunk/Documentation/ABI/testing/sysfs-gpio

@@ -19,7 +19,6 @@ Description:
 	/gpioN ... for each exported GPIO #N
 	    /value ... always readable, writes fail for input GPIOs
 	    /direction ... r/w as: in, out (default low); write: high, low
-	    /edge ... r/w as: none, falling, rising, both
 	/gpiochipN ... for each gpiochip; #N is its first GPIO
 	    /base ... (r/o) same as N
 	    /label ... (r/o) descriptive, not necessarily unique

trunk/Documentation/DocBook/mtdnand.tmpl

@@ -568,7 +568,7 @@ static void board_select_chip (struct mtd_info *mtd, int chip)
 			<para>
 				The blocks in which the tables are stored are procteted against
 				accidental access by marking them bad in the memory bad block
-				table. The bad block table management functions are allowed
+				table. The bad block table managment functions are allowed
 				to circumvernt this protection.
 			</para>
 			<para>

trunk/Documentation/DocBook/scsi.tmpl

@@ -317,7 +317,7 @@
         <para>
           The SAS transport class contains common code to deal with SAS HBAs,
           an aproximated representation of SAS topologies in the driver model,
-          and various sysfs attributes to expose these topologies and management
+          and various sysfs attributes to expose these topologies and managment
           interfaces to userspace.
         </para>
         <para>

trunk/Documentation/Intel-IOMMU.txt

@@ -56,7 +56,11 @@ Graphics Problems?
 ------------------
 If you encounter issues with graphics devices, you can try adding
 option intel_iommu=igfx_off to turn off the integrated graphics engine.
-If this fixes anything, please ensure you file a bug reporting the problem.
+
+If it happens to be a PCI device included in the INCLUDE_ALL Engine,
+then try enabling CONFIG_DMAR_GFX_WA to setup a 1-1 map. We hear
+graphics drivers may be in process of using DMA api's in the near
+future and at that time this option can be yanked out.
 
 Some exceptions to IOVA
 -----------------------

trunk/Documentation/SubmittingPatches

@@ -183,7 +183,7 @@ the MAN-PAGES maintainer (as listed in the MAINTAINERS file)
 a man-pages patch, or at least a notification of the change,
 so that some information makes its way into the manual pages.
 
-Even if the maintainer did not respond in step #5, make sure to ALWAYS
+Even if the maintainer did not respond in step #4, make sure to ALWAYS
 copy the maintainer when you change their code.
 
 For small patches you may want to CC the Trivial Patch Monkey

trunk/Documentation/accounting/getdelays.c

@@ -116,7 +116,7 @@ static int create_nl_socket(int protocol)
 }
 
 
-static int send_cmd(int sd, __u16 nlmsg_type, __u32 nlmsg_pid,
+int send_cmd(int sd, __u16 nlmsg_type, __u32 nlmsg_pid,
 	     __u8 genl_cmd, __u16 nla_type,
 	     void *nla_data, int nla_len)
 {
@@ -160,7 +160,7 @@ static int send_cmd(int sd, __u16 nlmsg_type, __u32 nlmsg_pid,
  * Probe the controller in genetlink to find the family id
  * for the TASKSTATS family
  */
-static int get_family_id(int sd)
+int get_family_id(int sd)
 {
 	struct {
 		struct nlmsghdr n;
@@ -190,7 +190,7 @@ static int get_family_id(int sd)
 	return id;
 }
 
-static void print_delayacct(struct taskstats *t)
+void print_delayacct(struct taskstats *t)
 {
 	printf("\n\nCPU   %15s%15s%15s%15s\n"
 	       "      %15llu%15llu%15llu%15llu\n"
@@ -216,15 +216,15 @@ static void print_delayacct(struct taskstats *t)
 	       (unsigned long long)t->freepages_delay_total);
 }
 
-static void task_context_switch_counts(struct taskstats *t)
+void task_context_switch_counts(struct taskstats *t)
 {
 	printf("\n\nTask   %15s%15s\n"
 	       "       %15llu%15llu\n",
 	       "voluntary", "nonvoluntary",
 	       (unsigned long long)t->nvcsw, (unsigned long long)t->nivcsw);
 }
 
-static void print_cgroupstats(struct cgroupstats *c)
+void print_cgroupstats(struct cgroupstats *c)
 {
 	printf("sleeping %llu, blocked %llu, running %llu, stopped %llu, "
 		"uninterruptible %llu\n", (unsigned long long)c->nr_sleeping,
@@ -235,7 +235,7 @@ static void print_cgroupstats(struct cgroupstats *c)
 }
 
 
-static void print_ioacct(struct taskstats *t)
+void print_ioacct(struct taskstats *t)
 {
 	printf("%s: read=%llu, write=%llu, cancelled_write=%llu\n",
 		t->ac_comm,