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

config-arm64

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

config-generic

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

kernel.spec

@@ -8,7 +8,7 @@ Summary: The Linux kernel
 # be 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
 # architectures are added.
@@ -42,7 +42,7 @@ Summary: The Linux kernel
 # 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"
 #
-%global baserelease 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2215,6 +2215,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %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>
 - Fix Samsung pci-e SSD handling on some macbooks (rhbz 1161805)