Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2011-10-26 15:30:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/kernel-debug.changes 2011-10-24 13:44:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-debug.changes 2011-10-26 15:37:49.000000000 +0200 @@ -1,0 +2,26 @@ +Tue Oct 25 19:33:27 CEST 2011 - [email protected] + +- tty deadlock in kernel-xen, xenconsole (bnc#726333). +- commit 68289aa + +------------------------------------------------------------------- +Tue Oct 25 19:24:17 CEST 2011 - [email protected] + +- patches.suse/SUSE-bootsplash: remove DEBUG macro which was + left in the code by accident. +- commit a56ba15 + +------------------------------------------------------------------- +Mon Oct 24 18:28:04 CEST 2011 - [email protected] + +- Update to 3.1-final. +- commit ec0449c + +------------------------------------------------------------------- +Mon Oct 24 15:04:34 CEST 2011 - [email protected] + +- patches.suse/staging-hv-pata_piix-ignore-disks.patch: + Update comments in code and reduce patch size +- commit 8913d07 + +------------------------------------------------------------------- kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-pae.changes: same change kernel-ppc64.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-trace.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change Old: ---- linux-3.1-rc10.tar.bz2 New: ---- linux-3.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.KLB4Ej/_old 2011-10-26 15:38:43.000000000 +0200 +++ /var/tmp/diff_new_pack.KLB4Ej/_new 2011-10-26 15:38:43.000000000 +0200 @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 3.1-rc10 -%define patchversion 3.1.0-rc10 +%define srcversion 3.1 +%define patchversion 3.1.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -55,7 +55,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel -Version: 3.1.rc10 +Version: 3.1.0 Release: 0 License: GPL v2 only Group: System/Kernel kernel-default.spec: same change kernel-desktop.spec: same change ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.KLB4Ej/_old 2011-10-26 15:38:43.000000000 +0200 +++ /var/tmp/diff_new_pack.KLB4Ej/_new 2011-10-26 15:38:43.000000000 +0200 @@ -17,14 +17,14 @@ # norootforbuild -%define patchversion 3.1.0-rc10 +%define patchversion 3.1.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros Name: kernel-docs Summary: Kernel Documentation -Version: 3.1.rc10 +Version: 3.1.0 Release: 0 BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel BuildRequires: kernel-source%variant ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.KLB4Ej/_old 2011-10-26 15:38:43.000000000 +0200 +++ /var/tmp/diff_new_pack.KLB4Ej/_new 2011-10-26 15:38:43.000000000 +0200 @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 3.1-rc10 -%define patchversion 3.1.0-rc10 +%define srcversion 3.1 +%define patchversion 3.1.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -55,7 +55,7 @@ Name: kernel-ec2 Summary: The Amazon EC2 Xen Kernel -Version: 3.1.rc10 +Version: 3.1.0 Release: 0 License: GPL v2 only Group: System/Kernel kernel-pae.spec: same change kernel-ppc64.spec: same change kernel-s390.spec: same change ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.KLB4Ej/_old 2011-10-26 15:38:43.000000000 +0200 +++ /var/tmp/diff_new_pack.KLB4Ej/_new 2011-10-26 15:38:43.000000000 +0200 @@ -18,8 +18,8 @@ # norootforbuild # icecream 0 -%define srcversion 3.1-rc10 -%define patchversion 3.1.0-rc10 +%define srcversion 3.1 +%define patchversion 3.1.0 %define variant %{nil} %define vanilla_only 0 @@ -29,7 +29,7 @@ Name: kernel-source Summary: The Linux Kernel Sources -Version: 3.1.rc10 +Version: 3.1.0 Release: 0 License: GPL v2 only Group: Development/Sources ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.KLB4Ej/_old 2011-10-26 15:38:44.000000000 +0200 +++ /var/tmp/diff_new_pack.KLB4Ej/_new 2011-10-26 15:38:44.000000000 +0200 @@ -23,7 +23,7 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) -Version: 3.1.rc10 +Version: 3.1.0 %if %using_buildservice Release: 0 %else ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.KLB4Ej/_old 2011-10-26 15:38:44.000000000 +0200 +++ /var/tmp/diff_new_pack.KLB4Ej/_new 2011-10-26 15:38:44.000000000 +0200 @@ -17,8 +17,8 @@ # norootforbuild -%define srcversion 3.1-rc10 -%define patchversion 3.1.0-rc10 +%define srcversion 3.1 +%define patchversion 3.1.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -55,7 +55,7 @@ Name: kernel-trace Summary: The Standard Kernel with Tracing Features -Version: 3.1.rc10 +Version: 3.1.0 Release: 0 License: GPL v2 only Group: System/Kernel kernel-vanilla.spec: same change kernel-xen.spec: same change ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.KLB4Ej/_old 2011-10-26 15:38:44.000000000 +0200 +++ /var/tmp/diff_new_pack.KLB4Ej/_new 2011-10-26 15:38:44.000000000 +0200 @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=3.1-rc10 +SRCVERSION=3.1 # variant of the kernel-source package, either empty or "-rt" VARIANT= # buildservice projects to build the kernel against ++++++ linux-3.1-rc10.tar.bz2 -> linux-3.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kernel-source/linux-3.1-rc10.tar.bz2 /work/SRC/openSUSE:Factory/.kernel-source.new/linux-3.1.tar.bz2 differ: char 11, line 1 ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/bridge-module-get-put.patch new/patches.fixes/bridge-module-get-put.patch --- old/patches.fixes/bridge-module-get-put.patch 2011-10-11 14:56:37.000000000 +0200 +++ new/patches.fixes/bridge-module-get-put.patch 2011-10-24 18:28:04.000000000 +0200 @@ -34,7 +34,7 @@ } @@ -267,6 +276,8 @@ int br_del_bridge(struct net *net, const - del_br(netdev_priv(dev), NULL); + br_dev_delete(dev, NULL); rtnl_unlock(); + if (ret == 0) ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/SUSE-bootsplash new/patches.suse/SUSE-bootsplash --- old/patches.suse/SUSE-bootsplash 2011-10-20 10:17:26.000000000 +0200 +++ new/patches.suse/SUSE-bootsplash 2011-10-25 19:24:17.000000000 +0200 @@ -222,7 +222,7 @@ +#include "../console/fbcon.h" +#include <linux/bootsplash.h> +#include "decode-jpg.h" -+#define DEBUG ++ +#ifndef DEBUG +# define SPLASH_DEBUG(fmt, args...) +#else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/staging-hv-pata_piix-ignore-disks.patch new/patches.suse/staging-hv-pata_piix-ignore-disks.patch --- old/patches.suse/staging-hv-pata_piix-ignore-disks.patch 2011-10-20 10:17:26.000000000 +0200 +++ new/patches.suse/staging-hv-pata_piix-ignore-disks.patch 2011-10-25 19:24:17.000000000 +0200 @@ -7,8 +7,8 @@ Signed-off-by: Olaf Hering <[email protected]> --- - drivers/ata/ata_piix.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 48 insertions(+) + drivers/ata/ata_piix.c | 42 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 42 insertions(+) --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c @@ -28,13 +28,14 @@ }; static struct ata_port_operations piix_vmw_ops = { -@@ -619,6 +621,29 @@ MODULE_LICENSE("GPL"); +@@ -619,6 +621,26 @@ MODULE_LICENSE("GPL"); MODULE_DEVICE_TABLE(pci, piix_pci_tbl); MODULE_VERSION(DRV_VERSION); -+#if defined(CONFIG_HYPERV_STORAGE) || defined(CONFIG_HYPERV_STORAGE_MODULE) +static int piix_msft_hyperv(void) +{ ++ int hv = 0; ++#if defined(CONFIG_HYPERV_STORAGE) || defined(CONFIG_HYPERV_STORAGE_MODULE) + static const struct dmi_system_id hv_dmi_ident[] = { + { + .ident = "Hyper-V", @@ -46,19 +47,15 @@ + }, + { } /* terminate list */ + }; -+ return !!dmi_check_system(hv_dmi_ident); -+} -+#else -+static inline int piix_msft_hyperv(void) -+{ -+ return 0; -+} ++ hv = !!dmi_check_system(hv_dmi_ident); +#endif ++ return hv; ++} + struct ich_laptop { u16 device; u16 subvendor; -@@ -702,6 +727,24 @@ static int piix_pata_prereset(struct ata +@@ -702,6 +724,26 @@ static int piix_pata_prereset(struct ata return ata_sff_prereset(link, deadline); } @@ -69,9 +66,11 @@ + * Ignore disks in a hyper-v guest. + * There is no unplug protocol like it is done with xen_emul_unplug= option. + * Emulate the unplug by ignoring disks when the hv_storvsc driver is enabled. -+ * If the disks are not ignored, they will appear twice: once through piix and once through hv_storvsc. -+ * Because hv_storvsc does not handle ATAPI devices, the piix driver is still required. -+ * Once hv_storvsc handles all devices, this function can be removed and the whole driver should be disabled in a hyper-v guest. ++ * If the disks are not ignored, they will appear twice: once through ++ * piix and once through hv_storvsc. ++ * hv_storvsc can not handle ATAPI devices because they can only be ++ * accessed through the emulated code path (not through the vm_bus ++ * channel), the piix driver is still required. + */ + if (ata_id_is_ata(id) && piix_msft_hyperv()) { + ata_dev_printk(adev, KERN_WARNING, "ATA device ignored in Hyper-V guest\n"); @@ -83,15 +82,3 @@ static DEFINE_SPINLOCK(piix_lock); /** -@@ -1679,6 +1722,11 @@ static int __init piix_init(void) - { - int rc; - -+ /* disabled until hv_storvsc drives also cdrom devices */ -+ if (0 && piix_msft_hyperv()) { -+ printk(KERN_DEBUG "%s: hv_storvsc will bind to storage\n", __func__); -+ return -ENODEV; -+ } - DPRINTK("pci_register_driver\n"); - rc = pci_register_driver(&piix_pci_driver); - if (rc) ++++++ patches.xen.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.xen/xencons-tty_mutex.patch new/patches.xen/xencons-tty_mutex.patch --- old/patches.xen/xencons-tty_mutex.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.xen/xencons-tty_mutex.patch 2011-10-25 19:33:27.000000000 +0200 @@ -0,0 +1,32 @@ +Subject: tty deadlock in kernel-xen, xenconsole +References: bnc#726333 +From: <[email protected]> +Patch-mainline: never + +xenconsole is broken. tty_mutex does not nest into big tty mutex. +This is violated in tty_release->xencons_close. + +--- + drivers/xen/console/console.c | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +--- a/drivers/xen/console/console.c ++++ b/drivers/xen/console/console.c +@@ -623,16 +623,11 @@ static void xencons_close(struct tty_str + if (DUMMY_TTY(tty)) + return; + +- mutex_lock(&tty_mutex); +- +- if (tty->count != 1) { +- mutex_unlock(&tty_mutex); ++ if (tty->count != 1) + return; +- } + + /* Prevent other threads from re-opening this tty. */ + set_bit(TTY_CLOSING, &tty->flags); +- mutex_unlock(&tty_mutex); + + tty->closing = 1; + tty_wait_until_sent(tty, 0); ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.KLB4Ej/_old 2011-10-26 15:38:45.000000000 +0200 +++ /var/tmp/diff_new_pack.KLB4Ej/_new 2011-10-26 15:38:45.000000000 +0200 @@ -869,3 +869,4 @@ patches.xen/xen-x86_64-dump-user-pgt patches.xen/xen-x86_64-note-init-p2m patches.xen/xen-x86_64-unmapped-initrd + patches.xen/xencons-tty_mutex.patch ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.KLB4Ej/_old 2011-10-26 15:38:45.000000000 +0200 +++ /var/tmp/diff_new_pack.KLB4Ej/_new 2011-10-26 15:38:45.000000000 +0200 @@ -1,3 +1,3 @@ -2011-10-20 10:17:26 +0200 -GIT Revision: f6d77d445d2f3bba72c183ad7a2b5f39495e767d +2011-10-25 19:33:27 +0200 +GIT Revision: 68289aa24ce91a04a4746dfd01ac64503178184b GIT Branch: master -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
