[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20121017141550.29084.28637.stgit@warthog.procyon.org.uk>
Date: Wed, 17 Oct 2012 15:15:51 +0100
From: David Howells <dhowells@...hat.com>
To: torvalds@...l.org
Cc: dhowells@...hat.com, linux-kernel@...r.kernel.org,
David Howells <dhowells@...hat.com>
Subject: [PATCH 04/10] UAPI: Remove empty non-UAPI Kbuild files
Remove non-UAPI Kbuild files that have become empty as a result of UAPI
disintegration. They used to have only header-y lines in them and those have
now moved to the Kbuild files in the corresponding uapi/ directories.
Possibly these should not be removed but rather have a comment inserted to say
they are intentionally left blank. This would make it easier to add generated
header lines in future without having to restore the infrastructure.
Note that at this point not all the UAPI disintegration parts have been merged,
so it is likely that more empty Kbuild files will turn up.
It is probably necessary to make the files non-empty to prevent the patch
program from automatically deleting them when it reduces them to nothing.
Signed-off-by: David Howells <dhowells@...hat.com>
---
include/Kbuild | 4 ----
include/asm-generic/Kbuild | 0
include/drm/Kbuild | 0
include/linux/Kbuild | 16 ----------------
include/linux/byteorder/Kbuild | 0
include/linux/caif/Kbuild | 0
include/linux/can/Kbuild | 0
include/linux/isdn/Kbuild | 0
include/linux/mmc/Kbuild | 0
include/linux/netfilter/Kbuild | 1 -
include/linux/netfilter/ipset/Kbuild | 0
include/linux/netfilter_arp/Kbuild | 0
include/linux/netfilter_bridge/Kbuild | 0
include/linux/netfilter_ipv4/Kbuild | 0
include/linux/netfilter_ipv6/Kbuild | 0
include/linux/nfsd/Kbuild | 0
include/linux/spi/Kbuild | 0
include/linux/sunrpc/Kbuild | 0
include/linux/tc_act/Kbuild | 0
include/linux/tc_ematch/Kbuild | 0
include/linux/wimax/Kbuild | 0
include/mtd/Kbuild | 0
include/xen/Kbuild | 0
23 files changed, 21 deletions(-)
delete mode 100644 include/asm-generic/Kbuild
delete mode 100644 include/drm/Kbuild
delete mode 100644 include/linux/byteorder/Kbuild
delete mode 100644 include/linux/caif/Kbuild
delete mode 100644 include/linux/can/Kbuild
delete mode 100644 include/linux/isdn/Kbuild
delete mode 100644 include/linux/mmc/Kbuild
delete mode 100644 include/linux/netfilter/Kbuild
delete mode 100644 include/linux/netfilter/ipset/Kbuild
delete mode 100644 include/linux/netfilter_arp/Kbuild
delete mode 100644 include/linux/netfilter_bridge/Kbuild
delete mode 100644 include/linux/netfilter_ipv4/Kbuild
delete mode 100644 include/linux/netfilter_ipv6/Kbuild
delete mode 100644 include/linux/nfsd/Kbuild
delete mode 100644 include/linux/spi/Kbuild
delete mode 100644 include/linux/sunrpc/Kbuild
delete mode 100644 include/linux/tc_act/Kbuild
delete mode 100644 include/linux/tc_ematch/Kbuild
delete mode 100644 include/linux/wimax/Kbuild
delete mode 100644 include/mtd/Kbuild
delete mode 100644 include/xen/Kbuild
diff --git a/include/Kbuild b/include/Kbuild
index 8d226bf..83256b6 100644
--- a/include/Kbuild
+++ b/include/Kbuild
@@ -1,12 +1,8 @@
# Top-level Makefile calls into asm-$(ARCH)
# List only non-arch directories below
-header-y += asm-generic/
header-y += linux/
header-y += sound/
-header-y += mtd/
header-y += rdma/
header-y += video/
-header-y += drm/
-header-y += xen/
header-y += scsi/
diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/drm/Kbuild b/include/drm/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 7729c58..7fe2dae 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -1,21 +1,5 @@
-header-y += byteorder/
-header-y += can/
-header-y += caif/
header-y += dvb/
header-y += hdlc/
header-y += hsi/
-header-y += isdn/
-header-y += mmc/
-header-y += nfsd/
header-y += raid/
-header-y += spi/
-header-y += sunrpc/
-header-y += tc_act/
-header-y += tc_ematch/
-header-y += netfilter/
-header-y += netfilter_arp/
-header-y += netfilter_bridge/
-header-y += netfilter_ipv4/
-header-y += netfilter_ipv6/
header-y += usb/
-header-y += wimax/
diff --git a/include/linux/byteorder/Kbuild b/include/linux/byteorder/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/linux/caif/Kbuild b/include/linux/caif/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/linux/can/Kbuild b/include/linux/can/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/linux/isdn/Kbuild b/include/linux/isdn/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/linux/mmc/Kbuild b/include/linux/mmc/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/linux/netfilter/Kbuild b/include/linux/netfilter/Kbuild
deleted file mode 100644
index b332202..0000000
--- a/include/linux/netfilter/Kbuild
+++ /dev/null
@@ -1 +0,0 @@
-header-y += ipset/
diff --git a/include/linux/netfilter/ipset/Kbuild b/include/linux/netfilter/ipset/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/linux/netfilter_arp/Kbuild b/include/linux/netfilter_arp/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/linux/netfilter_bridge/Kbuild b/include/linux/netfilter_bridge/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/linux/netfilter_ipv4/Kbuild b/include/linux/netfilter_ipv4/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/linux/netfilter_ipv6/Kbuild b/include/linux/netfilter_ipv6/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/linux/nfsd/Kbuild b/include/linux/nfsd/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/linux/spi/Kbuild b/include/linux/spi/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/linux/sunrpc/Kbuild b/include/linux/sunrpc/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/linux/tc_act/Kbuild b/include/linux/tc_act/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/linux/tc_ematch/Kbuild b/include/linux/tc_ematch/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/linux/wimax/Kbuild b/include/linux/wimax/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/mtd/Kbuild b/include/mtd/Kbuild
deleted file mode 100644
index e69de29..0000000
diff --git a/include/xen/Kbuild b/include/xen/Kbuild
deleted file mode 100644
index e69de29..0000000
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists