From cd95eb6c1495a606f032e3e7082fff549f3e2bf6 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Tue, 9 Oct 2012 09:49:05 +0100
Subject: [PATCH] --- yaml --- r: 332945 b: refs/heads/master c:
 611128eb3927941abcfdca5b7515cf02aab601ec h: refs/heads/master i:   332943:
 526c79a9d1969bcd5364b2bd53ccaeb45f599c2e v: v3

---
 [refs]                                             | 2 +-
 trunk/include/linux/tc_act/Kbuild                  | 7 -------
 trunk/include/uapi/linux/tc_act/Kbuild             | 7 +++++++
 trunk/include/{ => uapi}/linux/tc_act/tc_csum.h    | 0
 trunk/include/{ => uapi}/linux/tc_act/tc_gact.h    | 0
 trunk/include/{ => uapi}/linux/tc_act/tc_ipt.h     | 0
 trunk/include/{ => uapi}/linux/tc_act/tc_mirred.h  | 0
 trunk/include/{ => uapi}/linux/tc_act/tc_nat.h     | 0
 trunk/include/{ => uapi}/linux/tc_act/tc_pedit.h   | 0
 trunk/include/{ => uapi}/linux/tc_act/tc_skbedit.h | 0
 10 files changed, 8 insertions(+), 8 deletions(-)
 rename trunk/include/{ => uapi}/linux/tc_act/tc_csum.h (100%)
 rename trunk/include/{ => uapi}/linux/tc_act/tc_gact.h (100%)
 rename trunk/include/{ => uapi}/linux/tc_act/tc_ipt.h (100%)
 rename trunk/include/{ => uapi}/linux/tc_act/tc_mirred.h (100%)
 rename trunk/include/{ => uapi}/linux/tc_act/tc_nat.h (100%)
 rename trunk/include/{ => uapi}/linux/tc_act/tc_pedit.h (100%)
 rename trunk/include/{ => uapi}/linux/tc_act/tc_skbedit.h (100%)

diff --git a/[refs] b/[refs]
index faec20771156..2cc3e6070d32 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff1e1756c974fc1cb68b6e74cd123ad59cf07a2d
+refs/heads/master: 611128eb3927941abcfdca5b7515cf02aab601ec
diff --git a/trunk/include/linux/tc_act/Kbuild b/trunk/include/linux/tc_act/Kbuild
index 67b501c302b2..e69de29bb2d1 100644
--- a/trunk/include/linux/tc_act/Kbuild
+++ b/trunk/include/linux/tc_act/Kbuild
@@ -1,7 +0,0 @@
-header-y += tc_gact.h
-header-y += tc_ipt.h
-header-y += tc_mirred.h
-header-y += tc_pedit.h
-header-y += tc_nat.h
-header-y += tc_skbedit.h
-header-y += tc_csum.h
diff --git a/trunk/include/uapi/linux/tc_act/Kbuild b/trunk/include/uapi/linux/tc_act/Kbuild
index aafaa5aa54d4..0623ec4e728f 100644
--- a/trunk/include/uapi/linux/tc_act/Kbuild
+++ b/trunk/include/uapi/linux/tc_act/Kbuild
@@ -1 +1,8 @@
 # UAPI Header export list
+header-y += tc_csum.h
+header-y += tc_gact.h
+header-y += tc_ipt.h
+header-y += tc_mirred.h
+header-y += tc_nat.h
+header-y += tc_pedit.h
+header-y += tc_skbedit.h
diff --git a/trunk/include/linux/tc_act/tc_csum.h b/trunk/include/uapi/linux/tc_act/tc_csum.h
similarity index 100%
rename from trunk/include/linux/tc_act/tc_csum.h
rename to trunk/include/uapi/linux/tc_act/tc_csum.h
diff --git a/trunk/include/linux/tc_act/tc_gact.h b/trunk/include/uapi/linux/tc_act/tc_gact.h
similarity index 100%
rename from trunk/include/linux/tc_act/tc_gact.h
rename to trunk/include/uapi/linux/tc_act/tc_gact.h
diff --git a/trunk/include/linux/tc_act/tc_ipt.h b/trunk/include/uapi/linux/tc_act/tc_ipt.h
similarity index 100%
rename from trunk/include/linux/tc_act/tc_ipt.h
rename to trunk/include/uapi/linux/tc_act/tc_ipt.h
diff --git a/trunk/include/linux/tc_act/tc_mirred.h b/trunk/include/uapi/linux/tc_act/tc_mirred.h
similarity index 100%
rename from trunk/include/linux/tc_act/tc_mirred.h
rename to trunk/include/uapi/linux/tc_act/tc_mirred.h
diff --git a/trunk/include/linux/tc_act/tc_nat.h b/trunk/include/uapi/linux/tc_act/tc_nat.h
similarity index 100%
rename from trunk/include/linux/tc_act/tc_nat.h
rename to trunk/include/uapi/linux/tc_act/tc_nat.h
diff --git a/trunk/include/linux/tc_act/tc_pedit.h b/trunk/include/uapi/linux/tc_act/tc_pedit.h
similarity index 100%
rename from trunk/include/linux/tc_act/tc_pedit.h
rename to trunk/include/uapi/linux/tc_act/tc_pedit.h
diff --git a/trunk/include/linux/tc_act/tc_skbedit.h b/trunk/include/uapi/linux/tc_act/tc_skbedit.h
similarity index 100%
rename from trunk/include/linux/tc_act/tc_skbedit.h
rename to trunk/include/uapi/linux/tc_act/tc_skbedit.h