From 71b0e706e647d494bb011726d04c341fb5d9e265386710745d096c6bff26bf63 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Mon, 22 Jul 2019 10:48:21 +0000 Subject: [PATCH] commit adfddac4f7170653097d38112dfc6922cfababd8 OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=1132 --- dtb-aarch64.changes | 7 +++++++ dtb-aarch64.spec | 2 +- dtb-armv6l.changes | 7 +++++++ dtb-armv6l.spec | 2 +- dtb-armv7l.changes | 7 +++++++ dtb-armv7l.spec | 2 +- kernel-64kb.changes | 7 +++++++ kernel-64kb.spec | 8 ++++---- kernel-debug.changes | 7 +++++++ kernel-debug.spec | 8 ++++---- kernel-default.changes | 7 +++++++ kernel-default.spec | 8 ++++---- kernel-docs.changes | 7 +++++++ kernel-docs.spec | 4 ++-- kernel-kvmsmall.changes | 7 +++++++ kernel-kvmsmall.spec | 8 ++++---- kernel-lpae.changes | 7 +++++++ kernel-lpae.spec | 8 ++++---- kernel-obs-build.changes | 7 +++++++ kernel-obs-build.spec | 4 ++-- kernel-obs-qa.changes | 7 +++++++ kernel-obs-qa.spec | 2 +- kernel-pae.changes | 7 +++++++ kernel-pae.spec | 8 ++++---- kernel-source.changes | 7 +++++++ kernel-source.spec | 4 ++-- kernel-syms.changes | 7 +++++++ kernel-syms.spec | 4 ++-- kernel-vanilla.changes | 7 +++++++ kernel-vanilla.spec | 8 ++++---- kernel-zfcpdump.changes | 7 +++++++ kernel-zfcpdump.spec | 8 ++++---- patches.suse.tar.bz2 | 4 ++-- series.conf | 1 + source-timestamp | 4 ++-- 35 files changed, 161 insertions(+), 48 deletions(-) diff --git a/dtb-aarch64.changes b/dtb-aarch64.changes index 4433e818..8303859f 100644 --- a/dtb-aarch64.changes +++ b/dtb-aarch64.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz + +- Revert "netfilter: conntrack: remove helper hook again" + (http://lkml.kernel.org/r/20190718092128.zbw4qappq6jsb4ja@breakpoint.cc). +- commit 8e9a006 + ------------------------------------------------------------------- Sun Jul 21 10:23:21 CEST 2019 - jslaby@suse.cz diff --git a/dtb-aarch64.spec b/dtb-aarch64.spec index 84325c5c..e7026718 100644 --- a/dtb-aarch64.spec +++ b/dtb-aarch64.spec @@ -31,7 +31,7 @@ Name: dtb-aarch64 Version: 5.2.2 %if 0%{?is_kotd} -Release: .g01a5f0e +Release: .gadfddac %else Release: 0 %endif diff --git a/dtb-armv6l.changes b/dtb-armv6l.changes index 4433e818..8303859f 100644 --- a/dtb-armv6l.changes +++ b/dtb-armv6l.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz + +- Revert "netfilter: conntrack: remove helper hook again" + (http://lkml.kernel.org/r/20190718092128.zbw4qappq6jsb4ja@breakpoint.cc). +- commit 8e9a006 + ------------------------------------------------------------------- Sun Jul 21 10:23:21 CEST 2019 - jslaby@suse.cz diff --git a/dtb-armv6l.spec b/dtb-armv6l.spec index bd95b7c8..21505c75 100644 --- a/dtb-armv6l.spec +++ b/dtb-armv6l.spec @@ -31,7 +31,7 @@ Name: dtb-armv6l Version: 5.2.2 %if 0%{?is_kotd} -Release: .g01a5f0e +Release: .gadfddac %else Release: 0 %endif diff --git a/dtb-armv7l.changes b/dtb-armv7l.changes index 4433e818..8303859f 100644 --- a/dtb-armv7l.changes +++ b/dtb-armv7l.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz + +- Revert "netfilter: conntrack: remove helper hook again" + (http://lkml.kernel.org/r/20190718092128.zbw4qappq6jsb4ja@breakpoint.cc). +- commit 8e9a006 + ------------------------------------------------------------------- Sun Jul 21 10:23:21 CEST 2019 - jslaby@suse.cz diff --git a/dtb-armv7l.spec b/dtb-armv7l.spec index 091ef6d4..809b3455 100644 --- a/dtb-armv7l.spec +++ b/dtb-armv7l.spec @@ -31,7 +31,7 @@ Name: dtb-armv7l Version: 5.2.2 %if 0%{?is_kotd} -Release: .g01a5f0e +Release: .gadfddac %else Release: 0 %endif diff --git a/kernel-64kb.changes b/kernel-64kb.changes index 4433e818..8303859f 100644 --- a/kernel-64kb.changes +++ b/kernel-64kb.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz + +- Revert "netfilter: conntrack: remove helper hook again" + (http://lkml.kernel.org/r/20190718092128.zbw4qappq6jsb4ja@breakpoint.cc). +- commit 8e9a006 + ------------------------------------------------------------------- Sun Jul 21 10:23:21 CEST 2019 - jslaby@suse.cz diff --git a/kernel-64kb.spec b/kernel-64kb.spec index 3bc78c99..9d41269f 100644 --- a/kernel-64kb.spec +++ b/kernel-64kb.spec @@ -64,7 +64,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.2.2 %if 0%{?is_kotd} -Release: .g01a5f0e +Release: .gadfddac %else Release: 0 %endif @@ -169,10 +169,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c -Provides: kernel-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c +Provides: kernel-%build_flavor-base-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: kernel-srchash-adfddac4f7170653097d38112dfc6922cfababd8 # END COMMON DEPS -Provides: %name-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c +Provides: %name-srchash-adfddac4f7170653097d38112dfc6922cfababd8 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh diff --git a/kernel-debug.changes b/kernel-debug.changes index 4433e818..8303859f 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz + +- Revert "netfilter: conntrack: remove helper hook again" + (http://lkml.kernel.org/r/20190718092128.zbw4qappq6jsb4ja@breakpoint.cc). +- commit 8e9a006 + ------------------------------------------------------------------- Sun Jul 21 10:23:21 CEST 2019 - jslaby@suse.cz diff --git a/kernel-debug.spec b/kernel-debug.spec index c44cc20e..12bf0788 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -64,7 +64,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.2.2 %if 0%{?is_kotd} -Release: .g01a5f0e +Release: .gadfddac %else Release: 0 %endif @@ -169,10 +169,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c -Provides: kernel-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c +Provides: kernel-%build_flavor-base-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: kernel-srchash-adfddac4f7170653097d38112dfc6922cfababd8 # END COMMON DEPS -Provides: %name-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c +Provides: %name-srchash-adfddac4f7170653097d38112dfc6922cfababd8 %ifarch ppc64 Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 diff --git a/kernel-default.changes b/kernel-default.changes index 4433e818..8303859f 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz + +- Revert "netfilter: conntrack: remove helper hook again" + (http://lkml.kernel.org/r/20190718092128.zbw4qappq6jsb4ja@breakpoint.cc). +- commit 8e9a006 + ------------------------------------------------------------------- Sun Jul 21 10:23:21 CEST 2019 - jslaby@suse.cz diff --git a/kernel-default.spec b/kernel-default.spec index 45c15e01..f24a9cdf 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -64,7 +64,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.2.2 %if 0%{?is_kotd} -Release: .g01a5f0e +Release: .gadfddac %else Release: 0 %endif @@ -169,10 +169,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c -Provides: kernel-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c +Provides: kernel-%build_flavor-base-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: kernel-srchash-adfddac4f7170653097d38112dfc6922cfababd8 # END COMMON DEPS -Provides: %name-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c +Provides: %name-srchash-adfddac4f7170653097d38112dfc6922cfababd8 %ifarch %ix86 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 diff --git a/kernel-docs.changes b/kernel-docs.changes index 4433e818..8303859f 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz + +- Revert "netfilter: conntrack: remove helper hook again" + (http://lkml.kernel.org/r/20190718092128.zbw4qappq6jsb4ja@breakpoint.cc). +- commit 8e9a006 + ------------------------------------------------------------------- Sun Jul 21 10:23:21 CEST 2019 - jslaby@suse.cz diff --git a/kernel-docs.spec b/kernel-docs.spec index 643845f9..84ded18c 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -33,7 +33,7 @@ License: GPL-2.0 Group: Documentation/Man Version: 5.2.2 %if 0%{?is_kotd} -Release: .g01a5f0e +Release: .gadfddac %else Release: 0 %endif @@ -63,7 +63,7 @@ BuildRequires: texlive-zapfding %endif Url: http://www.kernel.org/ Provides: %name = %version-%source_rel -Provides: %name-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c +Provides: %name-srchash-adfddac4f7170653097d38112dfc6922cfababd8 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz diff --git a/kernel-kvmsmall.changes b/kernel-kvmsmall.changes index 4433e818..8303859f 100644 --- a/kernel-kvmsmall.changes +++ b/kernel-kvmsmall.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz + +- Revert "netfilter: conntrack: remove helper hook again" + (http://lkml.kernel.org/r/20190718092128.zbw4qappq6jsb4ja@breakpoint.cc). +- commit 8e9a006 + ------------------------------------------------------------------- Sun Jul 21 10:23:21 CEST 2019 - jslaby@suse.cz diff --git a/kernel-kvmsmall.spec b/kernel-kvmsmall.spec index f02758ca..c2bf5652 100644 --- a/kernel-kvmsmall.spec +++ b/kernel-kvmsmall.spec @@ -64,7 +64,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.2.2 %if 0%{?is_kotd} -Release: .g01a5f0e +Release: .gadfddac %else Release: 0 %endif @@ -169,10 +169,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c -Provides: kernel-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c +Provides: kernel-%build_flavor-base-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: kernel-srchash-adfddac4f7170653097d38112dfc6922cfababd8 # END COMMON DEPS -Provides: %name-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c +Provides: %name-srchash-adfddac4f7170653097d38112dfc6922cfababd8 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh diff --git a/kernel-lpae.changes b/kernel-lpae.changes index 4433e818..8303859f 100644 --- a/kernel-lpae.changes +++ b/kernel-lpae.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz + +- Revert "netfilter: conntrack: remove helper hook again" + (http://lkml.kernel.org/r/20190718092128.zbw4qappq6jsb4ja@breakpoint.cc). +- commit 8e9a006 + ------------------------------------------------------------------- Sun Jul 21 10:23:21 CEST 2019 - jslaby@suse.cz diff --git a/kernel-lpae.spec b/kernel-lpae.spec index 519c385c..483a17c7 100644 --- a/kernel-lpae.spec +++ b/kernel-lpae.spec @@ -64,7 +64,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.2.2 %if 0%{?is_kotd} -Release: .g01a5f0e +Release: .gadfddac %else Release: 0 %endif @@ -169,10 +169,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c -Provides: kernel-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c +Provides: kernel-%build_flavor-base-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: kernel-srchash-adfddac4f7170653097d38112dfc6922cfababd8 # END COMMON DEPS -Provides: %name-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c +Provides: %name-srchash-adfddac4f7170653097d38112dfc6922cfababd8 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh diff --git a/kernel-obs-build.changes b/kernel-obs-build.changes index 4433e818..8303859f 100644 --- a/kernel-obs-build.changes +++ b/kernel-obs-build.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz + +- Revert "netfilter: conntrack: remove helper hook again" + (http://lkml.kernel.org/r/20190718092128.zbw4qappq6jsb4ja@breakpoint.cc). +- commit 8e9a006 + ------------------------------------------------------------------- Sun Jul 21 10:23:21 CEST 2019 - jslaby@suse.cz diff --git a/kernel-obs-build.spec b/kernel-obs-build.spec index bcee24ec..e0edba62 100644 --- a/kernel-obs-build.spec +++ b/kernel-obs-build.spec @@ -45,7 +45,7 @@ BuildRequires: util-linux %endif %endif %endif -BuildRequires: kernel%kernel_flavor-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c +BuildRequires: kernel%kernel_flavor-srchash-adfddac4f7170653097d38112dfc6922cfababd8 %if 0%{?rhel_version} BuildRequires: kernel @@ -66,7 +66,7 @@ License: GPL-2.0 Group: SLES Version: 5.2.2 %if 0%{?is_kotd} -Release: .g01a5f0e +Release: .gadfddac %else Release: 0 %endif diff --git a/kernel-obs-qa.changes b/kernel-obs-qa.changes index 4433e818..8303859f 100644 --- a/kernel-obs-qa.changes +++ b/kernel-obs-qa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz + +- Revert "netfilter: conntrack: remove helper hook again" + (http://lkml.kernel.org/r/20190718092128.zbw4qappq6jsb4ja@breakpoint.cc). +- commit 8e9a006 + ------------------------------------------------------------------- Sun Jul 21 10:23:21 CEST 2019 - jslaby@suse.cz diff --git a/kernel-obs-qa.spec b/kernel-obs-qa.spec index 8d2f0715..852cbd97 100644 --- a/kernel-obs-qa.spec +++ b/kernel-obs-qa.spec @@ -38,7 +38,7 @@ License: GPL-2.0 Group: SLES Version: 5.2.2 %if 0%{?is_kotd} -Release: .g01a5f0e +Release: .gadfddac %else Release: 0 %endif diff --git a/kernel-pae.changes b/kernel-pae.changes index 4433e818..8303859f 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz + +- Revert "netfilter: conntrack: remove helper hook again" + (http://lkml.kernel.org/r/20190718092128.zbw4qappq6jsb4ja@breakpoint.cc). +- commit 8e9a006 + ------------------------------------------------------------------- Sun Jul 21 10:23:21 CEST 2019 - jslaby@suse.cz diff --git a/kernel-pae.spec b/kernel-pae.spec index 8a1ceb2a..5f5ae6da 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -64,7 +64,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.2.2 %if 0%{?is_kotd} -Release: .g01a5f0e +Release: .gadfddac %else Release: 0 %endif @@ -169,10 +169,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c -Provides: kernel-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c +Provides: kernel-%build_flavor-base-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: kernel-srchash-adfddac4f7170653097d38112dfc6922cfababd8 # END COMMON DEPS -Provides: %name-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c +Provides: %name-srchash-adfddac4f7170653097d38112dfc6922cfababd8 %ifarch %ix86 Provides: kernel-bigsmp = 2.6.17 Obsoletes: kernel-bigsmp <= 2.6.17 diff --git a/kernel-source.changes b/kernel-source.changes index 4433e818..8303859f 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz + +- Revert "netfilter: conntrack: remove helper hook again" + (http://lkml.kernel.org/r/20190718092128.zbw4qappq6jsb4ja@breakpoint.cc). +- commit 8e9a006 + ------------------------------------------------------------------- Sun Jul 21 10:23:21 CEST 2019 - jslaby@suse.cz diff --git a/kernel-source.spec b/kernel-source.spec index 3c374de6..cae42826 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -32,7 +32,7 @@ License: GPL-2.0 Group: Development/Sources Version: 5.2.2 %if 0%{?is_kotd} -Release: .g01a5f0e +Release: .gadfddac %else Release: 0 %endif @@ -43,7 +43,7 @@ BuildRequires: fdupes BuildRequires: sed Requires(post): coreutils sed Provides: %name = %version-%source_rel -Provides: %name-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c +Provides: %name-srchash-adfddac4f7170653097d38112dfc6922cfababd8 Provides: linux Provides: multiversion(kernel) Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz diff --git a/kernel-syms.changes b/kernel-syms.changes index 4433e818..8303859f 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz + +- Revert "netfilter: conntrack: remove helper hook again" + (http://lkml.kernel.org/r/20190718092128.zbw4qappq6jsb4ja@breakpoint.cc). +- commit 8e9a006 + ------------------------------------------------------------------- Sun Jul 21 10:23:21 CEST 2019 - jslaby@suse.cz diff --git a/kernel-syms.spec b/kernel-syms.spec index a7e67f6b..408d8681 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -27,7 +27,7 @@ Group: Development/Sources Version: 5.2.2 %if %using_buildservice %if 0%{?is_kotd} -Release: .g01a5f0e +Release: .gadfddac %else Release: 0 %endif @@ -55,7 +55,7 @@ Requires: kernel-zfcpdump-devel = %version-%source_rel %endif Requires: pesign-obs-integration Provides: %name = %version-%source_rel -Provides: %name-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c +Provides: %name-srchash-adfddac4f7170653097d38112dfc6922cfababd8 Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index 4433e818..8303859f 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz + +- Revert "netfilter: conntrack: remove helper hook again" + (http://lkml.kernel.org/r/20190718092128.zbw4qappq6jsb4ja@breakpoint.cc). +- commit 8e9a006 + ------------------------------------------------------------------- Sun Jul 21 10:23:21 CEST 2019 - jslaby@suse.cz diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 8c76f3ab..81ef98c0 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -64,7 +64,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.2.2 %if 0%{?is_kotd} -Release: .g01a5f0e +Release: .gadfddac %else Release: 0 %endif @@ -169,10 +169,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c -Provides: kernel-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c +Provides: kernel-%build_flavor-base-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: kernel-srchash-adfddac4f7170653097d38112dfc6922cfababd8 # END COMMON DEPS -Provides: %name-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c +Provides: %name-srchash-adfddac4f7170653097d38112dfc6922cfababd8 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh diff --git a/kernel-zfcpdump.changes b/kernel-zfcpdump.changes index 4433e818..8303859f 100644 --- a/kernel-zfcpdump.changes +++ b/kernel-zfcpdump.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jul 21 19:42:03 CEST 2019 - mkubecek@suse.cz + +- Revert "netfilter: conntrack: remove helper hook again" + (http://lkml.kernel.org/r/20190718092128.zbw4qappq6jsb4ja@breakpoint.cc). +- commit 8e9a006 + ------------------------------------------------------------------- Sun Jul 21 10:23:21 CEST 2019 - jslaby@suse.cz diff --git a/kernel-zfcpdump.spec b/kernel-zfcpdump.spec index 38dba53a..570fedf6 100644 --- a/kernel-zfcpdump.spec +++ b/kernel-zfcpdump.spec @@ -64,7 +64,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.2.2 %if 0%{?is_kotd} -Release: .g01a5f0e +Release: .gadfddac %else Release: 0 %endif @@ -169,10 +169,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c -Provides: kernel-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c +Provides: kernel-%build_flavor-base-srchash-adfddac4f7170653097d38112dfc6922cfababd8 +Provides: kernel-srchash-adfddac4f7170653097d38112dfc6922cfababd8 # END COMMON DEPS -Provides: %name-srchash-01a5f0e31f3631f262c748eac99efc398d7b916c +Provides: %name-srchash-adfddac4f7170653097d38112dfc6922cfababd8 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh diff --git a/patches.suse.tar.bz2 b/patches.suse.tar.bz2 index 701efe87..d9b10c3a 100644 --- a/patches.suse.tar.bz2 +++ b/patches.suse.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e59569a8f26ad29588ab6ff09b0ce5bb8079a842fc32c29ac0b8bdb62b08c3b0 -size 45053 +oid sha256:85a6d16014f048cc694a3150806366eec6bf2f3570e41a6a25bcc4a3e5237bc1 +size 46513 diff --git a/series.conf b/series.conf index 4039bd88..8bce48cf 100644 --- a/series.conf +++ b/series.conf @@ -280,6 +280,7 @@ # Netfilter ######################################################## patches.suse/netfilter-ip_conntrack_slp.patch + patches.suse/Revert-netfilter-conntrack-remove-helper-hook-again.patch ######################################################## # NFS diff --git a/source-timestamp b/source-timestamp index e9d48706..f6a9506f 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2019-07-21 08:23:59 +0000 -GIT Revision: 01a5f0e31f3631f262c748eac99efc398d7b916c +2019-07-22 10:29:33 +0000 +GIT Revision: adfddac4f7170653097d38112dfc6922cfababd8 GIT Branch: stable