UBUNTU: (no-up): document the new ## scheme

Signed-off-by: Andy Whitcroft <apw@canonical.com>

2 files changed, 14 insertions, 0 deletions

diff --git a/ubuntu/Kconfig b/ubuntu/Kconfig
index e13b77f22c5..443457ed867 100644
--- a/ubuntu/Kconfig
+++ b/ubuntu/Kconfig
@@ -1,5 +1,12 @@
 menu "Ubuntu Supplied Third-Party Device Drivers"
 
+#
+# NOTE: to allow drivers to be added and removed without causing merge
+# collisions you should add new entries in the middle of the six lines
+# of ## at the bottom of the list.  Always add three lines of ## above
+# your new entry and maintain the six lines below.
+#
+
 ##
 ##
 ##
diff --git a/ubuntu/Makefile b/ubuntu/Makefile
index 4dc54c6736a..e7e5b29d7de 100644
--- a/ubuntu/Makefile
+++ b/ubuntu/Makefile
@@ -2,6 +2,13 @@
 # Makefile for the Linux kernel ubuntu supplied third-party device drivers.
 #
 
+#
+# NOTE: to allow drivers to be added and removed without causing merge
+# collisions you should add new entries in the middle of the six lines
+# of ## at the bottom of the list.  Always add three lines of ## above
+# your new entry and maintain the six lines below.
+#
+
 ##
 ##
 ##