[kernel] Linux v3.16-rc6-118-g82e13c71bc65

[Josh Boyer]

commit 55d061a48760562ba1cb077a229a0f2f72bb0603
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Fri Jul 25 10:03:52 2014 -0400

    Linux v3.16-rc6-118-g82e13c71bc65

 kernel-arm64.patch |   42 ------------------------------------------
 kernel.spec        |    5 +++--
 sources            |    2 +-
 3 files changed, 4 insertions(+), 45 deletions(-)
---
diff --git a/kernel-arm64.patch b/kernel-arm64.patch
index 04f5fab..4295949 100644
--- a/kernel-arm64.patch
+++ b/kernel-arm64.patch
@@ -1782,48 +1782,6 @@ index 0000000..21e68f6
 +ENDPROC(__vgic_v3_get_ich_vtr_el2)
 +
 +	.popsection
-diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
-index f43db8a..e90c542 100644
---- a/arch/arm64/mm/init.c
-+++ b/arch/arm64/mm/init.c
-@@ -60,6 +60,17 @@ static int __init early_initrd(char *p)
- early_param("initrd", early_initrd);
- #endif
- 
-+/*
-+ * Return the maximum physical address for ZONE_DMA (DMA_BIT_MASK(32)). It
-+ * currently assumes that for memory starting above 4G, 32-bit devices will
-+ * use a DMA offset.
-+ */
-+static phys_addr_t max_zone_dma_phys(void)
-+{
-+	phys_addr_t offset = memblock_start_of_DRAM() & GENMASK_ULL(63, 32);
-+	return min(offset + (1ULL << 32), memblock_end_of_DRAM());
-+}
-+
- static void __init zone_sizes_init(unsigned long min, unsigned long max)
- {
- 	struct memblock_region *reg;
-@@ -70,9 +81,7 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max)
- 
- 	/* 4GB maximum for 32-bit only capable devices */
- 	if (IS_ENABLED(CONFIG_ZONE_DMA)) {
--		unsigned long max_dma_phys =
--			(unsigned long)(dma_to_phys(NULL, DMA_BIT_MASK(32)) + 1);
--		max_dma = max(min, min(max, max_dma_phys >> PAGE_SHIFT));
-+		max_dma = PFN_DOWN(max_zone_dma_phys());
- 		zone_size[ZONE_DMA] = max_dma - min;
- 	}
- 	zone_size[ZONE_NORMAL] = max - max_dma;
-@@ -146,7 +155,7 @@ void __init arm64_memblock_init(void)
- 
- 	/* 4GB maximum for 32-bit only capable devices */
- 	if (IS_ENABLED(CONFIG_ZONE_DMA))
--		dma_phys_limit = dma_to_phys(NULL, DMA_BIT_MASK(32)) + 1;
-+		dma_phys_limit = max_zone_dma_phys();
- 	dma_contiguous_reserve(dma_phys_limit);
- 
- 	memblock_allow_resize();
 diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
 index 55d4ba4..deed6fa 100644
 --- a/arch/ia64/kernel/process.c
diff --git a/kernel.spec b/kernel.spec
index 8840dc8..2287a15 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -2258,7 +2258,8 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
-* Fri Jul 25 2014 Josh Boyer <jwboyer at fedoraproject.org>
+* Fri Jul 25 2014 Josh Boyer <jwboyer at fedoraproject.org> - 3.16.0-0.rc6.git2.1
+- Linux v3.16-rc6-118-g82e13c71bc65
 - Fix selinux sock_graft hook for AF_ALG address family (rhbz 1115120)
 
 * Thu Jul 24 2014 Kyle McMartin <kyle at fedoraproject.org>
diff --git a/sources b/sources
index 1e25ec6..5074e14 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 97ca1625bb40368dc41b9a7971549071  linux-3.15.tar.xz
 ef8f4db937f521a7e323ec589536ba25  perf-man-3.15.tar.gz
 93fbbc57b86d1373be5bd94b1ee06ddd  patch-3.16-rc6.xz
-e6b91e7f2dadd80e52017d335c0c433b  patch-3.16-rc6-git1.xz
+cfbb28625de3f01fcd2c633c6f2a8730  patch-3.16-rc6-git2.xz