rpms/kernel
7
2
Fork 4
Code Issues Pull Requests Releases Activity

Re-enable kernel-arm64.patch, and fix up merge conflicts with 3.18-rc4

Browse Source
This commit is contained in:
Kyle McMartin 2014-11-11 09:38:12 -05:00
parent 09115662e1
commit 81c4dc55f8
4 changed files with 4873 additions and 1827 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config-arm64
View File

@ -134,5 +134,9 @@ CONFIG_AMD_XGBE_PHY=m
# CONFIG_IMX_THERMAL is not set # CONFIG_IMX_THERMAL is not set
# temporary 2014-10-21 # still? 2014-11-11
# CONFIG_BPF_JIT is not set # CONFIG_BPF_JIT is not set
CONFIG_DMI=y
CONFIG_DMIID=y
CONFIG_DMI_SYSFS=y

3
config-generic
View File

@ -5278,3 +5278,6 @@ CONFIG_FMC_CHARDEV=m
# CONFIG_SBSAUART_TTY is not set # CONFIG_SBSAUART_TTY is not set
# CONFIG_SERIAL_8250_FINTEK is not set # CONFIG_SERIAL_8250_FINTEK is not set
# set in x86-generic presently
# CONFIG_TOUCHSCREEN_GOODIX is not set

6684
kernel-arm64.patch
View File

File diff suppressed because it is too large Load Diff

7
kernel.spec
View File

@ -8,7 +8,7 @@ Summary: The Linux kernel
# be 0. # be 0.
%global released_kernel 0 %global released_kernel 0
%global aarch64patches 0 %global aarch64patches 1
# Sign modules on x86. Make sure the config files match this setting if more # Sign modules on x86. Make sure the config files match this setting if more
# architectures are added. # architectures are added.
@ -42,7 +42,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and # For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
# #
%global baserelease 1 %global baserelease 2
%global fedora_build %{baserelease} %global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching # base_sublevel is the kernel version we're starting with and patching
@ -2215,6 +2215,9 @@ fi
# ||----w | # ||----w |
# || || # || ||
%changelog %changelog
* Tue Nov 11 2014 Kyle McMartin <kyle@fedoraproject.org> - 3.18.0-0.rc4.git0.2
- Re-enable kernel-arm64.patch, and fix up merge conflicts with 3.18-rc4
* Mon Nov 10 2014 Josh Boyer <jwboyer@fedoraproject.org> * Mon Nov 10 2014 Josh Boyer <jwboyer@fedoraproject.org>
- Fix Samsung pci-e SSD handling on some macbooks (rhbz 1161805) - Fix Samsung pci-e SSD handling on some macbooks (rhbz 1161805)