diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-03-02 20:26:22 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-03-02 20:26:22 +0100 |
commit | f362aa1d3a9a2fe44195caf5ddf9e142bc187388 (patch) | |
tree | 628bc00cbaf99b23bce939ae694f45bd210aed80 | |
parent | 06f5da718a141f80f5b1e010da5cd93e89249a81 (diff) | |
parent | 5860e766a687094612f3c37a219f248078148541 (diff) | |
download | kernel-f362aa1d3a9a2fe44195caf5ddf9e142bc187388.tar.gz kernel-f362aa1d3a9a2fe44195caf5ddf9e142bc187388.tar.xz kernel-f362aa1d3a9a2fe44195caf5ddf9e142bc187388.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.16.0-0.rc3.git4.1.vanilla.knurd.1.fc29kernel-4.16.0-0.rc3.git4.1.vanilla.knurd.1.fc28kernel-4.16.0-0.rc3.git4.1.vanilla.knurd.1.fc27kernel-4.16.0-0.rc3.git4.1.vanilla.knurd.1.fc26
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | kernel.spec | 65 | ||||
-rw-r--r-- | platform-x86-Only-activate-tablet-mode-switch-on-2-i.patch | 95 | ||||
-rw-r--r-- | sources | 2 |
4 files changed, 29 insertions, 135 deletions
@@ -1 +1 @@ -97ace515f01439d4cf6e898b4094040dc12d36e7 +5d60e057d127538113d8945ea87d916fccee93fe diff --git a/kernel.spec b/kernel.spec index 3b94e428a..d96a28df9 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 3 # The git snapshot level -%define gitrev 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -381,9 +381,8 @@ Summary: The Linux kernel Name: kernel%{?variant} -Group: System Environment/Kernel License: GPLv2 and Redistributable, no modification permitted -URL: http://www.kernel.org/ +URL: https://www.kernel.org/ Version: %{rpmversion} Release: %{pkg_release} # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD. @@ -620,9 +619,6 @@ Patch313: arm-crypto-sunxi-ss-Add-MODULE_ALIAS-to-sun4i-ss.patch # CVE-2018-7273 rhbz 1547384 1547386 Patch500: floppy-Don-t-print-kernel-addresses-to-log-in-show_f.patch -# Fix keyboard on Dell XPS 9360 https://patchwork.kernel.org/patch/10236253/ -Patch501: platform-x86-Only-activate-tablet-mode-switch-on-2-i.patch - # 600 - Patches for improved Bay and Cherry Trail device support # Below patches are submitted upstream, awaiting review / merging @@ -672,7 +668,6 @@ AutoProv: yes\ %package headers Summary: Header files for the Linux kernel for use by glibc -Group: Development/System Obsoletes: glibc-kernheaders < 3.0-46 Provides: glibc-kernheaders = 3.0-46 %if "0%{?variant}" @@ -688,7 +683,6 @@ glibc package. %package cross-headers Summary: Header files for the Linux kernel for use by cross-glibc -Group: Development/System %description cross-headers Kernel-cross-headers includes the C header files that specify the interface between the Linux kernel and userspace libraries and programs. The @@ -699,7 +693,6 @@ cross-glibc package. %package bootwrapper Summary: Boot wrapper files for generating combined kernel + initrd images -Group: Development/System Requires: gzip binutils %description bootwrapper Kernel-bootwrapper contains the wrapper code which makes bootable "zImage" @@ -707,7 +700,6 @@ files combining both kernel and initial ramdisk. %package debuginfo-common-%{_target_cpu} Summary: Kernel source files used by %{name}-debuginfo packages -Group: Development/Debug Provides: installonlypkg(kernel) %description debuginfo-common-%{_target_cpu} This package is required by %{name}-debuginfo subpackages. @@ -720,7 +712,6 @@ It provides the kernel source files common to all builds. %define kernel_debuginfo_package() \ %package %{?1:%{1}-}debuginfo\ Summary: Debug information for package %{name}%{?1:-%{1}}\ -Group: Development/Debug\ Requires: %{name}-debuginfo-common-%{_target_cpu} = %{version}-%{release}\ Provides: %{name}%{?1:-%{1}}-debuginfo-%{_target_cpu} = %{version}-%{release}\ Provides: installonlypkg(kernel)\ @@ -738,7 +729,6 @@ This is required to use SystemTap with %{name}%{?1:-%{1}}-%{KVERREL}.\ %define kernel_devel_package() \ %package %{?1:%{1}-}devel\ Summary: Development package for building kernel modules to match the %{?2:%{2} }kernel\ -Group: System Environment/Kernel\ Provides: kernel%{?1:-%{1}}-devel-%{_target_cpu} = %{version}-%{release}\ Provides: kernel-devel-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\ Provides: kernel-devel-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\ @@ -759,7 +749,6 @@ against the %{?2:%{2} }kernel package.\ %define kernel_modules_extra_package() \ %package %{?1:%{1}-}modules-extra\ Summary: Extra kernel modules to match the %{?2:%{2} }kernel\ -Group: System Environment/Kernel\ Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release}\ Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\ Provides: kernel%{?1:-%{1}}-modules-extra = %{version}-%{release}%{?1:+%{1}}\ @@ -780,7 +769,6 @@ This package provides less commonly used kernel modules for the %{?2:%{2} }kerne %define kernel_modules_package() \ %package %{?1:%{1}-}modules\ Summary: kernel modules to match the %{?2:%{2}-}core kernel\ -Group: System Environment/Kernel\ Provides: kernel%{?1:-%{1}}-modules-%{_target_cpu} = %{version}-%{release}\ Provides: kernel-modules-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\ Provides: kernel-modules = %{version}-%{release}%{?1:+%{1}}\ @@ -800,7 +788,6 @@ This package provides commonly used kernel modules for the %{?2:%{2}-}core kerne %define kernel_meta_package() \ %package %{1}\ summary: kernel meta-package for the %{1} kernel\ -group: system environment/kernel\ Requires: kernel-%{1}-core-uname-r = %{KVERREL}%{?variant}+%{1}\ Requires: kernel-%{1}-modules-uname-r = %{KVERREL}%{?variant}+%{1}\ Provides: installonlypkg(kernel)\ @@ -816,7 +803,6 @@ The meta-package for the %{1} kernel\ %define kernel_variant_package(n:) \ %package %{?1:%{1}-}core\ Summary: %{variant_summary}\ -Group: System Environment/Kernel\ Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\ Provides: installonlypkg(kernel)\ %{expand:%%kernel_reqprovconf}\ @@ -1316,14 +1302,15 @@ BuildKernel() { # we'll get it from the linux-firmware package and we don't want conflicts %{make} %{?make_opts} ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer mod-fw= + # add an a noop %%defattr statement 'cause rpm doesn't like empty file list files + echo '%%defattr(-,-,-)' > ../kernel${Flavour:+-${Flavour}}-ldsoconf.list if [ $DoVDSO -ne 0 ]; then %{make} %{?make_opts} ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=$KernelVer - if [ ! -s ldconfig-kernel.conf ]; then - echo > ldconfig-kernel.conf "\ - # Placeholder file, no vDSO hwcap entries used in this kernel." + if [ -s ldconfig-kernel.conf ]; then + install -D -m 444 ldconfig-kernel.conf \ + $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernel-$KernelVer.conf + echo /etc/ld.so.conf.d/kernel-$KernelVer.conf >> ../kernel${Flavour:+-${Flavour}}-ldsoconf.list fi - %{__install} -D -m 444 ldconfig-kernel.conf \ - $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernel-$KernelVer.conf rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/vdso/.build-id fi @@ -1356,6 +1343,16 @@ BuildKernel() { cp -a scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build if [ -f tools/objtool/objtool ]; then cp -a tools/objtool/objtool $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/tools/objtool/ || : + # these are a few files associated with objtool + cp -a --parents tools/build/Build.include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ + cp -a --parents tools/build/Build $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ + cp -a --parents tools/build/fixdep.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ + cp -a --parents tools/scripts/utilities.mak $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ + # also more than necessary but it's not that many more files + cp -a --parents tools/objtool/* $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ + cp -a --parents tools/lib/str_error_r.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ + cp -a --parents tools/lib/string.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ + cp -a --parents tools/lib/subcmd/* $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ fi if [ -d arch/$Arch/scripts ]; then cp -a arch/$Arch/scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch} || : @@ -1401,7 +1398,9 @@ BuildKernel() { cp -a --parents arch/x86/tools/relocs.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ cp -a --parents arch/x86/tools/relocs_common.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ cp -a --parents arch/x86/tools/relocs.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ - cp -a --parents tools/include/tools/le_byteshift.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ + # Yes this is more includes than we probably need. Feel free to sort out + # dependencies if you so choose. + cp -a --parents tools/include/* $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ cp -a --parents arch/x86/purgatory/purgatory.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ cp -a --parents arch/x86/purgatory/sha256.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ cp -a --parents arch/x86/purgatory/sha256.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ @@ -1621,7 +1620,6 @@ BuildKernel %make_target %kernel_image %{_use_vdso} %ifnarch noarch %global __debug_package 1 %files -f debugfiles.list debuginfo-common-%{_target_cpu} -%defattr(-,root,root) %endif %endif @@ -1804,27 +1802,22 @@ fi %if %{with_headers} %files headers -%defattr(-,root,root) /usr/include/* %endif %if %{with_cross_headers} %files cross-headers -%defattr(-,root,root) /usr/*-linux-gnu/include/* %endif %if %{with_bootwrapper} %files bootwrapper -%defattr(-,root,root) /usr/sbin/* %{_libdir}/kernel-wrapper %endif # empty meta-package %files -%defattr(-,root,root) - # This is %%{image_install_path} on an arch where that includes ELF files, # or empty otherwise. %define elf_image_install_path %{?kernel_image_elf:%{image_install_path}} @@ -1836,8 +1829,7 @@ fi # %define kernel_variant_files(k:) \ %if %{2}\ -%{expand:%%files -f kernel-%{?3:%{3}-}core.list %{?3:%{3}-}core}\ -%defattr(-,root,root)\ +%{expand:%%files -f kernel-%{?3:%{3}-}core.list %{?1:-f kernel-%{?3:%{3}-}ldsoconf.list} %{?3:%{3}-}core}\ %{!?_licensedir:%global license %%doc}\ %license linux-%{KVERREL}/COPYING\ /lib/modules/%{KVERREL}%{?3:+%{3}}/%{?-k:%{-k*}}%{!?-k:vmlinuz}\ @@ -1862,33 +1854,27 @@ fi /lib/modules/%{KVERREL}%{?3:+%{3}}/bls.conf\ %if %{1}\ /lib/modules/%{KVERREL}%{?3:+%{3}}/vdso\ -/etc/ld.so.conf.d/kernel-%{KVERREL}%{?3:+%{3}}.conf\ %endif\ /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.*\ %{expand:%%files -f kernel-%{?3:%{3}-}modules.list %{?3:%{3}-}modules}\ -%defattr(-,root,root)\ %{expand:%%files %{?3:%{3}-}devel}\ -%defattr(-,root,root)\ %defverify(not mtime)\ /usr/src/kernels/%{KVERREL}%{?3:+%{3}}\ %{expand:%%files %{?3:%{3}-}modules-extra}\ -%defattr(-,root,root)\ /lib/modules/%{KVERREL}%{?3:+%{3}}/extra\ %if %{with_debuginfo}\ %ifnarch noarch\ %{expand:%%files -f debuginfo%{?3}.list %{?3:%{3}-}debuginfo}\ -%defattr(-,root,root)\ %endif\ %endif\ %if %{?3:1} %{!?3:0}\ %{expand:%%files %{3}}\ -%defattr(-,root,root)\ %endif\ %endif\ %{nil} -%kernel_variant_files %{_use_vdso} %{with_up} -%kernel_variant_files %{_use_vdso} %{with_debug} debug +%kernel_variant_files %{_use_vdso} %{with_up} +%kernel_variant_files %{_use_vdso} %{with_debug} debug %kernel_variant_files %{use_vdso} %{with_pae} %{pae} %kernel_variant_files %{use_vdso} %{with_pae_debug} %{pae}debug @@ -1897,6 +1883,9 @@ fi # # %changelog +* Fri Mar 02 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-0.rc3.git4.1 +- Linux v4.16-rc3-245-g5d60e057d127 + * Thu Mar 01 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-0.rc3.git3.1 - Linux v4.16-rc3-167-g97ace515f014 diff --git a/platform-x86-Only-activate-tablet-mode-switch-on-2-i.patch b/platform-x86-Only-activate-tablet-mode-switch-on-2-i.patch deleted file mode 100644 index ab9a24faa..000000000 --- a/platform-x86-Only-activate-tablet-mode-switch-on-2-i.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 7714f7a44a29a4e873d5acfd4c9549c87a4bb4e4 Mon Sep 17 00:00:00 2001 -From: Mario Limonciello <mario.limonciello@dell.com> -Date: Thu, 22 Feb 2018 13:58:42 -0600 -Subject: [PATCH] platform/x86: Only activate tablet mode switch on 2-in-1's - -Some laptops such as the XPS 9360 support the intel-vbtn INT33D6 -interface but don't initialize the bit that intel-vbtn uses to -represent switching tablet mode. - -By running this only on real 2-in-1's it shouldn't cause false -positives. - -Fixes: 30323fb6d5 ("Support tablet mode switch") -Reported-by: Jeremy Cline <jeremy@jcline.org> -Signed-off-by: Mario Limonciello <mario.limonciello@dell.com> ---- - drivers/platform/x86/intel-vbtn.c | 46 ++++++++++++++++++++++++--------------- - 1 file changed, 29 insertions(+), 17 deletions(-) - -diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel-vbtn.c -index b703d6f5b099..8173307d6bb1 100644 ---- a/drivers/platform/x86/intel-vbtn.c -+++ b/drivers/platform/x86/intel-vbtn.c -@@ -7,6 +7,7 @@ - */ - - #include <linux/acpi.h> -+#include <linux/dmi.h> - #include <linux/input.h> - #include <linux/input/sparse-keymap.h> - #include <linux/kernel.h> -@@ -97,9 +98,35 @@ static void notify_handler(acpi_handle handle, u32 event, void *context) - dev_dbg(&device->dev, "unknown event index 0x%x\n", event); - } - --static int intel_vbtn_probe(struct platform_device *device) -+static void detect_tablet_mode(struct platform_device *device) - { -+ const char *chassis_type = dmi_get_system_info(DMI_CHASSIS_TYPE); -+ struct intel_vbtn_priv *priv = dev_get_drvdata(&device->dev); -+ acpi_handle handle = ACPI_HANDLE(&device->dev); - struct acpi_buffer vgbs_output = { ACPI_ALLOCATE_BUFFER, NULL }; -+ union acpi_object *obj; -+ acpi_status status; -+ int m; -+ -+ if (!(chassis_type && strcmp(chassis_type, "31") == 0)) -+ goto out; -+ -+ status = acpi_evaluate_object(handle, "VGBS", NULL, &vgbs_output); -+ if (ACPI_FAILURE(status)) -+ goto out; -+ -+ obj = vgbs_output.pointer; -+ if (!(obj && obj->type == ACPI_TYPE_INTEGER)) -+ goto out; -+ -+ m = !(obj->integer.value & TABLET_MODE_FLAG); -+ input_report_switch(priv->input_dev, SW_TABLET_MODE, m); -+out: -+ kfree(vgbs_output.pointer); -+} -+ -+static int intel_vbtn_probe(struct platform_device *device) -+{ - acpi_handle handle = ACPI_HANDLE(&device->dev); - struct intel_vbtn_priv *priv; - acpi_status status; -@@ -122,22 +149,7 @@ static int intel_vbtn_probe(struct platform_device *device) - return err; - } - -- /* -- * VGBS being present and returning something means we have -- * a tablet mode switch. -- */ -- status = acpi_evaluate_object(handle, "VGBS", NULL, &vgbs_output); -- if (ACPI_SUCCESS(status)) { -- union acpi_object *obj = vgbs_output.pointer; -- -- if (obj && obj->type == ACPI_TYPE_INTEGER) { -- int m = !(obj->integer.value & TABLET_MODE_FLAG); -- -- input_report_switch(priv->input_dev, SW_TABLET_MODE, m); -- } -- } -- -- kfree(vgbs_output.pointer); -+ detect_tablet_mode(device); - - status = acpi_install_notify_handler(handle, - ACPI_DEVICE_NOTIFY, --- -2.16.2 - @@ -1,3 +1,3 @@ SHA512 (linux-4.15.tar.xz) = c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea SHA512 (patch-4.16-rc3.xz) = fd7bbfd9ca423b06341ed83c86417443978d371ddf35987edfc3fcd75b674f24198913a7cab27cb3ff832ade52ae1feba5f9bff303bf6af7fbb64d517e730bb1 -SHA512 (patch-4.16-rc3-git3.xz) = 3e1b29da83a651144bc3876dc94f59641e0d66a7b7ee2feca71c7e05a7e2687659bdda3b95abe2120004b735094ce9ca9c0e7ea69092f2aa7243a9b7647018cc +SHA512 (patch-4.16-rc3-git4.xz) = f1863d328e62745e02e15b1865bf20b9a06e1de66ffb2c48423d0e85a8943e9ff45a799db6eeed1a921d50199276a6f37e4e8765b525eed491eb4352e8de34d8 |