[linux] 01/06: Fold debian/config/README into debian/README.source

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 7275f364d987942bb00fdf9187f2a75202be4a61
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed May 18 03:17:59 2016 +0100

    Fold debian/config/README into debian/README.source
---
 debian/README.source | 11 ++++++++++-
 debian/changelog     |  1 +
 debian/config/README | 12 ------------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 86c0a46..fa5074e 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -131,8 +131,17 @@ architectures amd64, i386 and x32.
 
 Kernel config files
 ===================
+
 Configuration files are constructed dynamically from a number of config
-files, as listed in debian/config/<arch>/defines.
+files under debian/config, in the following order:
+
+- config
+- kernelarch-%kernel-arch/config
+- %arch/config
+- %arch/config.%flavour
+- featureset-%featureset/config
+- %arch/%featureset/config
+- %arch/%featureset/config.%flavour
 
 Control file
 ============
diff --git a/debian/changelog b/debian/changelog
index b040771..06d635c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ linux (4.6-1~exp2) UNRELEASED; urgency=medium
   * [tilegx] linux-libc-dev: Install <arch/*> headers in arch-specific
     directory (Closes: #823632; thanks to Helmut Grohne)
   * [rt] Update to 4.6-rc7-rt1 and re-enable
+  * Fold debian/config/README into debian/README.source
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 17 May 2016 23:33:30 +0100
 
diff --git a/debian/config/README b/debian/config/README
deleted file mode 100644
index cc02902..0000000
--- a/debian/config/README
+++ /dev/null
@@ -1,12 +0,0 @@
-Config files
-============
-
-Config files are included in the following order:
-- config
-- kernelarch-%kernel-arch/config
-- %arch/config
-- %arch/config.%flavour
-- featureset-%featureset/config
-- %arch/%featureset/config
-- %arch/%featureset/config.%flavour
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git