commit e978fb65e2bd25d2d273b13380de4d7be2d03c72

OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=7363

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."

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
 

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."

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
 

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."

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
 

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."

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
 

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."

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
 

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
 

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."

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
 

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."

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
 

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."

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
 

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."

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
 

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."

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
 

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."

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
 

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."

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
 

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."

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
 

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
 

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
 

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."

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
 

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."

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
 

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."

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
 

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."

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
 

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."

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