commit kernel-source for openSUSE:Factory
Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2013-11-30 19:55:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-source" Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/kernel-cubox.changes 2013-11-30 07:34:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-cubox.changes 2013-11-30 19:55:32.000000000 +0100 @@ -1,0 +2,15 @@ +Fri Nov 29 21:29:19 CET 2013 - jslaby@suse.cz + +- Linux 3.12.2. +- Refresh patches.xen/xen3-patch-2.6.29. +- Delete + patches.suse/btrfs-relocate-csums-properly-with-prealloc-extents.patch. +- commit 3b81e61 + +------------------------------------------------------------------- +Fri Nov 29 11:35:21 CET 2013 - tiwai@suse.de + +- Build mei and mei_me as modules (bnc#852656) +- commit 1a570dd + +------------------------------------------------------------------- kernel-debug.changes: same change kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-exynos.changes: same change kernel-lpae.changes: same change kernel-pae.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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-cubox.spec ++++++ --- /var/tmp/diff_new_pack.UrTUkO/_old 2013-11-30 19:55:36.000000000 +0100 +++ /var/tmp/diff_new_pack.UrTUkO/_new 2013-11-30 19:55:36.000000000 +0100 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.12 -%define patchversion 3.12.1 +%define patchversion 3.12.2 %define variant %{nil} %define vanilla_only 0 @@ -59,9 +59,9 @@ Name: kernel-cubox Summary: Kernel for SolidRun Cubox -Version: 3.12.1 +Version: 3.12.2 %if 0%{?is_kotd} -Release: <RELEASE>.g3a2ac9d +Release: <RELEASE>.g3b81e61 %else Release: 0 %endif kernel-debug.spec: same change kernel-default.spec: same change kernel-desktop.spec: same change ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.UrTUkO/_old 2013-11-30 19:55:36.000000000 +0100 +++ /var/tmp/diff_new_pack.UrTUkO/_new 2013-11-30 19:55:36.000000000 +0100 @@ -17,16 +17,16 @@ # norootforbuild -%define patchversion 3.12.1 +%define patchversion 3.12.2 %define variant %{nil} %include %_sourcedir/kernel-spec-macros Name: kernel-docs Summary: Kernel Documentation -Version: 3.12.1 +Version: 3.12.2 %if 0%{?is_kotd} -Release: <RELEASE>.g3a2ac9d +Release: <RELEASE>.g3b81e61 %else Release: 0 %endif ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.UrTUkO/_old 2013-11-30 19:55:36.000000000 +0100 +++ /var/tmp/diff_new_pack.UrTUkO/_new 2013-11-30 19:55:36.000000000 +0100 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.12 -%define patchversion 3.12.1 +%define patchversion 3.12.2 %define variant %{nil} %define vanilla_only 0 @@ -59,9 +59,9 @@ Name: kernel-ec2 Summary: The Amazon EC2 Xen Kernel -Version: 3.12.1 +Version: 3.12.2 %if 0%{?is_kotd} -Release: <RELEASE>.g3a2ac9d +Release: <RELEASE>.g3b81e61 %else Release: 0 %endif kernel-exynos.spec: same change kernel-lpae.spec: same change kernel-pae.spec: same change ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.UrTUkO/_old 2013-11-30 19:55:36.000000000 +0100 +++ /var/tmp/diff_new_pack.UrTUkO/_new 2013-11-30 19:55:36.000000000 +0100 @@ -19,7 +19,7 @@ # icecream 0 %define srcversion 3.12 -%define patchversion 3.12.1 +%define patchversion 3.12.2 %define variant %{nil} %define vanilla_only 0 @@ -29,9 +29,9 @@ Name: kernel-source Summary: The Linux Kernel Sources -Version: 3.12.1 +Version: 3.12.2 %if 0%{?is_kotd} -Release: <RELEASE>.g3a2ac9d +Release: <RELEASE>.g3b81e61 %else Release: 0 %endif ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.UrTUkO/_old 2013-11-30 19:55:36.000000000 +0100 +++ /var/tmp/diff_new_pack.UrTUkO/_new 2013-11-30 19:55:36.000000000 +0100 @@ -23,10 +23,10 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) -Version: 3.12.1 +Version: 3.12.2 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.g3a2ac9d +Release: <RELEASE>.g3b81e61 %else Release: 0 %endif ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.UrTUkO/_old 2013-11-30 19:55:36.000000000 +0100 +++ /var/tmp/diff_new_pack.UrTUkO/_new 2013-11-30 19:55:36.000000000 +0100 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.12 -%define patchversion 3.12.1 +%define patchversion 3.12.2 %define variant %{nil} %define vanilla_only 0 @@ -59,9 +59,9 @@ Name: kernel-trace Summary: The Standard Kernel with Tracing Features -Version: 3.12.1 +Version: 3.12.2 %if 0%{?is_kotd} -Release: <RELEASE>.g3a2ac9d +Release: <RELEASE>.g3b81e61 %else Release: 0 %endif kernel-vanilla.spec: same change kernel-xen.spec: same change ++++++ config.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/debug new/config/i386/debug --- old/config/i386/debug 2013-11-27 17:59:14.000000000 +0100 +++ new/config/i386/debug 2013-11-29 11:35:21.000000000 +0100 @@ -1798,8 +1798,8 @@ # Altera FPGA firmware download module # CONFIG_ALTERA_STAPL=m -CONFIG_INTEL_MEI=y -CONFIG_INTEL_MEI_ME=y +CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=m CONFIG_VMWARE_VMCI=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/default new/config/i386/default --- old/config/i386/default 2013-11-27 17:59:14.000000000 +0100 +++ new/config/i386/default 2013-11-29 11:35:21.000000000 +0100 @@ -1793,8 +1793,8 @@ # Altera FPGA firmware download module # CONFIG_ALTERA_STAPL=m -CONFIG_INTEL_MEI=y -CONFIG_INTEL_MEI_ME=y +CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=m CONFIG_VMWARE_VMCI=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/desktop new/config/i386/desktop --- old/config/i386/desktop 2013-11-27 17:59:14.000000000 +0100 +++ new/config/i386/desktop 2013-11-29 11:35:21.000000000 +0100 @@ -1777,8 +1777,8 @@ # Altera FPGA firmware download module # CONFIG_ALTERA_STAPL=m -CONFIG_INTEL_MEI=y -CONFIG_INTEL_MEI_ME=y +CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=m CONFIG_VMWARE_VMCI=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/pae new/config/i386/pae --- old/config/i386/pae 2013-11-27 17:59:14.000000000 +0100 +++ new/config/i386/pae 2013-11-29 11:35:21.000000000 +0100 @@ -1778,8 +1778,8 @@ # Altera FPGA firmware download module # CONFIG_ALTERA_STAPL=m -CONFIG_INTEL_MEI=y -CONFIG_INTEL_MEI_ME=y +CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=m CONFIG_VMWARE_VMCI=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/trace new/config/i386/trace --- old/config/i386/trace 2013-11-27 17:59:14.000000000 +0100 +++ new/config/i386/trace 2013-11-29 11:35:21.000000000 +0100 @@ -1779,8 +1779,8 @@ # Altera FPGA firmware download module # CONFIG_ALTERA_STAPL=m -CONFIG_INTEL_MEI=y -CONFIG_INTEL_MEI_ME=y +CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=m CONFIG_VMWARE_VMCI=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/vanilla new/config/i386/vanilla --- old/config/i386/vanilla 2013-11-27 17:59:14.000000000 +0100 +++ new/config/i386/vanilla 2013-11-29 11:35:21.000000000 +0100 @@ -1791,8 +1791,8 @@ # Altera FPGA firmware download module # CONFIG_ALTERA_STAPL=m -CONFIG_INTEL_MEI=y -CONFIG_INTEL_MEI_ME=y +CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=m CONFIG_VMWARE_VMCI=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/xen new/config/i386/xen --- old/config/i386/xen 2013-11-27 17:59:14.000000000 +0100 +++ new/config/i386/xen 2013-11-29 11:35:21.000000000 +0100 @@ -1607,8 +1607,8 @@ # Altera FPGA firmware download module # CONFIG_ALTERA_STAPL=m -CONFIG_INTEL_MEI=y -CONFIG_INTEL_MEI_ME=y +CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/debug new/config/x86_64/debug --- old/config/x86_64/debug 2013-11-27 17:59:14.000000000 +0100 +++ new/config/x86_64/debug 2013-11-29 11:35:21.000000000 +0100 @@ -1747,8 +1747,8 @@ # Altera FPGA firmware download module # CONFIG_ALTERA_STAPL=m -CONFIG_INTEL_MEI=y -CONFIG_INTEL_MEI_ME=y +CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=m CONFIG_VMWARE_VMCI=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/default new/config/x86_64/default --- old/config/x86_64/default 2013-11-27 17:59:14.000000000 +0100 +++ new/config/x86_64/default 2013-11-29 11:35:21.000000000 +0100 @@ -1739,8 +1739,8 @@ # Altera FPGA firmware download module # CONFIG_ALTERA_STAPL=m -CONFIG_INTEL_MEI=y -CONFIG_INTEL_MEI_ME=y +CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=m CONFIG_VMWARE_VMCI=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/desktop new/config/x86_64/desktop --- old/config/x86_64/desktop 2013-11-27 17:59:14.000000000 +0100 +++ new/config/x86_64/desktop 2013-11-29 11:35:21.000000000 +0100 @@ -1738,8 +1738,8 @@ # Altera FPGA firmware download module # CONFIG_ALTERA_STAPL=m -CONFIG_INTEL_MEI=y -CONFIG_INTEL_MEI_ME=y +CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=m CONFIG_VMWARE_VMCI=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/trace new/config/x86_64/trace --- old/config/x86_64/trace 2013-11-27 17:59:14.000000000 +0100 +++ new/config/x86_64/trace 2013-11-29 11:35:21.000000000 +0100 @@ -1740,8 +1740,8 @@ # Altera FPGA firmware download module # CONFIG_ALTERA_STAPL=m -CONFIG_INTEL_MEI=y -CONFIG_INTEL_MEI_ME=y +CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=m CONFIG_VMWARE_VMCI=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/vanilla new/config/x86_64/vanilla --- old/config/x86_64/vanilla 2013-11-27 17:59:14.000000000 +0100 +++ new/config/x86_64/vanilla 2013-11-29 11:35:21.000000000 +0100 @@ -1737,8 +1737,8 @@ # Altera FPGA firmware download module # CONFIG_ALTERA_STAPL=m -CONFIG_INTEL_MEI=y -CONFIG_INTEL_MEI_ME=y +CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=m CONFIG_VMWARE_VMCI=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/xen new/config/x86_64/xen --- old/config/x86_64/xen 2013-11-27 17:59:14.000000000 +0100 +++ new/config/x86_64/xen 2013-11-29 11:35:21.000000000 +0100 @@ -1592,8 +1592,8 @@ # Altera FPGA firmware download module # CONFIG_ALTERA_STAPL=m -CONFIG_INTEL_MEI=y -CONFIG_INTEL_MEI_ME=y +CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=m CONFIG_HAVE_IDE=y # CONFIG_IDE is not set ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 3916 lines of diff (skipped) ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/btrfs-relocate-csums-properly-with-prealloc-extents.patch new/patches.suse/btrfs-relocate-csums-properly-with-prealloc-extents.patch --- old/patches.suse/btrfs-relocate-csums-properly-with-prealloc-extents.patch 2013-11-27 17:59:14.000000000 +0100 +++ new/patches.suse/btrfs-relocate-csums-properly-with-prealloc-extents.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,62 +0,0 @@ -From: Josef Bacik <jbacik@fusionio.com> -Subject: [PATCH] Btrfs: relocate csums properly with prealloc extents -Date: Fri, 27 Sep 2013 09:37:00 -0400 -Patch-mainline: pending - -A user reported a problem where they were getting csum errors when running a -balance and running systemd's journal. This is because systemd is awesome and -fallocate()'s its log space and writes into it. Unfortunately we assume that -when we read in all the csums for an extent that they are sequential starting at -the bytenr we care about. This obviously isn't the case for prealloc extents, -where we could have written to the middle of the prealloc extent only, which -means the csum would be for the bytenr in the middle of our range and not the -front of our range. Fix this by offsetting the new bytenr we are logging to -based on the original bytenr the csum was for. With this patch I no longer see -the csum errors I was seeing. Thanks, - -Cc: stable@vger.kernel.org -Reported-by: Chris Murphy <lists@colorremedies.com> -Signed-off-by: Josef Bacik <jbacik@fusionio.com> -Signed-off-by: David Sterba <dsterba@suse.cz> ---- - fs/btrfs/relocation.c | 18 +++++++++++++++--- - 1 file changed, 15 insertions(+), 3 deletions(-) - ---- a/fs/btrfs/relocation.c -+++ b/fs/btrfs/relocation.c -@@ -4481,6 +4481,7 @@ int btrfs_reloc_clone_csums(struct inode - struct btrfs_root *root = BTRFS_I(inode)->root; - int ret; - u64 disk_bytenr; -+ u64 new_bytenr; - LIST_HEAD(list); - - ordered = btrfs_lookup_ordered_extent(inode, file_pos); -@@ -4492,13 +4493,24 @@ int btrfs_reloc_clone_csums(struct inode - if (ret) - goto out; - -- disk_bytenr = ordered->start; - while (!list_empty(&list)) { - sums = list_entry(list.next, struct btrfs_ordered_sum, list); - list_del_init(&sums->list); - -- sums->bytenr = disk_bytenr; -- disk_bytenr += sums->len; -+ /* -+ * We need to offset the new_bytenr based on where the csum is. -+ * We need to do this because we will read in entire prealloc -+ * extents but we may have written to say the middle of the -+ * prealloc extent, so we need to make sure the csum goes with -+ * the right disk offset. -+ * -+ * We can do this because the data reloc inode refers strictly -+ * to the on disk bytes, so we don't have to worry about -+ * disk_len vs real len like with real inodes since it's all -+ * disk length. -+ */ -+ new_bytenr = ordered->start + (sums->bytenr - disk_bytenr); -+ sums->bytenr = new_bytenr; - - btrfs_add_ordered_sum(inode, ordered, sums); - } ++++++ patches.xen.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.xen/xen3-patch-2.6.29 new/patches.xen/xen3-patch-2.6.29 --- old/patches.xen/xen3-patch-2.6.29 2013-11-20 13:17:11.000000000 +0100 +++ new/patches.xen/xen3-patch-2.6.29 2013-11-29 21:29:19.000000000 +0100 @@ -8758,8 +8758,8 @@ * Callers should disable interrupts before the call and enable * interrupts after return. @@ -131,6 +132,7 @@ static void acpi_safe_halt(void) + local_irq_disable(); } - current_thread_info()->status |= TS_POLLING; } +#endif ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.UrTUkO/_old 2013-11-30 19:55:38.000000000 +0100 +++ /var/tmp/diff_new_pack.UrTUkO/_new 2013-11-30 19:55:38.000000000 +0100 @@ -28,6 +28,7 @@ # Send separate patches upstream if you find a problem... ######################################################## patches.kernel.org/patch-3.12.1 + patches.kernel.org/patch-3.12.1-2 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -260,7 +261,6 @@ patches.suse/btrfs-use-correct-device-for-maps.patch patches.suse/btrfs-check-index-in-extent_buffer_page - patches.suse/btrfs-relocate-csums-properly-with-prealloc-extents.patch patches.suse/btrfs-use-end-trans-in-label-ioctl patches.suse/btrfs-add-ability-to-query-change-feature-bits-online-ioctl ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.UrTUkO/_old 2013-11-30 19:55:38.000000000 +0100 +++ /var/tmp/diff_new_pack.UrTUkO/_new 2013-11-30 19:55:38.000000000 +0100 @@ -1,3 +1,3 @@ -2013-11-28 15:01:08 +0100 -GIT Revision: 3a2ac9df6cb981135582807fe779031f3c0e035b +2013-11-29 21:29:19 +0100 +GIT Revision: 3b81e610d31696c8876236b2019d953750fb4de5 GIT Branch: master -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠hilbert.suse.de