Hello community,
here is the log from the commit of package kernel-source for openSUSE:Factory
checked in at 2016-10-04 15:45:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-64kb.changes
2016-09-28 11:29:10.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-64kb.changes
2016-10-04 15:44:53.000000000 +0200
@@ -1,0 +2,24 @@
+Fri Sep 30 14:05:29 CEST 2016 - jsl...@suse.cz
+
+- rpm/package-descriptions: the flavor is 64kb, not 64k
+- commit 2e05d02
+
+-------------------------------------------------------------------
+Fri Sep 30 13:26:33 CEST 2016 - jsl...@suse.cz
+
+- Linux 4.7.6 (bsc#997639 bsc#999600).
+- Delete
+ patches.fixes/autofs-use-dentry-flags-to-block-walks-during-expire.
+- Delete
+ patches.suse/btrfs-ensure-that-file-descriptor-used-with-subvol-i.patch.
+- commit 0b20275
+
+-------------------------------------------------------------------
+Mon Sep 26 09:52:29 CEST 2016 - sch...@suse.de
+
+- kernel-module-subpackage: Properly quote flavor in expressions
+ That fixes a parse error if the flavor starts with a digit or contains
+ other non-alphabetic characters.
+- commit 19ba528
+
+-------------------------------------------------------------------
@@ -5 +29 @@
-- commit 8462c50
+- commit 7d9e0ef
@@ -52,0 +77,18 @@
+Wed Sep 21 11:52:48 CEST 2016 - mma...@suse.com
+
+- rpm/package-descriptions: pv has been merged into -default (fate#315712)
+- commit 711ab33
+
+-------------------------------------------------------------------
+Wed Sep 21 11:26:42 CEST 2016 - jsl...@suse.cz
+
+- rpm/package-descriptions: add kernel-syzkaller
+- commit 620032b
+
+-------------------------------------------------------------------
+Wed Sep 21 10:58:48 CEST 2016 - mma...@suse.com
+
+- rpm/kernel-binary.spec.in: Build the -base package unconditionally
(bsc#1000118)
+- commit 1d8c576
+
+-------------------------------------------------------------------
@@ -119,0 +162,6 @@
+Fri Sep 2 12:57:42 CEST 2016 - mma...@suse.com
+
+- rpm/mkspec: Read a default release string from rpm/config.sh (bsc997059)
+- commit cf65a8d
+
+-------------------------------------------------------------------
@@ -6251 +6299 @@
-- commit f7db992
+- commit 6dd25c9
kernel-debug.changes: same change
kernel-default.changes: same change
kernel-docs.changes: same change
kernel-lpae.changes: same change
kernel-obs-build.changes: same change
kernel-obs-qa.changes: same change
kernel-pae.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-vanilla.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-64kb.spec ++++++
--- /var/tmp/diff_new_pack.ht927H/_old 2016-10-04 15:44:58.000000000 +0200
+++ /var/tmp/diff_new_pack.ht927H/_new 2016-10-04 15:44:58.000000000 +0200
@@ -20,7 +20,7 @@
# needssslcertforbuild
%define srcversion 4.7
-%define patchversion 4.7.5
+%define patchversion 4.7.6
%define variant %{nil}
%define vanilla_only 0
@@ -46,10 +46,9 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
-%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS
CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
+%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS
CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf
%_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in
%config_vars; do echo "%%global $config ${!config:-n}"; done)}
-%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
-%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" &&
%CONFIG_SUSE_KERNEL_SUPPORTED == "y")
+%define split_extra (%CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64
%define install_vdso 1
@@ -58,12 +57,12 @@
%endif
Name: kernel-64kb
-Summary: The Linux Kernel
+Summary: Kernel with 64kb PAGE_SIZE
License: GPL-2.0
Group: System/Kernel
-Version: 4.7.5
+Version: 4.7.6
%if 0%{?is_kotd}
-Release: <RELEASE>.g02c4d35
+Release: <RELEASE>.gfb37fcc
%else
Release: 0
%endif
@@ -86,7 +85,6 @@
Provides: %name-%version-%source_rel
Provides: %{name}_%_target_cpu = %version-%release
Provides: multiversion(kernel)
-%if %split_base
Provides: kernel-base = %version-%source_rel
# In SLE11, kernel-$flavor complemented kernel-$flavor-base. With SLE12,
# kernel-$flavor itself contains all the needed files and kernel-$flavor-base
@@ -95,7 +93,6 @@
# owned by multiple packages now. The dependency is not correct wrt openSUSE
# 11.2 - 11.4, but we primarily care about the supported upgrade path.
Obsoletes: %name-base < 3.1
-%endif
# The following is copied to the -base subpackage as well
# BEGIN COMMON DEPS
Requires(pre): coreutils awk
@@ -366,7 +363,10 @@
%define supported_modules_check 0
%description
-The Linux Kernel.
+This kernel is identical to the default kernel, but is configured with
+64kb page size granule. Its main purpose is to serve as compatibility
+kernel for systems that were installed when the default kernel was still
+configured with 64kb page size granule.
%source_timestamp
@@ -776,7 +776,6 @@
exit 1
fi
-%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir \
@@ -790,12 +789,6 @@
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif
-%else
- ( cd %buildroot
- find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko'
-printf '/%%p\n'
- ) > %my_builddir/base-modules
-%endif
-
# The modules.dep file is sorted randomly which produces strange file
# checksums. As the file is not included in the resulting RPM, it's
# pointless to rely on its contents. Replacing by zeros to make the
@@ -909,26 +902,20 @@
find etc/uefi/certs -type f -printf '/%%p\n'
fi
if test -d lib/firmware/%kernelrelease-%build_flavor; then
-%if %split_base
echo "%%dir /lib/firmware/%kernelrelease-%build_flavor"
cat %my_builddir/base-firmware
-%else
- echo "/lib/firmware/%kernelrelease-%build_flavor"
-%endif
fi
if [ -e .%_docdir/%name ]; then
echo "%%doc %_docdir/%name"
fi
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
-%if %split_base
{
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules}
if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then
echo "/lib/firmware/%kernelrelease-%build_flavor"
fi
} > %my_builddir/kernel-main.files
-%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules >
%my_builddir/kernel-extra.files
%endif
@@ -951,18 +938,12 @@
%post -f post.sh
-%if %split_base
-
%files -f kernel-main.files
%defattr(-, root, root)
-%else
-%files -f kernel-base.files
-%defattr(-, root, root)
-%endif
%package base
-Summary: The Linux Kernel - base modules
+Summary: Kernel with 64kb PAGE_SIZE - base modules
Group: System/Kernel
Url: http://www.kernel.org/
Provides: kernel-base = %version-%source_rel
@@ -998,7 +979,10 @@
%endif
%description base
-The Linux Kernel.
+This kernel is identical to the default kernel, but is configured with
+64kb page size granule. Its main purpose is to serve as compatibility
+kernel for systems that were installed when the default kernel was still
+configured with 64kb page size granule.
This package contains only the base modules, required in all installs.
@@ -1012,14 +996,11 @@
%post base -f post-base.sh
-%if %split_base
-
%files base -f kernel-base.files
%defattr(-, root, root)
-%endif
%package extra
-Summary: The Linux Kernel - Unsupported kernel modules
+Summary: Kernel with 64kb PAGE_SIZE - Unsupported kernel modules
Group: System/Kernel
Url: http://www.kernel.org/
Provides: %name-extra_%_target_cpu = %version-%release
@@ -1038,7 +1019,10 @@
%endif
%description extra
-The Linux Kernel.
+This kernel is identical to the default kernel, but is configured with
+64kb page size granule. Its main purpose is to serve as compatibility
+kernel for systems that were installed when the default kernel was still
+configured with 64kb page size granule.
This package contains additional modules not supported by Novell.
@@ -1138,8 +1122,6 @@
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
-%if %split_base
-%endif
%changelog
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.ht927H/_old 2016-10-04 15:44:58.000000000 +0200
+++ /var/tmp/diff_new_pack.ht927H/_new 2016-10-04 15:44:58.000000000 +0200
@@ -20,7 +20,7 @@
# needssslcertforbuild
%define srcversion 4.7
-%define patchversion 4.7.5
+%define patchversion 4.7.6
%define variant %{nil}
%define vanilla_only 0
@@ -46,10 +46,9 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
-%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS
CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
+%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS
CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf
%_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in
%config_vars; do echo "%%global $config ${!config:-n}"; done)}
-%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
-%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" &&
%CONFIG_SUSE_KERNEL_SUPPORTED == "y")
+%define split_extra (%CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64
%define install_vdso 1
@@ -61,9 +60,9 @@
Summary: A Debug Version of the Kernel
License: GPL-2.0
Group: System/Kernel
-Version: 4.7.5
+Version: 4.7.6
%if 0%{?is_kotd}
-Release: <RELEASE>.g02c4d35
+Release: <RELEASE>.gfb37fcc
%else
Release: 0
%endif
@@ -86,7 +85,6 @@
Provides: %name-%version-%source_rel
Provides: %{name}_%_target_cpu = %version-%release
Provides: multiversion(kernel)
-%if %split_base
Provides: kernel-base = %version-%source_rel
# In SLE11, kernel-$flavor complemented kernel-$flavor-base. With SLE12,
# kernel-$flavor itself contains all the needed files and kernel-$flavor-base
@@ -95,7 +93,6 @@
# owned by multiple packages now. The dependency is not correct wrt openSUSE
# 11.2 - 11.4, but we primarily care about the supported upgrade path.
Obsoletes: %name-base < 3.1
-%endif
# The following is copied to the -base subpackage as well
# BEGIN COMMON DEPS
Requires(pre): coreutils awk
@@ -783,7 +780,6 @@
exit 1
fi
-%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir \
@@ -797,12 +793,6 @@
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif
-%else
- ( cd %buildroot
- find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko'
-printf '/%%p\n'
- ) > %my_builddir/base-modules
-%endif
-
# The modules.dep file is sorted randomly which produces strange file
# checksums. As the file is not included in the resulting RPM, it's
# pointless to rely on its contents. Replacing by zeros to make the
@@ -916,26 +906,20 @@
find etc/uefi/certs -type f -printf '/%%p\n'
fi
if test -d lib/firmware/%kernelrelease-%build_flavor; then
-%if %split_base
echo "%%dir /lib/firmware/%kernelrelease-%build_flavor"
cat %my_builddir/base-firmware
-%else
- echo "/lib/firmware/%kernelrelease-%build_flavor"
-%endif
fi
if [ -e .%_docdir/%name ]; then
echo "%%doc %_docdir/%name"
fi
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
-%if %split_base
{
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules}
if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then
echo "/lib/firmware/%kernelrelease-%build_flavor"
fi
} > %my_builddir/kernel-main.files
-%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules >
%my_builddir/kernel-extra.files
%endif
@@ -958,15 +942,9 @@
%post -f post.sh
-%if %split_base
-
%files -f kernel-main.files
%defattr(-, root, root)
-%else
-%files -f kernel-base.files
-%defattr(-, root, root)
-%endif
%package base
Summary: A Debug Version of the Kernel - base modules
@@ -1023,11 +1001,8 @@
%post base -f post-base.sh
-%if %split_base
-
%files base -f kernel-base.files
%defattr(-, root, root)
-%endif
%package extra
Summary: A Debug Version of the Kernel - Unsupported kernel modules
@@ -1156,8 +1131,6 @@
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
-%if %split_base
-%endif
%changelog
kernel-default.spec: same change
++++++ kernel-docs.spec ++++++
--- /var/tmp/diff_new_pack.ht927H/_old 2016-10-04 15:44:58.000000000 +0200
+++ /var/tmp/diff_new_pack.ht927H/_new 2016-10-04 15:44:58.000000000 +0200
@@ -16,7 +16,7 @@
#
-%define patchversion 4.7.5
+%define patchversion 4.7.6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -27,9 +27,9 @@
Summary: Kernel Documentation (man pages)
License: GPL-2.0
Group: Documentation/Man
-Version: 4.7.5
+Version: 4.7.6
%if 0%{?is_kotd}
-Release: <RELEASE>.g02c4d35
+Release: <RELEASE>.gfb37fcc
%else
Release: 0
%endif
++++++ kernel-lpae.spec ++++++
--- /var/tmp/diff_new_pack.ht927H/_old 2016-10-04 15:44:58.000000000 +0200
+++ /var/tmp/diff_new_pack.ht927H/_new 2016-10-04 15:44:58.000000000 +0200
@@ -20,7 +20,7 @@
# needssslcertforbuild
%define srcversion 4.7
-%define patchversion 4.7.5
+%define patchversion 4.7.6
%define variant %{nil}
%define vanilla_only 0
@@ -46,10 +46,9 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
-%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS
CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
+%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS
CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf
%_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in
%config_vars; do echo "%%global $config ${!config:-n}"; done)}
-%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
-%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" &&
%CONFIG_SUSE_KERNEL_SUPPORTED == "y")
+%define split_extra (%CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64
%define install_vdso 1
@@ -61,9 +60,9 @@
Summary: Kernel for LPAE enabled systems
License: GPL-2.0
Group: System/Kernel
-Version: 4.7.5
+Version: 4.7.6
%if 0%{?is_kotd}
-Release: <RELEASE>.g02c4d35
+Release: <RELEASE>.gfb37fcc
%else
Release: 0
%endif
@@ -86,7 +85,6 @@
Provides: %name-%version-%source_rel
Provides: %{name}_%_target_cpu = %version-%release
Provides: multiversion(kernel)
-%if %split_base
Provides: kernel-base = %version-%source_rel
# In SLE11, kernel-$flavor complemented kernel-$flavor-base. With SLE12,
# kernel-$flavor itself contains all the needed files and kernel-$flavor-base
@@ -95,7 +93,6 @@
# owned by multiple packages now. The dependency is not correct wrt openSUSE
# 11.2 - 11.4, but we primarily care about the supported upgrade path.
Obsoletes: %name-base < 3.1
-%endif
# The following is copied to the -base subpackage as well
# BEGIN COMMON DEPS
Requires(pre): coreutils awk
@@ -777,7 +774,6 @@
exit 1
fi
-%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir \
@@ -791,12 +787,6 @@
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif
-%else
- ( cd %buildroot
- find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko'
-printf '/%%p\n'
- ) > %my_builddir/base-modules
-%endif
-
# The modules.dep file is sorted randomly which produces strange file
# checksums. As the file is not included in the resulting RPM, it's
# pointless to rely on its contents. Replacing by zeros to make the
@@ -910,26 +900,20 @@
find etc/uefi/certs -type f -printf '/%%p\n'
fi
if test -d lib/firmware/%kernelrelease-%build_flavor; then
-%if %split_base
echo "%%dir /lib/firmware/%kernelrelease-%build_flavor"
cat %my_builddir/base-firmware
-%else
- echo "/lib/firmware/%kernelrelease-%build_flavor"
-%endif
fi
if [ -e .%_docdir/%name ]; then
echo "%%doc %_docdir/%name"
fi
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
-%if %split_base
{
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules}
if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then
echo "/lib/firmware/%kernelrelease-%build_flavor"
fi
} > %my_builddir/kernel-main.files
-%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules >
%my_builddir/kernel-extra.files
%endif
@@ -952,15 +936,9 @@
%post -f post.sh
-%if %split_base
-
%files -f kernel-main.files
%defattr(-, root, root)
-%else
-%files -f kernel-base.files
-%defattr(-, root, root)
-%endif
%package base
Summary: Kernel for LPAE enabled systems - base modules
@@ -1014,11 +992,8 @@
%post base -f post-base.sh
-%if %split_base
-
%files base -f kernel-base.files
%defattr(-, root, root)
-%endif
%package extra
Summary: Kernel for LPAE enabled systems - Unsupported kernel modules
@@ -1141,8 +1116,6 @@
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
-%if %split_base
-%endif
%changelog
++++++ kernel-obs-build.spec ++++++
--- /var/tmp/diff_new_pack.ht927H/_old 2016-10-04 15:44:59.000000000 +0200
+++ /var/tmp/diff_new_pack.ht927H/_new 2016-10-04 15:44:59.000000000 +0200
@@ -19,7 +19,7 @@
#!BuildIgnore: post-build-checks
-%define patchversion 4.7.5
+%define patchversion 4.7.6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -51,9 +51,9 @@
Summary: package kernel and initrd for OBS VM builds
License: GPL-2.0
Group: SLES
-Version: 4.7.5
+Version: 4.7.6
%if 0%{?is_kotd}
-Release: <RELEASE>.g02c4d35
+Release: <RELEASE>.gfb37fcc
%else
Release: 0
%endif
++++++ kernel-obs-qa.spec ++++++
--- /var/tmp/diff_new_pack.ht927H/_old 2016-10-04 15:44:59.000000000 +0200
+++ /var/tmp/diff_new_pack.ht927H/_new 2016-10-04 15:44:59.000000000 +0200
@@ -17,7 +17,7 @@
# needsrootforbuild
-%define patchversion 4.7.5
+%define patchversion 4.7.6
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -36,9 +36,9 @@
Summary: Basic QA tests for the kernel
License: GPL-2.0
Group: SLES
-Version: 4.7.5
+Version: 4.7.6
%if 0%{?is_kotd}
-Release: <RELEASE>.g02c4d35
+Release: <RELEASE>.gfb37fcc
%else
Release: 0
%endif
++++++ kernel-pae.spec ++++++
--- /var/tmp/diff_new_pack.ht927H/_old 2016-10-04 15:44:59.000000000 +0200
+++ /var/tmp/diff_new_pack.ht927H/_new 2016-10-04 15:44:59.000000000 +0200
@@ -20,7 +20,7 @@
# needssslcertforbuild
%define srcversion 4.7
-%define patchversion 4.7.5
+%define patchversion 4.7.6
%define variant %{nil}
%define vanilla_only 0
@@ -46,10 +46,9 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
-%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS
CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
+%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS
CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf
%_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in
%config_vars; do echo "%%global $config ${!config:-n}"; done)}
-%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
-%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" &&
%CONFIG_SUSE_KERNEL_SUPPORTED == "y")
+%define split_extra (%CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64
%define install_vdso 1
@@ -61,9 +60,9 @@
Summary: Kernel with PAE Support
License: GPL-2.0
Group: System/Kernel
-Version: 4.7.5
+Version: 4.7.6
%if 0%{?is_kotd}
-Release: <RELEASE>.g02c4d35
+Release: <RELEASE>.gfb37fcc
%else
Release: 0
%endif
@@ -86,7 +85,6 @@
Provides: %name-%version-%source_rel
Provides: %{name}_%_target_cpu = %version-%release
Provides: multiversion(kernel)
-%if %split_base
Provides: kernel-base = %version-%source_rel
# In SLE11, kernel-$flavor complemented kernel-$flavor-base. With SLE12,
# kernel-$flavor itself contains all the needed files and kernel-$flavor-base
@@ -95,7 +93,6 @@
# owned by multiple packages now. The dependency is not correct wrt openSUSE
# 11.2 - 11.4, but we primarily care about the supported upgrade path.
Obsoletes: %name-base < 3.1
-%endif
# The following is copied to the -base subpackage as well
# BEGIN COMMON DEPS
Requires(pre): coreutils awk
@@ -803,7 +800,6 @@
exit 1
fi
-%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir \
@@ -817,12 +813,6 @@
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif
-%else
- ( cd %buildroot
- find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko'
-printf '/%%p\n'
- ) > %my_builddir/base-modules
-%endif
-
# The modules.dep file is sorted randomly which produces strange file
# checksums. As the file is not included in the resulting RPM, it's
# pointless to rely on its contents. Replacing by zeros to make the
@@ -936,26 +926,20 @@
find etc/uefi/certs -type f -printf '/%%p\n'
fi
if test -d lib/firmware/%kernelrelease-%build_flavor; then
-%if %split_base
echo "%%dir /lib/firmware/%kernelrelease-%build_flavor"
cat %my_builddir/base-firmware
-%else
- echo "/lib/firmware/%kernelrelease-%build_flavor"
-%endif
fi
if [ -e .%_docdir/%name ]; then
echo "%%doc %_docdir/%name"
fi
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
-%if %split_base
{
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules}
if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then
echo "/lib/firmware/%kernelrelease-%build_flavor"
fi
} > %my_builddir/kernel-main.files
-%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules >
%my_builddir/kernel-extra.files
%endif
@@ -978,15 +962,9 @@
%post -f post.sh
-%if %split_base
-
%files -f kernel-main.files
%defattr(-, root, root)
-%else
-%files -f kernel-base.files
-%defattr(-, root, root)
-%endif
%package base
Summary: Kernel with PAE Support - base modules
@@ -1055,11 +1033,8 @@
%post base -f post-base.sh
-%if %split_base
-
%files base -f kernel-base.files
%defattr(-, root, root)
-%endif
%package extra
Summary: Kernel with PAE Support - Unsupported kernel modules
@@ -1206,8 +1181,6 @@
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
-%if %split_base
-%endif
%changelog
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.ht927H/_old 2016-10-04 15:44:59.000000000 +0200
+++ /var/tmp/diff_new_pack.ht927H/_new 2016-10-04 15:44:59.000000000 +0200
@@ -18,7 +18,7 @@
%define srcversion 4.7
-%define patchversion 4.7.5
+%define patchversion 4.7.6
%define variant %{nil}
%define vanilla_only 0
@@ -30,9 +30,9 @@
Summary: The Linux Kernel Sources
License: GPL-2.0
Group: Development/Sources
-Version: 4.7.5
+Version: 4.7.6
%if 0%{?is_kotd}
-Release: <RELEASE>.g02c4d35
+Release: <RELEASE>.gfb37fcc
%else
Release: 0
%endif
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.ht927H/_old 2016-10-04 15:44:59.000000000 +0200
+++ /var/tmp/diff_new_pack.ht927H/_new 2016-10-04 15:44:59.000000000 +0200
@@ -24,10 +24,10 @@
Summary: Kernel Symbol Versions (modversions)
License: GPL-2.0
Group: Development/Sources
-Version: 4.7.5
+Version: 4.7.6
%if %using_buildservice
%if 0%{?is_kotd}
-Release: <RELEASE>.g02c4d35
+Release: <RELEASE>.gfb37fcc
%else
Release: 0
%endif
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.ht927H/_old 2016-10-04 15:44:59.000000000 +0200
+++ /var/tmp/diff_new_pack.ht927H/_new 2016-10-04 15:44:59.000000000 +0200
@@ -20,7 +20,7 @@
# needssslcertforbuild
%define srcversion 4.7
-%define patchversion 4.7.5
+%define patchversion 4.7.6
%define variant %{nil}
%define vanilla_only 0
@@ -46,10 +46,9 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
-%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS
CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
+%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS
CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf
%_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in
%config_vars; do echo "%%global $config ${!config:-n}"; done)}
-%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
-%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" &&
%CONFIG_SUSE_KERNEL_SUPPORTED == "y")
+%define split_extra (%CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64
%define install_vdso 1
@@ -61,9 +60,9 @@
Summary: The Standard Kernel - without any SUSE patches
License: GPL-2.0
Group: System/Kernel
-Version: 4.7.5
+Version: 4.7.6
%if 0%{?is_kotd}
-Release: <RELEASE>.g02c4d35
+Release: <RELEASE>.gfb37fcc
%else
Release: 0
%endif
@@ -86,7 +85,6 @@
Provides: %name-%version-%source_rel
Provides: %{name}_%_target_cpu = %version-%release
Provides: multiversion(kernel)
-%if %split_base
Provides: kernel-base = %version-%source_rel
# In SLE11, kernel-$flavor complemented kernel-$flavor-base. With SLE12,
# kernel-$flavor itself contains all the needed files and kernel-$flavor-base
@@ -95,7 +93,6 @@
# owned by multiple packages now. The dependency is not correct wrt openSUSE
# 11.2 - 11.4, but we primarily care about the supported upgrade path.
Obsoletes: %name-base < 3.1
-%endif
# The following is copied to the -base subpackage as well
# BEGIN COMMON DEPS
Requires(pre): coreutils awk
@@ -776,7 +773,6 @@
exit 1
fi
-%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir \
@@ -790,12 +786,6 @@
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif
-%else
- ( cd %buildroot
- find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko'
-printf '/%%p\n'
- ) > %my_builddir/base-modules
-%endif
-
# The modules.dep file is sorted randomly which produces strange file
# checksums. As the file is not included in the resulting RPM, it's
# pointless to rely on its contents. Replacing by zeros to make the
@@ -909,26 +899,20 @@
find etc/uefi/certs -type f -printf '/%%p\n'
fi
if test -d lib/firmware/%kernelrelease-%build_flavor; then
-%if %split_base
echo "%%dir /lib/firmware/%kernelrelease-%build_flavor"
cat %my_builddir/base-firmware
-%else
- echo "/lib/firmware/%kernelrelease-%build_flavor"
-%endif
fi
if [ -e .%_docdir/%name ]; then
echo "%%doc %_docdir/%name"
fi
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
-%if %split_base
{
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules}
if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then
echo "/lib/firmware/%kernelrelease-%build_flavor"
fi
} > %my_builddir/kernel-main.files
-%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules >
%my_builddir/kernel-extra.files
%endif
@@ -951,15 +935,9 @@
%post -f post.sh
-%if %split_base
-
%files -f kernel-main.files
%defattr(-, root, root)
-%else
-%files -f kernel-base.files
-%defattr(-, root, root)
-%endif
%package base
Summary: The Standard Kernel - without any SUSE patches - base modules
@@ -1012,11 +990,8 @@
%post base -f post-base.sh
-%if %split_base
-
%files base -f kernel-base.files
%defattr(-, root, root)
-%endif
%package extra
Summary: The Standard Kernel - without any SUSE patches - Unsupported
kernel modules
@@ -1138,8 +1113,6 @@
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
-%if %split_base
-%endif
%changelog
++++++ kernel-binary.spec.in ++++++
--- /var/tmp/diff_new_pack.ht927H/_old 2016-10-04 15:44:59.000000000 +0200
+++ /var/tmp/diff_new_pack.ht927H/_new 2016-10-04 15:44:59.000000000 +0200
@@ -46,10 +46,9 @@
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
-%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS
CONFIG_SPLIT_PACKAGE CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
+%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_KMSG_IDS
CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf
%_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in
%config_vars; do echo "%%global $config ${!config:-n}"; done)}
-%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
-%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" &&
%CONFIG_SUSE_KERNEL_SUPPORTED == "y")
+%define split_extra (%CONFIG_SUSE_KERNEL_SUPPORTED == "y")
%ifarch %ix86 x86_64
%define install_vdso 1
@@ -86,7 +85,6 @@
Provides: %name-%version-%source_rel
Provides: %{name}_%_target_cpu = %version-%release
Provides: multiversion(kernel)
-%if %split_base
Provides: kernel-base = %version-%source_rel
# In SLE11, kernel-$flavor complemented kernel-$flavor-base. With SLE12,
# kernel-$flavor itself contains all the needed files and kernel-$flavor-base
@@ -95,7 +93,6 @@
# owned by multiple packages now. The dependency is not correct wrt openSUSE
# 11.2 - 11.4, but we primarily care about the supported upgrade path.
Obsoletes: %name-base < 3.1
-%endif
# The following is copied to the -base subpackage as well
# BEGIN COMMON DEPS
Requires(pre): coreutils awk
@@ -650,7 +647,6 @@
exit 1
fi
-%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir \
@@ -664,12 +660,6 @@
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif
-%else
- ( cd %buildroot
- find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko'
-printf '/%%p\n'
- ) > %my_builddir/base-modules
-%endif
-
# The modules.dep file is sorted randomly which produces strange file
# checksums. As the file is not included in the resulting RPM, it's
# pointless to rely on its contents. Replacing by zeros to make the
@@ -783,26 +773,20 @@
find etc/uefi/certs -type f -printf '/%%p\n'
fi
if test -d lib/firmware/%kernelrelease-%build_flavor; then
-%if %split_base
echo "%%dir /lib/firmware/%kernelrelease-%build_flavor"
cat %my_builddir/base-firmware
-%else
- echo "/lib/firmware/%kernelrelease-%build_flavor"
-%endif
fi
if [ -e .%_docdir/%name ]; then
echo "%%doc %_docdir/%name"
fi
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
-%if %split_base
{
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules}
if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then
echo "/lib/firmware/%kernelrelease-%build_flavor"
fi
} > %my_builddir/kernel-main.files
-%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules >
%my_builddir/kernel-extra.files
%endif
@@ -825,15 +809,9 @@
%post -f post.sh
-%if %split_base
-
%files -f kernel-main.files
%defattr(-, root, root)
-%else
-%files -f kernel-base.files
-%defattr(-, root, root)
-%endif
%package base
Summary: @SUMMARY@ - base modules
@@ -864,11 +842,8 @@
%post base -f post-base.sh
-%if %split_base
-
%files base -f kernel-base.files
%defattr(-, root, root)
-%endif
%package extra
Summary: @SUMMARY@ - Unsupported kernel modules
@@ -990,7 +965,6 @@
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
-%if %split_base
# BEGIN KMP
%package -n @KMP_NAME@-%build_flavor
Summary: @KMP_SUMMARY@
@@ -1033,6 +1007,5 @@
%defattr(-, root, root)
# END KMP
-%endif
%changelog
++++++ kernel-module-subpackage ++++++
--- /var/tmp/diff_new_pack.ht927H/_old 2016-10-04 15:44:59.000000000 +0200
+++ /var/tmp/diff_new_pack.ht927H/_new 2016-10-04 15:44:59.000000000 +0200
@@ -26,7 +26,7 @@
Requires: coreutils grep
%{-c:Requires: %{-n*}-ueficert}
Enhances: kernel-%1
-%if %1 == "default"
+%if "%1" == "default"
Obsoletes: %{-n*}-kmp-trace
%ifarch %ix86
Obsoletes: %{-n*}-kmp-vmi
@@ -38,7 +38,7 @@
Obsoletes: %{-n*}-kmp-xen
%endif
%endif
-%if %1 == "pae"
+%if "%1" == "pae"
Obsoletes: %{-n*}-kmp-desktop
%endif
AutoReqProv: on
++++++ mkspec ++++++
--- /var/tmp/diff_new_pack.ht927H/_old 2016-10-04 15:45:00.000000000 +0200
+++ /var/tmp/diff_new_pack.ht927H/_new 2016-10-04 15:45:00.000000000 +0200
@@ -7,7 +7,7 @@
use Getopt::Long;
my $dir = ".";
-my $rpmrelease = 0;
+my $rpmrelease;
my $patches="";
GetOptions(
@@ -30,6 +30,9 @@
my ($srcversion, $variant, $vanilla_only) =
($vars{'SRCVERSION'}, $vars{'VARIANT'}, $vars{'VANILLA_ONLY'});
$vanilla_only ||= "0";
+if (!defined ($rpmrelease)) {
+ $rpmrelease = $vars{'RELEASE'} || 0;
+}
# package name -> [summary, description]
my %binary_descriptions = parse_descriptions();
@@ -261,7 +264,9 @@
while (<$fh>) {
chomp;
if (/^\s*([A-Z_]+)=(.*)/) {
- $res{$1} = $2;
+ my ($key, $val) = ($1, $2);
+ $val =~ s/^"(.*)"$/$1/;
+ $res{$key} = $val;
}
}
close($fh);
++++++ package-descriptions ++++++
--- /var/tmp/diff_new_pack.ht927H/_old 2016-10-04 15:45:00.000000000 +0200
+++ /var/tmp/diff_new_pack.ht927H/_new 2016-10-04 15:45:00.000000000 +0200
@@ -53,14 +53,7 @@
This kernel can only be used as an unprivileged ("xenU") kernel
(mainly, but not exclusively, for Amazon EC2).
-=== kernel-pv ===
-The para-virtualized Kernel
-
-The Linux kernel for Xen (and other) paravirtualization, using pv-ops
-in the Xen/x86 case, in which case it can be used both as the domain0
-("xen0") and as an unprivileged ("xenU") kernel.
-
-=== kernel-64k ===
+=== kernel-64kb ===
Kernel with 64kb PAGE_SIZE
This kernel is identical to the default kernel, but is configured with
@@ -85,6 +78,13 @@
The standard kernel for Samsung's Exynos 4 & 5 SoC, as found in the Origen
board.
+=== kernel-syzkaller ===
+Kernel used for fuzzing by syzkaller
+
+The syzkaller kernel should be used solely in a virtual machine by
+syzkaller only. It supports kernel coverage and enables a lot of slow
+debugging options.
+
=== kernel-versatile ===
Kernel for Versatile SoC
++++++ patches.fixes.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.fixes/autofs-use-dentry-flags-to-block-walks-during-expire
new/patches.fixes/autofs-use-dentry-flags-to-block-walks-during-expire
--- old/patches.fixes/autofs-use-dentry-flags-to-block-walks-during-expire
2016-09-25 12:39:49.000000000 +0200
+++ new/patches.fixes/autofs-use-dentry-flags-to-block-walks-during-expire
1970-01-01 01:00:00.000000000 +0100
@@ -1,137 +0,0 @@
-From: Ian Kent <ra...@themaw.net>
-Date: Thu, 1 Sep 2016 09:21:14 +0800
-Subject: [PATCH] autofs - use dentry flags to block walks during expire
-Patch-mainline: v4.8
-Git-commit: 7cbdb4a286a60c5d519cb9223fe2134d26870d39
-References: bsc#997639
-
-Somewhere along the way the autofs expire operation has changed to
-hold a spin lock over expired dentry selection. The autofs indirect
-mount expired dentry selection is complicated and quite lengthy so
-it isn't appropriate to hold a spin lock over the operation.
-
-Commit 47be6184 added a might_sleep() to dput() causing a BUG()
-about this usage to be issued.
-
-But the spin lock doesn't need to be held over this check, the
-autofs dentry info. flags are enough to block walks into dentrys
-during the expire.
-
-I've left the direct mount expire as it is (for now) becuase it
-is much simpler and quicker than the indirect mount expire and
-adding spin lock release and re-aquires would do nothing more
-than add overhead.
-
-Signed-off-by: Ian Kent <ra...@themaw.net>
-Signed-off-by: Takashi Iwai <ti...@suse.de>
-
----
- fs/autofs4/expire.c | 55
+++++++++++++++++++++++++++++++++++++++-------------
- 1 file changed, 42 insertions(+), 13 deletions(-)
-
---- a/fs/autofs4/expire.c
-+++ b/fs/autofs4/expire.c
-@@ -417,6 +417,7 @@ static struct dentry *should_expire(stru
- }
- return NULL;
- }
-+
- /*
- * Find an eligible tree to time-out
- * A tree is eligible if :-
-@@ -432,6 +433,7 @@ struct dentry *autofs4_expire_indirect(s
- struct dentry *root = sb->s_root;
- struct dentry *dentry;
- struct dentry *expired;
-+ struct dentry *found;
- struct autofs_info *ino;
-
- if (!root)
-@@ -442,31 +444,46 @@ struct dentry *autofs4_expire_indirect(s
-
- dentry = NULL;
- while ((dentry = get_next_positive_subdir(dentry, root))) {
-+ int flags = how;
-+
- spin_lock(&sbi->fs_lock);
- ino = autofs4_dentry_ino(dentry);
-- if (ino->flags & AUTOFS_INF_WANT_EXPIRE)
-- expired = NULL;
-- else
-- expired = should_expire(dentry, mnt, timeout, how);
-- if (!expired) {
-+ if (ino->flags & AUTOFS_INF_WANT_EXPIRE) {
- spin_unlock(&sbi->fs_lock);
- continue;
- }
-+ spin_unlock(&sbi->fs_lock);
-+
-+ expired = should_expire(dentry, mnt, timeout, flags);
-+ if (!expired)
-+ continue;
-+
-+ spin_lock(&sbi->fs_lock);
- ino = autofs4_dentry_ino(expired);
- ino->flags |= AUTOFS_INF_WANT_EXPIRE;
- spin_unlock(&sbi->fs_lock);
- synchronize_rcu();
-- spin_lock(&sbi->fs_lock);
-- if (should_expire(expired, mnt, timeout, how)) {
-- if (expired != dentry)
-- dput(dentry);
-- goto found;
-- }
-
-+ /* Make sure a reference is not taken on found if
-+ * things have changed.
-+ */
-+ flags &= ~AUTOFS_EXP_LEAVES;
-+ found = should_expire(expired, mnt, timeout, how);
-+ if (!found || found != expired)
-+ /* Something has changed, continue */
-+ goto next;
-+
-+ if (expired != dentry)
-+ dput(dentry);
-+
-+ spin_lock(&sbi->fs_lock);
-+ goto found;
-+next:
-+ spin_lock(&sbi->fs_lock);
- ino->flags &= ~AUTOFS_INF_WANT_EXPIRE;
-+ spin_unlock(&sbi->fs_lock);
- if (expired != dentry)
- dput(expired);
-- spin_unlock(&sbi->fs_lock);
- }
- return NULL;
-
-@@ -483,6 +500,7 @@ int autofs4_expire_wait(struct dentry *d
- struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
- struct autofs_info *ino = autofs4_dentry_ino(dentry);
- int status;
-+ int state;
-
- /* Block on any pending expire */
- if (!(ino->flags & AUTOFS_INF_WANT_EXPIRE))
-@@ -490,8 +508,19 @@ int autofs4_expire_wait(struct dentry *d
- if (rcu_walk)
- return -ECHILD;
-
-+retry:
- spin_lock(&sbi->fs_lock);
-- if (ino->flags & AUTOFS_INF_EXPIRING) {
-+ state = ino->flags & (AUTOFS_INF_WANT_EXPIRE | AUTOFS_INF_EXPIRING);
-+ if (state == AUTOFS_INF_WANT_EXPIRE) {
-+ spin_unlock(&sbi->fs_lock);
-+ /*
-+ * Possibly being selected for expire, wait until
-+ * it's selected or not.
-+ */
-+ schedule_timeout_uninterruptible(HZ/10);
-+ goto retry;
-+ }
-+ if (state & AUTOFS_INF_EXPIRING) {
- spin_unlock(&sbi->fs_lock);
-
- pr_debug("waiting for expire %p name=%pd\n", dentry, dentry);
++++++ patches.kernel.org.tar.bz2 ++++++
++++ 2652 lines of diff (skipped)
++++++ patches.suse.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.suse/btrfs-ensure-that-file-descriptor-used-with-subvol-i.patch
new/patches.suse/btrfs-ensure-that-file-descriptor-used-with-subvol-i.patch
--- old/patches.suse/btrfs-ensure-that-file-descriptor-used-with-subvol-i.patch
2016-09-21 16:46:45.000000000 +0200
+++ new/patches.suse/btrfs-ensure-that-file-descriptor-used-with-subvol-i.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,63 +0,0 @@
-From 3417599681be35a9fac77c5128c381467066f028 Mon Sep 17 00:00:00 2001
-From: Jeff Mahoney <je...@suse.com>
-Date: Tue, 20 Sep 2016 22:02:30 -0400
-Subject: btrfs: ensure that file descriptor used with subvol ioctls is a dir
-References: bsc#999600
-Patch-mainline: Submitted to linux-btrfs, 21 Sep 2016
-
-If the subvol/snapshot create/destroy ioctls are passed a regular file
-with execute permissions set, we'll eventually Oops while trying to do
-inode->i_op->lookup via lookup_one_len.
-
-This patch ensures that the file descriptor refers to a directory.
-
-Fixes: cb8e70901d (Btrfs: Fix subvolume creation locking rules)
-Fixes: 76dda93c6a (Btrfs: add snapshot/subvolume destroy ioctl)
-Cc: <sta...@vger.kernel.org> #v2.6.29+
-Signed-off-by: Jeff Mahoney <je...@suse.com>
----
- fs/btrfs/ioctl.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
---- a/fs/btrfs/ioctl.c
-+++ b/fs/btrfs/ioctl.c
-@@ -1620,6 +1620,9 @@ static noinline int btrfs_ioctl_snap_cre
- int namelen;
- int ret = 0;
-
-+ if (!S_ISDIR(file_inode(file)->i_mode))
-+ return -ENOTDIR;
-+
- ret = mnt_want_write_file(file);
- if (ret)
- goto out;
-@@ -1677,6 +1680,9 @@ static noinline int btrfs_ioctl_snap_cre
- struct btrfs_ioctl_vol_args *vol_args;
- int ret;
-
-+ if (!S_ISDIR(file_inode(file)->i_mode))
-+ return -ENOTDIR;
-+
- vol_args = memdup_user(arg, sizeof(*vol_args));
- if (IS_ERR(vol_args))
- return PTR_ERR(vol_args);
-@@ -1700,6 +1706,9 @@ static noinline int btrfs_ioctl_snap_cre
- bool readonly = false;
- struct btrfs_qgroup_inherit *inherit = NULL;
-
-+ if (!S_ISDIR(file_inode(file)->i_mode))
-+ return -ENOTDIR;
-+
- vol_args = memdup_user(arg, sizeof(*vol_args));
- if (IS_ERR(vol_args))
- return PTR_ERR(vol_args);
-@@ -2344,6 +2353,9 @@ static noinline int btrfs_ioctl_snap_des
- int ret;
- int err = 0;
-
-+ if (!S_ISDIR(dir->i_mode))
-+ return -ENOTDIR;
-+
- vol_args = memdup_user(arg, sizeof(*vol_args));
- if (IS_ERR(vol_args))
- return PTR_ERR(vol_args);
++++++ series.conf ++++++
--- /var/tmp/diff_new_pack.ht927H/_old 2016-10-04 15:45:00.000000000 +0200
+++ /var/tmp/diff_new_pack.ht927H/_new 2016-10-04 15:45:00.000000000 +0200
@@ -32,6 +32,7 @@
patches.kernel.org/patch-4.7.2-3
patches.kernel.org/patch-4.7.3-4
patches.kernel.org/patch-4.7.4-5
+ patches.kernel.org/patch-4.7.5-6
########################################################
# Build fixes that apply to the vanilla kernel too.
@@ -261,7 +262,6 @@
# btrfs
########################################################
patches.suse/btrfs-provide-super_operations-get_inode_dev
- patches.suse/btrfs-ensure-that-file-descriptor-used-with-subvol-i.patch
########################################################
# Reiserfs Patches
@@ -289,7 +289,6 @@
patches.drivers/pstore_disable_efi_backend_by_default.patch
patches.suse/pstore-backend-autoaction
- patches.fixes/autofs-use-dentry-flags-to-block-walks-during-expire
########################################################
# Overlayfs
++++++ source-timestamp ++++++
--- /var/tmp/diff_new_pack.ht927H/_old 2016-10-04 15:45:00.000000000 +0200
+++ /var/tmp/diff_new_pack.ht927H/_new 2016-10-04 15:45:00.000000000 +0200
@@ -1,3 +1,3 @@
-2016-09-26 10:11:45 +0200
-GIT Revision: 02c4d354864c8d678437b715c2c0076de96eeb39
+2016-09-30 14:22:14 +0200
+GIT Revision: fb37fcc408151d1b2213b9decd247c68c6ef818b
GIT Branch: stable
