vmm: Don't allow both greedy and SCP mode

[akaros.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3011874..bd10255 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,6 @@ update*
 hdd.img
 hdd.vdi
 *.*~
 hdd.img
 hdd.vdi
 *.*~

-ivy_errordb.sql

 Makelocal
 .textmate*
 .DS_*
 Makelocal
 .textmate*
 .DS_*


@@ -20,7 +19,11 @@ ros-project.tmproj
 kern/boot
 kern/include/arch
 kern/src/arch
 kern/boot
 kern/include/arch
 kern/src/arch

-user/parlib/include/arch
+kern/src/build_info.*
+kern/src/kconfig_info.c
+kern/src/error.c
+user/parlib/include/parlib/arch
+user/parlib/syscall_tbl.c

 Documentation/doxygen/rosdoc
 sim/
 sim
 Documentation/doxygen/rosdoc
 sim/
 sim


@@ -41,3 +44,6 @@ kern/include/generated/*
 tags
 TAGS
 cscope.*
 tags
 TAGS
 cscope.*

+*~
+#*
+*.log