Build updates for building upstream trees.

* Merge the guts of the various upstream branch buildconfigs into a
  single mk.linux-2.6 which they include.
* Add support for the -git snapshot branch.
* Update .hgignore to ignore all these new trees.
* Update buildconfigs/enable-xen-config to make the upstream defconfig
  compile without questions.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>

1 files changed, 2 insertions, 5 deletions

diff --git a/.hgignore b/.hgignore
index c449156827..c7c91874fa 100644
--- a/.hgignore
+++ b/.hgignore
@@ -62,14 +62,11 @@
 ^extras/mini-os/h/xen-public$
 ^extras/mini-os/mini-os.*$
 ^install/.*$
-^linux-[^/]*-native/.*$
-^linux-[^/]*-xen/.*$
-^linux-[^/]*-xen0/.*$
-^linux-[^/]*-xenU/.*$
 ^linux-[^/]*-paravirt/.*$
-^linux-[^/]*-mm/.*$
+^linux-2.6[^/]*/.*$
 ^linux-[^/]*-rc/.*$
 ^linux-[^/]*-tip/.*$
+^linux-[^/]*-git/.*$
 ^linux-[^/]*\.patch$
 ^mkddbxen$
 ^netbsd-[^/]*-tools/.*$