Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2013-10-04 07:32:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-09-29 19:25:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-cubox.changes 2013-10-04 07:32:10.000000000 +0200 @@ -1,0 +2,21 @@ +Wed Oct 2 07:54:02 CEST 2013 - [email protected] + +- Linux 3.11.3. +- Refresh patches.xen/xen3-patch-3.4. +- commit 485f0d1 + +------------------------------------------------------------------- +Mon Sep 30 17:08:45 CEST 2013 - [email protected] + +- Always include the git commit in KOTD builds + This allows us not to set it explicitly in builds submitted to the + official distribution (bnc#821612, bnc#824171). +- commit a80e5ef + +------------------------------------------------------------------- +Mon Sep 30 13:49:46 CEST 2013 - [email protected] + +- Btrfs: relocate csums properly with prealloc extents. +- commit cb5d5b5 + +------------------------------------------------------------------- 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.xwpYeO/_old 2013-10-04 07:32:14.000000000 +0200 +++ /var/tmp/diff_new_pack.xwpYeO/_new 2013-10-04 07:32:14.000000000 +0200 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.11 -%define patchversion 3.11.2 +%define patchversion 3.11.3 %define variant %{nil} %define vanilla_only 0 @@ -59,8 +59,12 @@ Name: kernel-cubox Summary: Kernel for SolidRun Cubox -Version: 3.11.2 -Release: <RELEASE>.g420e19b +Version: 3.11.3 +%if 0%{?is_kotd} +Release: <RELEASE>.g485f0d1 +%else +Release: 0 +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ kernel-debug.spec: same change kernel-default.spec: same change kernel-desktop.spec: same change ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.xwpYeO/_old 2013-10-04 07:32:14.000000000 +0200 +++ /var/tmp/diff_new_pack.xwpYeO/_new 2013-10-04 07:32:14.000000000 +0200 @@ -17,15 +17,19 @@ # norootforbuild -%define patchversion 3.11.2 +%define patchversion 3.11.3 %define variant %{nil} %include %_sourcedir/kernel-spec-macros Name: kernel-docs Summary: Kernel Documentation -Version: 3.11.2 -Release: <RELEASE>.g420e19b +Version: 3.11.3 +%if 0%{?is_kotd} +Release: <RELEASE>.g485f0d1 +%else +Release: 0 +%endif BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel BuildRequires: kernel-source%variant Url: http://www.kernel.org/ ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.xwpYeO/_old 2013-10-04 07:32:14.000000000 +0200 +++ /var/tmp/diff_new_pack.xwpYeO/_new 2013-10-04 07:32:14.000000000 +0200 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.11 -%define patchversion 3.11.2 +%define patchversion 3.11.3 %define variant %{nil} %define vanilla_only 0 @@ -59,8 +59,12 @@ Name: kernel-ec2 Summary: The Amazon EC2 Xen Kernel -Version: 3.11.2 -Release: <RELEASE>.g420e19b +Version: 3.11.3 +%if 0%{?is_kotd} +Release: <RELEASE>.g485f0d1 +%else +Release: 0 +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ kernel-exynos.spec: same change kernel-lpae.spec: same change kernel-pae.spec: same change ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.xwpYeO/_old 2013-10-04 07:32:14.000000000 +0200 +++ /var/tmp/diff_new_pack.xwpYeO/_new 2013-10-04 07:32:14.000000000 +0200 @@ -19,7 +19,7 @@ # icecream 0 %define srcversion 3.11 -%define patchversion 3.11.2 +%define patchversion 3.11.3 %define variant %{nil} %define vanilla_only 0 @@ -29,8 +29,12 @@ Name: kernel-source Summary: The Linux Kernel Sources -Version: 3.11.2 -Release: <RELEASE>.g420e19b +Version: 3.11.3 +%if 0%{?is_kotd} +Release: <RELEASE>.g485f0d1 +%else +Release: 0 +%endif License: GPL-2.0 Group: Development/Sources Url: http://www.kernel.org/ ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.xwpYeO/_old 2013-10-04 07:32:14.000000000 +0200 +++ /var/tmp/diff_new_pack.xwpYeO/_new 2013-10-04 07:32:14.000000000 +0200 @@ -23,9 +23,13 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) -Version: 3.11.2 +Version: 3.11.3 %if %using_buildservice -Release: <RELEASE>.g420e19b +%if 0%{?is_kotd} +Release: <RELEASE>.g485f0d1 +%else +Release: 0 +%endif %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) Release: %kernel_source_release ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.xwpYeO/_old 2013-10-04 07:32:14.000000000 +0200 +++ /var/tmp/diff_new_pack.xwpYeO/_new 2013-10-04 07:32:14.000000000 +0200 @@ -20,7 +20,7 @@ # needssslcertforbuild %define srcversion 3.11 -%define patchversion 3.11.2 +%define patchversion 3.11.3 %define variant %{nil} %define vanilla_only 0 @@ -59,8 +59,12 @@ Name: kernel-trace Summary: The Standard Kernel with Tracing Features -Version: 3.11.2 -Release: <RELEASE>.g420e19b +Version: 3.11.3 +%if 0%{?is_kotd} +Release: <RELEASE>.g485f0d1 +%else +Release: 0 +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ kernel-vanilla.spec: same change kernel-xen.spec: same change ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.xwpYeO/_old 2013-10-04 07:32:15.000000000 +0200 +++ /var/tmp/diff_new_pack.xwpYeO/_new 2013-10-04 07:32:15.000000000 +0200 @@ -60,7 +60,11 @@ Name: kernel-@FLAVOR@ Summary: @SUMMARY@ Version: @RPMVERSION@ +%if 0%{?is_kotd} +Release: <RELEASE>.g@COMMIT@ +%else Release: @RELEASE@ +%endif License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ ++++++ kernel-docs.spec.in ++++++ --- /var/tmp/diff_new_pack.xwpYeO/_old 2013-10-04 07:32:15.000000000 +0200 +++ /var/tmp/diff_new_pack.xwpYeO/_new 2013-10-04 07:32:15.000000000 +0200 @@ -25,7 +25,11 @@ Name: kernel-docs@VARIANT@ Summary: Kernel Documentation Version: @RPMVERSION@ +%if 0%{?is_kotd} +Release: <RELEASE>.g@COMMIT@ +%else Release: @RELEASE@ +%endif BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel BuildRequires: kernel-source%variant Url: http://www.kernel.org/ ++++++ kernel-source.spec.in ++++++ --- /var/tmp/diff_new_pack.xwpYeO/_old 2013-10-04 07:32:15.000000000 +0200 +++ /var/tmp/diff_new_pack.xwpYeO/_new 2013-10-04 07:32:15.000000000 +0200 @@ -30,7 +30,11 @@ Name: kernel-source@VARIANT@ Summary: The Linux Kernel Sources Version: @RPMVERSION@ +%if 0%{?is_kotd} +Release: <RELEASE>.g@COMMIT@ +%else Release: @RELEASE@ +%endif License: GPL-2.0 Group: Development/Sources Url: http://www.kernel.org/ ++++++ kernel-syms.spec.in ++++++ --- /var/tmp/diff_new_pack.xwpYeO/_old 2013-10-04 07:32:15.000000000 +0200 +++ /var/tmp/diff_new_pack.xwpYeO/_new 2013-10-04 07:32:15.000000000 +0200 @@ -25,7 +25,11 @@ Summary: Kernel Symbol Versions (modversions) Version: @RPMVERSION@ %if %using_buildservice +%if 0%{?is_kotd} +Release: <RELEASE>.g@COMMIT@ +%else Release: @RELEASE@ +%endif %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) Release: %kernel_source_release ++++++ mkspec ++++++ --- /var/tmp/diff_new_pack.xwpYeO/_old 2013-10-04 07:32:15.000000000 +0200 +++ /var/tmp/diff_new_pack.xwpYeO/_new 2013-10-04 07:32:15.000000000 +0200 @@ -67,6 +67,8 @@ $tarball_url = ""; } +my $commit = get_commit(); + my %macros = ( VARIANT => $variant, VANILLA_ONLY => $vanilla_only, @@ -75,6 +77,7 @@ RPMVERSION => $rpmversion, TARBALL_URL => $tarball_url, RELEASE => $rpmrelease, + COMMIT => $commit, SOURCES => $sources, NOSOURCE => $nosource, UNPACK_PATCHES => $unpack_patches, @@ -303,6 +306,27 @@ return $res; } +sub get_commit { + my ($commit, $fh); + + if (!open($fh, '<', "source-timestamp")) { + print STDERR "warning: source-timestamp: $!\n"; + print STDERR "warning: Cannot determine commit id\n"; + return "0000000"; + } + while (<$fh>) { + if (/^GIT Revision: ([0-9a-f]{7})/) { + $commit = $1; + } + } + close($fh); + if (!$commit) { + print STDERR "warning: Commit id missing in source-timestamp file\n"; + return "0000000"; + } + return $commit; +} + sub do_spec { my $template = shift; my $specfile = shift; ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 3686 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 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/btrfs-relocate-csums-properly-with-prealloc-extents.patch 2013-09-30 13:49:46.000000000 +0200 @@ -0,0 +1,62 @@ +From: Josef Bacik <[email protected]> +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: [email protected] +Reported-by: Chris Murphy <[email protected]> +Signed-off-by: Josef Bacik <[email protected]> +Signed-off-by: David Sterba <[email protected]> +--- + fs/btrfs/relocation.c | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) + +--- a/fs/btrfs/relocation.c ++++ b/fs/btrfs/relocation.c +@@ -4472,6 +4472,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); +@@ -4483,13 +4484,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-3.4 new/patches.xen/xen3-patch-3.4 --- old/patches.xen/xen3-patch-3.4 2013-09-27 11:00:43.000000000 +0200 +++ new/patches.xen/xen3-patch-3.4 2013-10-02 07:54:02.000000000 +0200 @@ -3321,7 +3321,7 @@ +#endif int read_current_timer(unsigned long *timer_val); - + void ntp_notify_cmos_timer(void); --- head.orig/include/xen/acpi.h 2013-08-15 11:59:07.000000000 +0200 +++ head/include/xen/acpi.h 2013-08-09 15:36:45.000000000 +0200 @@ -75,8 +75,8 @@ static inline int xen_acpi_get_pxm(acpi_ ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.xwpYeO/_old 2013-10-04 07:32:17.000000000 +0200 +++ /var/tmp/diff_new_pack.xwpYeO/_new 2013-10-04 07:32:17.000000000 +0200 @@ -29,6 +29,7 @@ ######################################################## patches.kernel.org/patch-3.11.1 patches.kernel.org/patch-3.11.1-2 + patches.kernel.org/patch-3.11.2-3 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -299,6 +300,7 @@ patches.suse/btrfs-0033-remove-ourselves-from-the-cluster-list-under-l.patch +dsterba patches.suse/btrfs-0034-optimize-key-searches-in-btrfs_search_slot.patch + 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 patches.suse/introduce-kobj_completion ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.xwpYeO/_old 2013-10-04 07:32:17.000000000 +0200 +++ /var/tmp/diff_new_pack.xwpYeO/_new 2013-10-04 07:32:17.000000000 +0200 @@ -1,3 +1,3 @@ -2013-09-28 18:00:10 +0200 -GIT Revision: 420e19b4bee99f40550c2a3f2514c48d13cdf435 +2013-10-02 07:54:02 +0200 +GIT Revision: 485f0d128ebc47c0d72393c99edb2b304f7cf487 GIT Branch: openSUSE-13.1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
