From a00c930781ba467fb395fcc33642e72774002e3d Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu, 19 Oct 2006 17:23:57 -0400
Subject: [PATCH] --- yaml --- r: 42069 b: refs/heads/master c:
 bd01f843c3368dcee735c19603251669f23f4477 h: refs/heads/master i:   42067:
 a42c9af442e3b4874b3253bb55ae81e3cf2c09a9 v: v3

---
 [refs]                                   | 2 +-
 trunk/fs/compat.c                        | 1 +
 trunk/fs/gfs2/locking/dlm/plock.c        | 1 +
 trunk/include/linux/skbuff.h             | 1 -
 trunk/include/net/inet_connection_sock.h | 1 +
 trunk/include/net/udp.h                  | 1 +
 6 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 32ac6906dbf9..aa1cc5716c27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1f8e7f7fb9d7e2cbcb53170edca7c0ac4680697
+refs/heads/master: bd01f843c3368dcee735c19603251669f23f4477
diff --git a/trunk/fs/compat.c b/trunk/fs/compat.c
index fde52d40c0b6..06dad665b88f 100644
--- a/trunk/fs/compat.c
+++ b/trunk/fs/compat.c
@@ -46,6 +46,7 @@
 #include <linux/rwsem.h>
 #include <linux/tsacct_kern.h>
 #include <linux/highmem.h>
+#include <linux/poll.h>
 #include <linux/mm.h>
 
 #include <net/sock.h>		/* siocdevprivate_ioctl */
diff --git a/trunk/fs/gfs2/locking/dlm/plock.c b/trunk/fs/gfs2/locking/dlm/plock.c
index 7365aec9511b..3799f19b282f 100644
--- a/trunk/fs/gfs2/locking/dlm/plock.c
+++ b/trunk/fs/gfs2/locking/dlm/plock.c
@@ -8,6 +8,7 @@
 
 #include <linux/miscdevice.h>
 #include <linux/lock_dlm_plock.h>
+#include <linux/poll.h>
 
 #include "lock_dlm.h"
 
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
index 24ce0add6c54..5c5a08576dcc 100644
--- a/trunk/include/linux/skbuff.h
+++ b/trunk/include/linux/skbuff.h
@@ -23,7 +23,6 @@
 #include <asm/types.h>
 #include <linux/spinlock.h>
 #include <linux/mm.h>
-#include <linux/poll.h>
 #include <linux/net.h>
 #include <linux/textsearch.h>
 #include <net/checksum.h>
diff --git a/trunk/include/net/inet_connection_sock.h b/trunk/include/net/inet_connection_sock.h
index cccea051e922..bf16d98d372c 100644
--- a/trunk/include/net/inet_connection_sock.h
+++ b/trunk/include/net/inet_connection_sock.h
@@ -18,6 +18,7 @@
 #include <linux/compiler.h>
 #include <linux/string.h>
 #include <linux/timer.h>
+#include <linux/poll.h>
 
 #include <net/inet_sock.h>
 #include <net/request_sock.h>
diff --git a/trunk/include/net/udp.h b/trunk/include/net/udp.h
index 1548d68d45da..1b921fa81474 100644
--- a/trunk/include/net/udp.h
+++ b/trunk/include/net/udp.h
@@ -29,6 +29,7 @@
 #include <net/ip.h>
 #include <linux/ipv6.h>
 #include <linux/seq_file.h>
+#include <linux/poll.h>
 
 /**
  *	struct udp_skb_cb  -  UDP(-Lite) private variables