diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in
index b514f98..3df388e 100644
--- a/kernel-binary.spec.in
+++ b/kernel-binary.spec.in
@@ -123,13 +123,13 @@ Obsoletes:      %name-nongpl < %version
 %endif
 # dead network if installed on SLES10, otherwise it will work (mostly)
 Conflicts:      sysfsutils < 2.0
-%if ! %build_vanilla
 Conflicts:      apparmor-profiles <= 2.1
 Conflicts:      apparmor-parser < 2.3
 # root-lvm only works with newer udevs
 Conflicts:      udev < 118
 Conflicts:      lvm2 < 2.02.33
-%endif
+# Interface to hv_kvp_daemon changed
+Conflicts:      hyper-v < 4
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
@@ -592,7 +592,8 @@ if [ %CONFIG_MODULES = y ]; then
     fi
     if [ $res -ne 0 ]; then
 	if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
-	     ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
+	     ! -e %_sourcedir/IGNORE-KABI-BADNESS -a \
+	     ! -e /etc/IGNORE-KABI-BADNESS ]; then
 	    echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
 		 "directory to build this kernel even though its badness is" \
 		 "higher than allowed for an official kernel."
diff --git a/kernel-cubox.changes b/kernel-cubox.changes
index 836cbf7..626a301 100644
--- a/kernel-cubox.changes
+++ b/kernel-cubox.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 17 20:02:14 CEST 2012 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Also check for /etc/IGNORE-KABI-BADNESS file
+  This allows to control the kabi checker from outside of the package.
+- commit 0a0900c
+
 -------------------------------------------------------------------
 Sat Oct 13 11:47:44 CEST 2012 - jslaby@suse.cz
 
@@ -40,6 +47,21 @@ Sun Oct  7 20:55:39 CEST 2012 - jslaby@suse.cz
 - Linux 3.6.1.
 - commit 1f7626a
 
+-------------------------------------------------------------------
+Thu Oct  4 15:55:59 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: enable Conflicts for
+  apparmor, udev and lvm2 also for vanilla kernel
+- commit a24206f
+
+-------------------------------------------------------------------
+Thu Oct  4 15:51:44 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: add Conflicht: hyper-v < 4
+  to make sure the daemon is in sync with the kernel
+  (bnc#770763 , fate#314441)
+- commit 86f9ba3
+
 -------------------------------------------------------------------
 Thu Oct  4 15:44:56 CEST 2012 - jbeulich@novell.com
 
diff --git a/kernel-cubox.spec b/kernel-cubox.spec
index 1c9ea79..a25b16e 100644
--- a/kernel-cubox.spec
+++ b/kernel-cubox.spec
@@ -123,13 +123,13 @@ Obsoletes:      %name-nongpl < %version
 %endif
 # dead network if installed on SLES10, otherwise it will work (mostly)
 Conflicts:      sysfsutils < 2.0
-%if ! %build_vanilla
 Conflicts:      apparmor-profiles <= 2.1
 Conflicts:      apparmor-parser < 2.3
 # root-lvm only works with newer udevs
 Conflicts:      udev < 118
 Conflicts:      lvm2 < 2.02.33
-%endif
+# Interface to hv_kvp_daemon changed
+Conflicts:      hyper-v < 4
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
@@ -668,7 +668,8 @@ if [ %CONFIG_MODULES = y ]; then
     fi
     if [ $res -ne 0 ]; then
 	if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
-	     ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
+	     ! -e %_sourcedir/IGNORE-KABI-BADNESS -a \
+	     ! -e /etc/IGNORE-KABI-BADNESS ]; then
 	    echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
 		 "directory to build this kernel even though its badness is" \
 		 "higher than allowed for an official kernel."
diff --git a/kernel-debug.changes b/kernel-debug.changes
index 836cbf7..626a301 100644
--- a/kernel-debug.changes
+++ b/kernel-debug.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 17 20:02:14 CEST 2012 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Also check for /etc/IGNORE-KABI-BADNESS file
+  This allows to control the kabi checker from outside of the package.
+- commit 0a0900c
+
 -------------------------------------------------------------------
 Sat Oct 13 11:47:44 CEST 2012 - jslaby@suse.cz
 
@@ -40,6 +47,21 @@ Sun Oct  7 20:55:39 CEST 2012 - jslaby@suse.cz
 - Linux 3.6.1.
 - commit 1f7626a
 
+-------------------------------------------------------------------
+Thu Oct  4 15:55:59 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: enable Conflicts for
+  apparmor, udev and lvm2 also for vanilla kernel
+- commit a24206f
+
+-------------------------------------------------------------------
+Thu Oct  4 15:51:44 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: add Conflicht: hyper-v < 4
+  to make sure the daemon is in sync with the kernel
+  (bnc#770763 , fate#314441)
+- commit 86f9ba3
+
 -------------------------------------------------------------------
 Thu Oct  4 15:44:56 CEST 2012 - jbeulich@novell.com
 
diff --git a/kernel-debug.spec b/kernel-debug.spec
index cbdb7d8..8135f56 100644
--- a/kernel-debug.spec
+++ b/kernel-debug.spec
@@ -123,13 +123,13 @@ Obsoletes:      %name-nongpl < %version
 %endif
 # dead network if installed on SLES10, otherwise it will work (mostly)
 Conflicts:      sysfsutils < 2.0
-%if ! %build_vanilla
 Conflicts:      apparmor-profiles <= 2.1
 Conflicts:      apparmor-parser < 2.3
 # root-lvm only works with newer udevs
 Conflicts:      udev < 118
 Conflicts:      lvm2 < 2.02.33
-%endif
+# Interface to hv_kvp_daemon changed
+Conflicts:      hyper-v < 4
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
@@ -671,7 +671,8 @@ if [ %CONFIG_MODULES = y ]; then
     fi
     if [ $res -ne 0 ]; then
 	if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
-	     ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
+	     ! -e %_sourcedir/IGNORE-KABI-BADNESS -a \
+	     ! -e /etc/IGNORE-KABI-BADNESS ]; then
 	    echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
 		 "directory to build this kernel even though its badness is" \
 		 "higher than allowed for an official kernel."
diff --git a/kernel-default.changes b/kernel-default.changes
index 836cbf7..626a301 100644
--- a/kernel-default.changes
+++ b/kernel-default.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 17 20:02:14 CEST 2012 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Also check for /etc/IGNORE-KABI-BADNESS file
+  This allows to control the kabi checker from outside of the package.
+- commit 0a0900c
+
 -------------------------------------------------------------------
 Sat Oct 13 11:47:44 CEST 2012 - jslaby@suse.cz
 
@@ -40,6 +47,21 @@ Sun Oct  7 20:55:39 CEST 2012 - jslaby@suse.cz
 - Linux 3.6.1.
 - commit 1f7626a
 
+-------------------------------------------------------------------
+Thu Oct  4 15:55:59 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: enable Conflicts for
+  apparmor, udev and lvm2 also for vanilla kernel
+- commit a24206f
+
+-------------------------------------------------------------------
+Thu Oct  4 15:51:44 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: add Conflicht: hyper-v < 4
+  to make sure the daemon is in sync with the kernel
+  (bnc#770763 , fate#314441)
+- commit 86f9ba3
+
 -------------------------------------------------------------------
 Thu Oct  4 15:44:56 CEST 2012 - jbeulich@novell.com
 
diff --git a/kernel-default.spec b/kernel-default.spec
index cc1d1a3..cd10b67 100644
--- a/kernel-default.spec
+++ b/kernel-default.spec
@@ -123,13 +123,13 @@ Obsoletes:      %name-nongpl < %version
 %endif
 # dead network if installed on SLES10, otherwise it will work (mostly)
 Conflicts:      sysfsutils < 2.0
-%if ! %build_vanilla
 Conflicts:      apparmor-profiles <= 2.1
 Conflicts:      apparmor-parser < 2.3
 # root-lvm only works with newer udevs
 Conflicts:      udev < 118
 Conflicts:      lvm2 < 2.02.33
-%endif
+# Interface to hv_kvp_daemon changed
+Conflicts:      hyper-v < 4
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
@@ -686,7 +686,8 @@ if [ %CONFIG_MODULES = y ]; then
     fi
     if [ $res -ne 0 ]; then
 	if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
-	     ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
+	     ! -e %_sourcedir/IGNORE-KABI-BADNESS -a \
+	     ! -e /etc/IGNORE-KABI-BADNESS ]; then
 	    echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
 		 "directory to build this kernel even though its badness is" \
 		 "higher than allowed for an official kernel."
diff --git a/kernel-desktop.changes b/kernel-desktop.changes
index 836cbf7..626a301 100644
--- a/kernel-desktop.changes
+++ b/kernel-desktop.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 17 20:02:14 CEST 2012 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Also check for /etc/IGNORE-KABI-BADNESS file
+  This allows to control the kabi checker from outside of the package.
+- commit 0a0900c
+
 -------------------------------------------------------------------
 Sat Oct 13 11:47:44 CEST 2012 - jslaby@suse.cz
 
@@ -40,6 +47,21 @@ Sun Oct  7 20:55:39 CEST 2012 - jslaby@suse.cz
 - Linux 3.6.1.
 - commit 1f7626a
 
+-------------------------------------------------------------------
+Thu Oct  4 15:55:59 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: enable Conflicts for
+  apparmor, udev and lvm2 also for vanilla kernel
+- commit a24206f
+
+-------------------------------------------------------------------
+Thu Oct  4 15:51:44 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: add Conflicht: hyper-v < 4
+  to make sure the daemon is in sync with the kernel
+  (bnc#770763 , fate#314441)
+- commit 86f9ba3
+
 -------------------------------------------------------------------
 Thu Oct  4 15:44:56 CEST 2012 - jbeulich@novell.com
 
diff --git a/kernel-desktop.spec b/kernel-desktop.spec
index 2eb0f92..8c489fc 100644
--- a/kernel-desktop.spec
+++ b/kernel-desktop.spec
@@ -123,13 +123,13 @@ Obsoletes:      %name-nongpl < %version
 %endif
 # dead network if installed on SLES10, otherwise it will work (mostly)
 Conflicts:      sysfsutils < 2.0
-%if ! %build_vanilla
 Conflicts:      apparmor-profiles <= 2.1
 Conflicts:      apparmor-parser < 2.3
 # root-lvm only works with newer udevs
 Conflicts:      udev < 118
 Conflicts:      lvm2 < 2.02.33
-%endif
+# Interface to hv_kvp_daemon changed
+Conflicts:      hyper-v < 4
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
@@ -680,7 +680,8 @@ if [ %CONFIG_MODULES = y ]; then
     fi
     if [ $res -ne 0 ]; then
 	if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
-	     ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
+	     ! -e %_sourcedir/IGNORE-KABI-BADNESS -a \
+	     ! -e /etc/IGNORE-KABI-BADNESS ]; then
 	    echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
 		 "directory to build this kernel even though its badness is" \
 		 "higher than allowed for an official kernel."
diff --git a/kernel-docs.changes b/kernel-docs.changes
index 836cbf7..626a301 100644
--- a/kernel-docs.changes
+++ b/kernel-docs.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 17 20:02:14 CEST 2012 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Also check for /etc/IGNORE-KABI-BADNESS file
+  This allows to control the kabi checker from outside of the package.
+- commit 0a0900c
+
 -------------------------------------------------------------------
 Sat Oct 13 11:47:44 CEST 2012 - jslaby@suse.cz
 
@@ -40,6 +47,21 @@ Sun Oct  7 20:55:39 CEST 2012 - jslaby@suse.cz
 - Linux 3.6.1.
 - commit 1f7626a
 
+-------------------------------------------------------------------
+Thu Oct  4 15:55:59 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: enable Conflicts for
+  apparmor, udev and lvm2 also for vanilla kernel
+- commit a24206f
+
+-------------------------------------------------------------------
+Thu Oct  4 15:51:44 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: add Conflicht: hyper-v < 4
+  to make sure the daemon is in sync with the kernel
+  (bnc#770763 , fate#314441)
+- commit 86f9ba3
+
 -------------------------------------------------------------------
 Thu Oct  4 15:44:56 CEST 2012 - jbeulich@novell.com
 
diff --git a/kernel-ec2.changes b/kernel-ec2.changes
index 836cbf7..626a301 100644
--- a/kernel-ec2.changes
+++ b/kernel-ec2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 17 20:02:14 CEST 2012 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Also check for /etc/IGNORE-KABI-BADNESS file
+  This allows to control the kabi checker from outside of the package.
+- commit 0a0900c
+
 -------------------------------------------------------------------
 Sat Oct 13 11:47:44 CEST 2012 - jslaby@suse.cz
 
@@ -40,6 +47,21 @@ Sun Oct  7 20:55:39 CEST 2012 - jslaby@suse.cz
 - Linux 3.6.1.
 - commit 1f7626a
 
+-------------------------------------------------------------------
+Thu Oct  4 15:55:59 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: enable Conflicts for
+  apparmor, udev and lvm2 also for vanilla kernel
+- commit a24206f
+
+-------------------------------------------------------------------
+Thu Oct  4 15:51:44 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: add Conflicht: hyper-v < 4
+  to make sure the daemon is in sync with the kernel
+  (bnc#770763 , fate#314441)
+- commit 86f9ba3
+
 -------------------------------------------------------------------
 Thu Oct  4 15:44:56 CEST 2012 - jbeulich@novell.com
 
diff --git a/kernel-ec2.spec b/kernel-ec2.spec
index 93f814f..1ce20bb 100644
--- a/kernel-ec2.spec
+++ b/kernel-ec2.spec
@@ -123,13 +123,13 @@ Obsoletes:      %name-nongpl < %version
 %endif
 # dead network if installed on SLES10, otherwise it will work (mostly)
 Conflicts:      sysfsutils < 2.0
-%if ! %build_vanilla
 Conflicts:      apparmor-profiles <= 2.1
 Conflicts:      apparmor-parser < 2.3
 # root-lvm only works with newer udevs
 Conflicts:      udev < 118
 Conflicts:      lvm2 < 2.02.33
-%endif
+# Interface to hv_kvp_daemon changed
+Conflicts:      hyper-v < 4
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
@@ -670,7 +670,8 @@ if [ %CONFIG_MODULES = y ]; then
     fi
     if [ $res -ne 0 ]; then
 	if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
-	     ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
+	     ! -e %_sourcedir/IGNORE-KABI-BADNESS -a \
+	     ! -e /etc/IGNORE-KABI-BADNESS ]; then
 	    echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
 		 "directory to build this kernel even though its badness is" \
 		 "higher than allowed for an official kernel."
diff --git a/kernel-exynos.changes b/kernel-exynos.changes
index 836cbf7..626a301 100644
--- a/kernel-exynos.changes
+++ b/kernel-exynos.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 17 20:02:14 CEST 2012 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Also check for /etc/IGNORE-KABI-BADNESS file
+  This allows to control the kabi checker from outside of the package.
+- commit 0a0900c
+
 -------------------------------------------------------------------
 Sat Oct 13 11:47:44 CEST 2012 - jslaby@suse.cz
 
@@ -40,6 +47,21 @@ Sun Oct  7 20:55:39 CEST 2012 - jslaby@suse.cz
 - Linux 3.6.1.
 - commit 1f7626a
 
+-------------------------------------------------------------------
+Thu Oct  4 15:55:59 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: enable Conflicts for
+  apparmor, udev and lvm2 also for vanilla kernel
+- commit a24206f
+
+-------------------------------------------------------------------
+Thu Oct  4 15:51:44 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: add Conflicht: hyper-v < 4
+  to make sure the daemon is in sync with the kernel
+  (bnc#770763 , fate#314441)
+- commit 86f9ba3
+
 -------------------------------------------------------------------
 Thu Oct  4 15:44:56 CEST 2012 - jbeulich@novell.com
 
diff --git a/kernel-exynos.spec b/kernel-exynos.spec
index 4db742e..b6e5eb9 100644
--- a/kernel-exynos.spec
+++ b/kernel-exynos.spec
@@ -123,13 +123,13 @@ Obsoletes:      %name-nongpl < %version
 %endif
 # dead network if installed on SLES10, otherwise it will work (mostly)
 Conflicts:      sysfsutils < 2.0
-%if ! %build_vanilla
 Conflicts:      apparmor-profiles <= 2.1
 Conflicts:      apparmor-parser < 2.3
 # root-lvm only works with newer udevs
 Conflicts:      udev < 118
 Conflicts:      lvm2 < 2.02.33
-%endif
+# Interface to hv_kvp_daemon changed
+Conflicts:      hyper-v < 4
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
@@ -667,7 +667,8 @@ if [ %CONFIG_MODULES = y ]; then
     fi
     if [ $res -ne 0 ]; then
 	if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
-	     ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
+	     ! -e %_sourcedir/IGNORE-KABI-BADNESS -a \
+	     ! -e /etc/IGNORE-KABI-BADNESS ]; then
 	    echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
 		 "directory to build this kernel even though its badness is" \
 		 "higher than allowed for an official kernel."
diff --git a/kernel-highbank.changes b/kernel-highbank.changes
index 836cbf7..626a301 100644
--- a/kernel-highbank.changes
+++ b/kernel-highbank.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 17 20:02:14 CEST 2012 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Also check for /etc/IGNORE-KABI-BADNESS file
+  This allows to control the kabi checker from outside of the package.
+- commit 0a0900c
+
 -------------------------------------------------------------------
 Sat Oct 13 11:47:44 CEST 2012 - jslaby@suse.cz
 
@@ -40,6 +47,21 @@ Sun Oct  7 20:55:39 CEST 2012 - jslaby@suse.cz
 - Linux 3.6.1.
 - commit 1f7626a
 
+-------------------------------------------------------------------
+Thu Oct  4 15:55:59 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: enable Conflicts for
+  apparmor, udev and lvm2 also for vanilla kernel
+- commit a24206f
+
+-------------------------------------------------------------------
+Thu Oct  4 15:51:44 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: add Conflicht: hyper-v < 4
+  to make sure the daemon is in sync with the kernel
+  (bnc#770763 , fate#314441)
+- commit 86f9ba3
+
 -------------------------------------------------------------------
 Thu Oct  4 15:44:56 CEST 2012 - jbeulich@novell.com
 
diff --git a/kernel-highbank.spec b/kernel-highbank.spec
index ce625bc..9835a04 100644
--- a/kernel-highbank.spec
+++ b/kernel-highbank.spec
@@ -123,13 +123,13 @@ Obsoletes:      %name-nongpl < %version
 %endif
 # dead network if installed on SLES10, otherwise it will work (mostly)
 Conflicts:      sysfsutils < 2.0
-%if ! %build_vanilla
 Conflicts:      apparmor-profiles <= 2.1
 Conflicts:      apparmor-parser < 2.3
 # root-lvm only works with newer udevs
 Conflicts:      udev < 118
 Conflicts:      lvm2 < 2.02.33
-%endif
+# Interface to hv_kvp_daemon changed
+Conflicts:      hyper-v < 4
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
@@ -667,7 +667,8 @@ if [ %CONFIG_MODULES = y ]; then
     fi
     if [ $res -ne 0 ]; then
 	if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
-	     ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
+	     ! -e %_sourcedir/IGNORE-KABI-BADNESS -a \
+	     ! -e /etc/IGNORE-KABI-BADNESS ]; then
 	    echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
 		 "directory to build this kernel even though its badness is" \
 		 "higher than allowed for an official kernel."
diff --git a/kernel-imx51.changes b/kernel-imx51.changes
index 836cbf7..626a301 100644
--- a/kernel-imx51.changes
+++ b/kernel-imx51.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 17 20:02:14 CEST 2012 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Also check for /etc/IGNORE-KABI-BADNESS file
+  This allows to control the kabi checker from outside of the package.
+- commit 0a0900c
+
 -------------------------------------------------------------------
 Sat Oct 13 11:47:44 CEST 2012 - jslaby@suse.cz
 
@@ -40,6 +47,21 @@ Sun Oct  7 20:55:39 CEST 2012 - jslaby@suse.cz
 - Linux 3.6.1.
 - commit 1f7626a
 
+-------------------------------------------------------------------
+Thu Oct  4 15:55:59 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: enable Conflicts for
+  apparmor, udev and lvm2 also for vanilla kernel
+- commit a24206f
+
+-------------------------------------------------------------------
+Thu Oct  4 15:51:44 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: add Conflicht: hyper-v < 4
+  to make sure the daemon is in sync with the kernel
+  (bnc#770763 , fate#314441)
+- commit 86f9ba3
+
 -------------------------------------------------------------------
 Thu Oct  4 15:44:56 CEST 2012 - jbeulich@novell.com
 
diff --git a/kernel-imx51.spec b/kernel-imx51.spec
index d84469a..6160d2a 100644
--- a/kernel-imx51.spec
+++ b/kernel-imx51.spec
@@ -123,13 +123,13 @@ Obsoletes:      %name-nongpl < %version
 %endif
 # dead network if installed on SLES10, otherwise it will work (mostly)
 Conflicts:      sysfsutils < 2.0
-%if ! %build_vanilla
 Conflicts:      apparmor-profiles <= 2.1
 Conflicts:      apparmor-parser < 2.3
 # root-lvm only works with newer udevs
 Conflicts:      udev < 118
 Conflicts:      lvm2 < 2.02.33
-%endif
+# Interface to hv_kvp_daemon changed
+Conflicts:      hyper-v < 4
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
@@ -668,7 +668,8 @@ if [ %CONFIG_MODULES = y ]; then
     fi
     if [ $res -ne 0 ]; then
 	if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
-	     ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
+	     ! -e %_sourcedir/IGNORE-KABI-BADNESS -a \
+	     ! -e /etc/IGNORE-KABI-BADNESS ]; then
 	    echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
 		 "directory to build this kernel even though its badness is" \
 		 "higher than allowed for an official kernel."
diff --git a/kernel-omap2plus.changes b/kernel-omap2plus.changes
index 836cbf7..626a301 100644
--- a/kernel-omap2plus.changes
+++ b/kernel-omap2plus.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 17 20:02:14 CEST 2012 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Also check for /etc/IGNORE-KABI-BADNESS file
+  This allows to control the kabi checker from outside of the package.
+- commit 0a0900c
+
 -------------------------------------------------------------------
 Sat Oct 13 11:47:44 CEST 2012 - jslaby@suse.cz
 
@@ -40,6 +47,21 @@ Sun Oct  7 20:55:39 CEST 2012 - jslaby@suse.cz
 - Linux 3.6.1.
 - commit 1f7626a
 
+-------------------------------------------------------------------
+Thu Oct  4 15:55:59 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: enable Conflicts for
+  apparmor, udev and lvm2 also for vanilla kernel
+- commit a24206f
+
+-------------------------------------------------------------------
+Thu Oct  4 15:51:44 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: add Conflicht: hyper-v < 4
+  to make sure the daemon is in sync with the kernel
+  (bnc#770763 , fate#314441)
+- commit 86f9ba3
+
 -------------------------------------------------------------------
 Thu Oct  4 15:44:56 CEST 2012 - jbeulich@novell.com
 
diff --git a/kernel-omap2plus.spec b/kernel-omap2plus.spec
index ecee422..b0f7828 100644
--- a/kernel-omap2plus.spec
+++ b/kernel-omap2plus.spec
@@ -123,13 +123,13 @@ Obsoletes:      %name-nongpl < %version
 %endif
 # dead network if installed on SLES10, otherwise it will work (mostly)
 Conflicts:      sysfsutils < 2.0
-%if ! %build_vanilla
 Conflicts:      apparmor-profiles <= 2.1
 Conflicts:      apparmor-parser < 2.3
 # root-lvm only works with newer udevs
 Conflicts:      udev < 118
 Conflicts:      lvm2 < 2.02.33
-%endif
+# Interface to hv_kvp_daemon changed
+Conflicts:      hyper-v < 4
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
@@ -668,7 +668,8 @@ if [ %CONFIG_MODULES = y ]; then
     fi
     if [ $res -ne 0 ]; then
 	if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
-	     ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
+	     ! -e %_sourcedir/IGNORE-KABI-BADNESS -a \
+	     ! -e /etc/IGNORE-KABI-BADNESS ]; then
 	    echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
 		 "directory to build this kernel even though its badness is" \
 		 "higher than allowed for an official kernel."
diff --git a/kernel-pae.changes b/kernel-pae.changes
index 836cbf7..626a301 100644
--- a/kernel-pae.changes
+++ b/kernel-pae.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 17 20:02:14 CEST 2012 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Also check for /etc/IGNORE-KABI-BADNESS file
+  This allows to control the kabi checker from outside of the package.
+- commit 0a0900c
+
 -------------------------------------------------------------------
 Sat Oct 13 11:47:44 CEST 2012 - jslaby@suse.cz
 
@@ -40,6 +47,21 @@ Sun Oct  7 20:55:39 CEST 2012 - jslaby@suse.cz
 - Linux 3.6.1.
 - commit 1f7626a
 
+-------------------------------------------------------------------
+Thu Oct  4 15:55:59 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: enable Conflicts for
+  apparmor, udev and lvm2 also for vanilla kernel
+- commit a24206f
+
+-------------------------------------------------------------------
+Thu Oct  4 15:51:44 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: add Conflicht: hyper-v < 4
+  to make sure the daemon is in sync with the kernel
+  (bnc#770763 , fate#314441)
+- commit 86f9ba3
+
 -------------------------------------------------------------------
 Thu Oct  4 15:44:56 CEST 2012 - jbeulich@novell.com
 
diff --git a/kernel-pae.spec b/kernel-pae.spec
index 36e7129..a8964b2 100644
--- a/kernel-pae.spec
+++ b/kernel-pae.spec
@@ -123,13 +123,13 @@ Obsoletes:      %name-nongpl < %version
 %endif
 # dead network if installed on SLES10, otherwise it will work (mostly)
 Conflicts:      sysfsutils < 2.0
-%if ! %build_vanilla
 Conflicts:      apparmor-profiles <= 2.1
 Conflicts:      apparmor-parser < 2.3
 # root-lvm only works with newer udevs
 Conflicts:      udev < 118
 Conflicts:      lvm2 < 2.02.33
-%endif
+# Interface to hv_kvp_daemon changed
+Conflicts:      hyper-v < 4
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
@@ -677,7 +677,8 @@ if [ %CONFIG_MODULES = y ]; then
     fi
     if [ $res -ne 0 ]; then
 	if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
-	     ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
+	     ! -e %_sourcedir/IGNORE-KABI-BADNESS -a \
+	     ! -e /etc/IGNORE-KABI-BADNESS ]; then
 	    echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
 		 "directory to build this kernel even though its badness is" \
 		 "higher than allowed for an official kernel."
diff --git a/kernel-ppc64.changes b/kernel-ppc64.changes
index 836cbf7..626a301 100644
--- a/kernel-ppc64.changes
+++ b/kernel-ppc64.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 17 20:02:14 CEST 2012 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Also check for /etc/IGNORE-KABI-BADNESS file
+  This allows to control the kabi checker from outside of the package.
+- commit 0a0900c
+
 -------------------------------------------------------------------
 Sat Oct 13 11:47:44 CEST 2012 - jslaby@suse.cz
 
@@ -40,6 +47,21 @@ Sun Oct  7 20:55:39 CEST 2012 - jslaby@suse.cz
 - Linux 3.6.1.
 - commit 1f7626a
 
+-------------------------------------------------------------------
+Thu Oct  4 15:55:59 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: enable Conflicts for
+  apparmor, udev and lvm2 also for vanilla kernel
+- commit a24206f
+
+-------------------------------------------------------------------
+Thu Oct  4 15:51:44 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: add Conflicht: hyper-v < 4
+  to make sure the daemon is in sync with the kernel
+  (bnc#770763 , fate#314441)
+- commit 86f9ba3
+
 -------------------------------------------------------------------
 Thu Oct  4 15:44:56 CEST 2012 - jbeulich@novell.com
 
diff --git a/kernel-ppc64.spec b/kernel-ppc64.spec
index 3ea16a1..cbc373a 100644
--- a/kernel-ppc64.spec
+++ b/kernel-ppc64.spec
@@ -123,13 +123,13 @@ Obsoletes:      %name-nongpl < %version
 %endif
 # dead network if installed on SLES10, otherwise it will work (mostly)
 Conflicts:      sysfsutils < 2.0
-%if ! %build_vanilla
 Conflicts:      apparmor-profiles <= 2.1
 Conflicts:      apparmor-parser < 2.3
 # root-lvm only works with newer udevs
 Conflicts:      udev < 118
 Conflicts:      lvm2 < 2.02.33
-%endif
+# Interface to hv_kvp_daemon changed
+Conflicts:      hyper-v < 4
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
@@ -681,7 +681,8 @@ if [ %CONFIG_MODULES = y ]; then
     fi
     if [ $res -ne 0 ]; then
 	if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
-	     ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
+	     ! -e %_sourcedir/IGNORE-KABI-BADNESS -a \
+	     ! -e /etc/IGNORE-KABI-BADNESS ]; then
 	    echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
 		 "directory to build this kernel even though its badness is" \
 		 "higher than allowed for an official kernel."
diff --git a/kernel-s390.changes b/kernel-s390.changes
index 836cbf7..626a301 100644
--- a/kernel-s390.changes
+++ b/kernel-s390.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 17 20:02:14 CEST 2012 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Also check for /etc/IGNORE-KABI-BADNESS file
+  This allows to control the kabi checker from outside of the package.
+- commit 0a0900c
+
 -------------------------------------------------------------------
 Sat Oct 13 11:47:44 CEST 2012 - jslaby@suse.cz
 
@@ -40,6 +47,21 @@ Sun Oct  7 20:55:39 CEST 2012 - jslaby@suse.cz
 - Linux 3.6.1.
 - commit 1f7626a
 
+-------------------------------------------------------------------
+Thu Oct  4 15:55:59 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: enable Conflicts for
+  apparmor, udev and lvm2 also for vanilla kernel
+- commit a24206f
+
+-------------------------------------------------------------------
+Thu Oct  4 15:51:44 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: add Conflicht: hyper-v < 4
+  to make sure the daemon is in sync with the kernel
+  (bnc#770763 , fate#314441)
+- commit 86f9ba3
+
 -------------------------------------------------------------------
 Thu Oct  4 15:44:56 CEST 2012 - jbeulich@novell.com
 
diff --git a/kernel-s390.spec b/kernel-s390.spec
index 1959924..ca5a6c6 100644
--- a/kernel-s390.spec
+++ b/kernel-s390.spec
@@ -123,13 +123,13 @@ Obsoletes:      %name-nongpl < %version
 %endif
 # dead network if installed on SLES10, otherwise it will work (mostly)
 Conflicts:      sysfsutils < 2.0
-%if ! %build_vanilla
 Conflicts:      apparmor-profiles <= 2.1
 Conflicts:      apparmor-parser < 2.3
 # root-lvm only works with newer udevs
 Conflicts:      udev < 118
 Conflicts:      lvm2 < 2.02.33
-%endif
+# Interface to hv_kvp_daemon changed
+Conflicts:      hyper-v < 4
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
@@ -670,7 +670,8 @@ if [ %CONFIG_MODULES = y ]; then
     fi
     if [ $res -ne 0 ]; then
 	if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
-	     ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
+	     ! -e %_sourcedir/IGNORE-KABI-BADNESS -a \
+	     ! -e /etc/IGNORE-KABI-BADNESS ]; then
 	    echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
 		 "directory to build this kernel even though its badness is" \
 		 "higher than allowed for an official kernel."
diff --git a/kernel-source.changes b/kernel-source.changes
index 836cbf7..626a301 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 17 20:02:14 CEST 2012 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Also check for /etc/IGNORE-KABI-BADNESS file
+  This allows to control the kabi checker from outside of the package.
+- commit 0a0900c
+
 -------------------------------------------------------------------
 Sat Oct 13 11:47:44 CEST 2012 - jslaby@suse.cz
 
@@ -40,6 +47,21 @@ Sun Oct  7 20:55:39 CEST 2012 - jslaby@suse.cz
 - Linux 3.6.1.
 - commit 1f7626a
 
+-------------------------------------------------------------------
+Thu Oct  4 15:55:59 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: enable Conflicts for
+  apparmor, udev and lvm2 also for vanilla kernel
+- commit a24206f
+
+-------------------------------------------------------------------
+Thu Oct  4 15:51:44 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: add Conflicht: hyper-v < 4
+  to make sure the daemon is in sync with the kernel
+  (bnc#770763 , fate#314441)
+- commit 86f9ba3
+
 -------------------------------------------------------------------
 Thu Oct  4 15:44:56 CEST 2012 - jbeulich@novell.com
 
diff --git a/kernel-syms.changes b/kernel-syms.changes
index 836cbf7..626a301 100644
--- a/kernel-syms.changes
+++ b/kernel-syms.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 17 20:02:14 CEST 2012 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Also check for /etc/IGNORE-KABI-BADNESS file
+  This allows to control the kabi checker from outside of the package.
+- commit 0a0900c
+
 -------------------------------------------------------------------
 Sat Oct 13 11:47:44 CEST 2012 - jslaby@suse.cz
 
@@ -40,6 +47,21 @@ Sun Oct  7 20:55:39 CEST 2012 - jslaby@suse.cz
 - Linux 3.6.1.
 - commit 1f7626a
 
+-------------------------------------------------------------------
+Thu Oct  4 15:55:59 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: enable Conflicts for
+  apparmor, udev and lvm2 also for vanilla kernel
+- commit a24206f
+
+-------------------------------------------------------------------
+Thu Oct  4 15:51:44 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: add Conflicht: hyper-v < 4
+  to make sure the daemon is in sync with the kernel
+  (bnc#770763 , fate#314441)
+- commit 86f9ba3
+
 -------------------------------------------------------------------
 Thu Oct  4 15:44:56 CEST 2012 - jbeulich@novell.com
 
diff --git a/kernel-tegra.changes b/kernel-tegra.changes
index 836cbf7..626a301 100644
--- a/kernel-tegra.changes
+++ b/kernel-tegra.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 17 20:02:14 CEST 2012 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Also check for /etc/IGNORE-KABI-BADNESS file
+  This allows to control the kabi checker from outside of the package.
+- commit 0a0900c
+
 -------------------------------------------------------------------
 Sat Oct 13 11:47:44 CEST 2012 - jslaby@suse.cz
 
@@ -40,6 +47,21 @@ Sun Oct  7 20:55:39 CEST 2012 - jslaby@suse.cz
 - Linux 3.6.1.
 - commit 1f7626a
 
+-------------------------------------------------------------------
+Thu Oct  4 15:55:59 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: enable Conflicts for
+  apparmor, udev and lvm2 also for vanilla kernel
+- commit a24206f
+
+-------------------------------------------------------------------
+Thu Oct  4 15:51:44 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: add Conflicht: hyper-v < 4
+  to make sure the daemon is in sync with the kernel
+  (bnc#770763 , fate#314441)
+- commit 86f9ba3
+
 -------------------------------------------------------------------
 Thu Oct  4 15:44:56 CEST 2012 - jbeulich@novell.com
 
diff --git a/kernel-tegra.spec b/kernel-tegra.spec
index 8d15fe6..75214ff 100644
--- a/kernel-tegra.spec
+++ b/kernel-tegra.spec
@@ -123,13 +123,13 @@ Obsoletes:      %name-nongpl < %version
 %endif
 # dead network if installed on SLES10, otherwise it will work (mostly)
 Conflicts:      sysfsutils < 2.0
-%if ! %build_vanilla
 Conflicts:      apparmor-profiles <= 2.1
 Conflicts:      apparmor-parser < 2.3
 # root-lvm only works with newer udevs
 Conflicts:      udev < 118
 Conflicts:      lvm2 < 2.02.33
-%endif
+# Interface to hv_kvp_daemon changed
+Conflicts:      hyper-v < 4
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
@@ -668,7 +668,8 @@ if [ %CONFIG_MODULES = y ]; then
     fi
     if [ $res -ne 0 ]; then
 	if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
-	     ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
+	     ! -e %_sourcedir/IGNORE-KABI-BADNESS -a \
+	     ! -e /etc/IGNORE-KABI-BADNESS ]; then
 	    echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
 		 "directory to build this kernel even though its badness is" \
 		 "higher than allowed for an official kernel."
diff --git a/kernel-trace.changes b/kernel-trace.changes
index 836cbf7..626a301 100644
--- a/kernel-trace.changes
+++ b/kernel-trace.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 17 20:02:14 CEST 2012 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Also check for /etc/IGNORE-KABI-BADNESS file
+  This allows to control the kabi checker from outside of the package.
+- commit 0a0900c
+
 -------------------------------------------------------------------
 Sat Oct 13 11:47:44 CEST 2012 - jslaby@suse.cz
 
@@ -40,6 +47,21 @@ Sun Oct  7 20:55:39 CEST 2012 - jslaby@suse.cz
 - Linux 3.6.1.
 - commit 1f7626a
 
+-------------------------------------------------------------------
+Thu Oct  4 15:55:59 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: enable Conflicts for
+  apparmor, udev and lvm2 also for vanilla kernel
+- commit a24206f
+
+-------------------------------------------------------------------
+Thu Oct  4 15:51:44 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: add Conflicht: hyper-v < 4
+  to make sure the daemon is in sync with the kernel
+  (bnc#770763 , fate#314441)
+- commit 86f9ba3
+
 -------------------------------------------------------------------
 Thu Oct  4 15:44:56 CEST 2012 - jbeulich@novell.com
 
diff --git a/kernel-trace.spec b/kernel-trace.spec
index 9fcc320..fe2e5e1 100644
--- a/kernel-trace.spec
+++ b/kernel-trace.spec
@@ -123,13 +123,13 @@ Obsoletes:      %name-nongpl < %version
 %endif
 # dead network if installed on SLES10, otherwise it will work (mostly)
 Conflicts:      sysfsutils < 2.0
-%if ! %build_vanilla
 Conflicts:      apparmor-profiles <= 2.1
 Conflicts:      apparmor-parser < 2.3
 # root-lvm only works with newer udevs
 Conflicts:      udev < 118
 Conflicts:      lvm2 < 2.02.33
-%endif
+# Interface to hv_kvp_daemon changed
+Conflicts:      hyper-v < 4
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
@@ -678,7 +678,8 @@ if [ %CONFIG_MODULES = y ]; then
     fi
     if [ $res -ne 0 ]; then
 	if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
-	     ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
+	     ! -e %_sourcedir/IGNORE-KABI-BADNESS -a \
+	     ! -e /etc/IGNORE-KABI-BADNESS ]; then
 	    echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
 		 "directory to build this kernel even though its badness is" \
 		 "higher than allowed for an official kernel."
diff --git a/kernel-u8500.changes b/kernel-u8500.changes
index 836cbf7..626a301 100644
--- a/kernel-u8500.changes
+++ b/kernel-u8500.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 17 20:02:14 CEST 2012 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Also check for /etc/IGNORE-KABI-BADNESS file
+  This allows to control the kabi checker from outside of the package.
+- commit 0a0900c
+
 -------------------------------------------------------------------
 Sat Oct 13 11:47:44 CEST 2012 - jslaby@suse.cz
 
@@ -40,6 +47,21 @@ Sun Oct  7 20:55:39 CEST 2012 - jslaby@suse.cz
 - Linux 3.6.1.
 - commit 1f7626a
 
+-------------------------------------------------------------------
+Thu Oct  4 15:55:59 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: enable Conflicts for
+  apparmor, udev and lvm2 also for vanilla kernel
+- commit a24206f
+
+-------------------------------------------------------------------
+Thu Oct  4 15:51:44 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: add Conflicht: hyper-v < 4
+  to make sure the daemon is in sync with the kernel
+  (bnc#770763 , fate#314441)
+- commit 86f9ba3
+
 -------------------------------------------------------------------
 Thu Oct  4 15:44:56 CEST 2012 - jbeulich@novell.com
 
diff --git a/kernel-u8500.spec b/kernel-u8500.spec
index 591cfb6..b3db9b1 100644
--- a/kernel-u8500.spec
+++ b/kernel-u8500.spec
@@ -123,13 +123,13 @@ Obsoletes:      %name-nongpl < %version
 %endif
 # dead network if installed on SLES10, otherwise it will work (mostly)
 Conflicts:      sysfsutils < 2.0
-%if ! %build_vanilla
 Conflicts:      apparmor-profiles <= 2.1
 Conflicts:      apparmor-parser < 2.3
 # root-lvm only works with newer udevs
 Conflicts:      udev < 118
 Conflicts:      lvm2 < 2.02.33
-%endif
+# Interface to hv_kvp_daemon changed
+Conflicts:      hyper-v < 4
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
@@ -668,7 +668,8 @@ if [ %CONFIG_MODULES = y ]; then
     fi
     if [ $res -ne 0 ]; then
 	if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
-	     ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
+	     ! -e %_sourcedir/IGNORE-KABI-BADNESS -a \
+	     ! -e /etc/IGNORE-KABI-BADNESS ]; then
 	    echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
 		 "directory to build this kernel even though its badness is" \
 		 "higher than allowed for an official kernel."
diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes
index 836cbf7..626a301 100644
--- a/kernel-vanilla.changes
+++ b/kernel-vanilla.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 17 20:02:14 CEST 2012 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Also check for /etc/IGNORE-KABI-BADNESS file
+  This allows to control the kabi checker from outside of the package.
+- commit 0a0900c
+
 -------------------------------------------------------------------
 Sat Oct 13 11:47:44 CEST 2012 - jslaby@suse.cz
 
@@ -40,6 +47,21 @@ Sun Oct  7 20:55:39 CEST 2012 - jslaby@suse.cz
 - Linux 3.6.1.
 - commit 1f7626a
 
+-------------------------------------------------------------------
+Thu Oct  4 15:55:59 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: enable Conflicts for
+  apparmor, udev and lvm2 also for vanilla kernel
+- commit a24206f
+
+-------------------------------------------------------------------
+Thu Oct  4 15:51:44 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: add Conflicht: hyper-v < 4
+  to make sure the daemon is in sync with the kernel
+  (bnc#770763 , fate#314441)
+- commit 86f9ba3
+
 -------------------------------------------------------------------
 Thu Oct  4 15:44:56 CEST 2012 - jbeulich@novell.com
 
diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec
index 50467fc..f51e8af 100644
--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@@ -123,13 +123,13 @@ Obsoletes:      %name-nongpl < %version
 %endif
 # dead network if installed on SLES10, otherwise it will work (mostly)
 Conflicts:      sysfsutils < 2.0
-%if ! %build_vanilla
 Conflicts:      apparmor-profiles <= 2.1
 Conflicts:      apparmor-parser < 2.3
 # root-lvm only works with newer udevs
 Conflicts:      udev < 118
 Conflicts:      lvm2 < 2.02.33
-%endif
+# Interface to hv_kvp_daemon changed
+Conflicts:      hyper-v < 4
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
@@ -674,7 +674,8 @@ if [ %CONFIG_MODULES = y ]; then
     fi
     if [ $res -ne 0 ]; then
 	if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
-	     ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
+	     ! -e %_sourcedir/IGNORE-KABI-BADNESS -a \
+	     ! -e /etc/IGNORE-KABI-BADNESS ]; then
 	    echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
 		 "directory to build this kernel even though its badness is" \
 		 "higher than allowed for an official kernel."
diff --git a/kernel-xen.changes b/kernel-xen.changes
index 836cbf7..626a301 100644
--- a/kernel-xen.changes
+++ b/kernel-xen.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 17 20:02:14 CEST 2012 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Also check for /etc/IGNORE-KABI-BADNESS file
+  This allows to control the kabi checker from outside of the package.
+- commit 0a0900c
+
 -------------------------------------------------------------------
 Sat Oct 13 11:47:44 CEST 2012 - jslaby@suse.cz
 
@@ -40,6 +47,21 @@ Sun Oct  7 20:55:39 CEST 2012 - jslaby@suse.cz
 - Linux 3.6.1.
 - commit 1f7626a
 
+-------------------------------------------------------------------
+Thu Oct  4 15:55:59 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: enable Conflicts for
+  apparmor, udev and lvm2 also for vanilla kernel
+- commit a24206f
+
+-------------------------------------------------------------------
+Thu Oct  4 15:51:44 CEST 2012 - ohering@suse.de
+
+- rpm/kernel-binary.spec.in: add Conflicht: hyper-v < 4
+  to make sure the daemon is in sync with the kernel
+  (bnc#770763 , fate#314441)
+- commit 86f9ba3
+
 -------------------------------------------------------------------
 Thu Oct  4 15:44:56 CEST 2012 - jbeulich@novell.com
 
diff --git a/kernel-xen.spec b/kernel-xen.spec
index e5fedfa..e6a79a4 100644
--- a/kernel-xen.spec
+++ b/kernel-xen.spec
@@ -123,13 +123,13 @@ Obsoletes:      %name-nongpl < %version
 %endif
 # dead network if installed on SLES10, otherwise it will work (mostly)
 Conflicts:      sysfsutils < 2.0
-%if ! %build_vanilla
 Conflicts:      apparmor-profiles <= 2.1
 Conflicts:      apparmor-parser < 2.3
 # root-lvm only works with newer udevs
 Conflicts:      udev < 118
 Conflicts:      lvm2 < 2.02.33
-%endif
+# Interface to hv_kvp_daemon changed
+Conflicts:      hyper-v < 4
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
@@ -670,7 +670,8 @@ if [ %CONFIG_MODULES = y ]; then
     fi
     if [ $res -ne 0 ]; then
 	if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
-	     ! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
+	     ! -e %_sourcedir/IGNORE-KABI-BADNESS -a \
+	     ! -e /etc/IGNORE-KABI-BADNESS ]; then
 	    echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
 		 "directory to build this kernel even though its badness is" \
 		 "higher than allowed for an official kernel."
diff --git a/source-timestamp b/source-timestamp
index c8ad270..957a905 100644
--- a/source-timestamp
+++ b/source-timestamp
@@ -1,3 +1,3 @@
-2012-10-13 11:47:44 +0200
-GIT Revision: 007718db0b69a9310c617f3a433fe628afd7e577
+2012-10-17 20:03:43 +0200
+GIT Revision: e978fb65e2bd25d2d273b13380de4d7be2d03c72
 GIT Branch: master