---

yaml
---
r: 165535
b: refs/heads/master
c: 49dc9ef
h: refs/heads/master
i:
  165533: c185e86
  165531: 870209b
  165527: 18c60dd
  165519: c7f9d41
  165503: d31742b
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c82ffab9a857f8286ed2b559624b7005a367b638
+refs/heads/master: 49dc9efed05ad3e49000097ce1ec31cd3bbc909b

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/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/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,

trunk/Documentation/auxdisplay/cfag12864b-example.c

@@ -62,7 +62,7 @@ unsigned char cfag12864b_buffer[CFAG12864B_SIZE];
  * Unable to open: return = -1
  * Unable to mmap: return = -2
  */
-static int cfag12864b_init(char *path)
+int cfag12864b_init(char *path)
 {
 	cfag12864b_fd = open(path, O_RDWR);
 	if (cfag12864b_fd == -1)
@@ -81,7 +81,7 @@ static int cfag12864b_init(char *path)
 /*
  * exit a cfag12864b framebuffer device
  */
-static void cfag12864b_exit(void)
+void cfag12864b_exit(void)
 {
 	munmap(cfag12864b_mem, CFAG12864B_SIZE);
 	close(cfag12864b_fd);
@@ -90,7 +90,7 @@ static void cfag12864b_exit(void)
 /*
  * set (x, y) pixel
  */
-static void cfag12864b_set(unsigned char x, unsigned char y)
+void cfag12864b_set(unsigned char x, unsigned char y)
 {
 	if (CFAG12864B_CHECK(x, y))
 		cfag12864b_buffer[CFAG12864B_ADDRESS(x, y)] |=
@@ -100,7 +100,7 @@ static void cfag12864b_set(unsigned char x, unsigned char y)
 /*
  * unset (x, y) pixel
  */
-static void cfag12864b_unset(unsigned char x, unsigned char y)
+void cfag12864b_unset(unsigned char x, unsigned char y)
 {
 	if (CFAG12864B_CHECK(x, y))
 		cfag12864b_buffer[CFAG12864B_ADDRESS(x, y)] &=
@@ -113,7 +113,7 @@ static void cfag12864b_unset(unsigned char x, unsigned char y)
  * Pixel off: return = 0
  * Pixel on:  return = 1
  */
-static unsigned char cfag12864b_isset(unsigned char x, unsigned char y)
+unsigned char cfag12864b_isset(unsigned char x, unsigned char y)
 {
 	if (CFAG12864B_CHECK(x, y))
 		if (cfag12864b_buffer[CFAG12864B_ADDRESS(x, y)] &
@@ -126,7 +126,7 @@ static unsigned char cfag12864b_isset(unsigned char x, unsigned char y)
 /*
  * not (x, y) pixel
  */
-static void cfag12864b_not(unsigned char x, unsigned char y)
+void cfag12864b_not(unsigned char x, unsigned char y)
 {
 	if (cfag12864b_isset(x, y))
 		cfag12864b_unset(x, y);
@@ -137,7 +137,7 @@ static void cfag12864b_not(unsigned char x, unsigned char y)
 /*
  * fill (set all pixels)
  */
-static void cfag12864b_fill(void)
+void cfag12864b_fill(void)
 {
 	unsigned short i;
 
@@ -148,7 +148,7 @@ static void cfag12864b_fill(void)
 /*
  * clear (unset all pixels)
  */
-static void cfag12864b_clear(void)
+void cfag12864b_clear(void)
 {
 	unsigned short i;
 
@@ -162,7 +162,7 @@ static void cfag12864b_clear(void)
  * Pixel off: src[i] = 0
  * Pixel on:  src[i] > 0
  */
-static void cfag12864b_format(unsigned char * matrix)
+void cfag12864b_format(unsigned char * matrix)
 {
 	unsigned char i, j, n;
 
@@ -182,7 +182,7 @@ static void cfag12864b_format(unsigned char * matrix)
 /*
  * blit buffer to lcd
  */
-static void cfag12864b_blit(void)
+void cfag12864b_blit(void)
 {
 	memcpy(cfag12864b_mem, cfag12864b_buffer, CFAG12864B_SIZE);
 }
@@ -198,7 +198,7 @@ static void cfag12864b_blit(void)
 
 #define EXAMPLES	6
 
-static void example(unsigned char n)
+void example(unsigned char n)
 {
 	unsigned short i, j;
 	unsigned char matrix[CFAG12864B_WIDTH * CFAG12864B_HEIGHT];