summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arm64-dma-mapping-Fix-dma_mapping_error-when-bypassing-SWIOTLB.patch66
-rw-r--r--baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I2
-rw-r--r--baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I2
-rw-r--r--kernel-aarch64-debug.config2
-rw-r--r--kernel-aarch64.config2
-rw-r--r--kernel-armv7hl-debug.config2
-rw-r--r--kernel-armv7hl-lpae-debug.config2
-rw-r--r--kernel-armv7hl-lpae.config2
-rw-r--r--kernel-armv7hl.config2
-rw-r--r--kernel.spec10
-rw-r--r--sources2
11 files changed, 14 insertions, 80 deletions
diff --git a/arm64-dma-mapping-Fix-dma_mapping_error-when-bypassing-SWIOTLB.patch b/arm64-dma-mapping-Fix-dma_mapping_error-when-bypassing-SWIOTLB.patch
deleted file mode 100644
index 2e7f51ec6..000000000
--- a/arm64-dma-mapping-Fix-dma_mapping_error-when-bypassing-SWIOTLB.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From patchwork Wed Jan 25 18:31:31 2017
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [v2] arm64: dma-mapping: Fix dma_mapping_error() when bypassing
- SWIOTLB
-From: Robin Murphy <robin.murphy@arm.com>
-X-Patchwork-Id: 9537723
-Message-Id: <840027acb4750542003dff17b4a8902ba8972754.1485368348.git.robin.murphy@arm.com>
-To: will.deacon@arm.com,
- catalin.marinas@arm.com
-Cc: Jisheng Zhang <jszhang@marvell.com>, arnd@arndb.de,
- konrad.wilk@oracle.com, aaro.koskinen@iki.fi, stable@vger.kernel.org,
- linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org
-Date: Wed, 25 Jan 2017 18:31:31 +0000
-
-When bypassing SWIOTLB on small-memory systems, we need to avoid calling
-into swiotlb_dma_mapping_error() in exactly the same way as we avoid
-swiotlb_dma_supported(), because the former also relies on SWIOTLB state
-being initialised.
-
-Under the assumptions for which we skip SWIOTLB, dma_map_{single,page}()
-will only ever return the DMA-offset-adjusted physical address of the
-page passed in, thus we can report success unconditionally.
-
-Fixes: b67a8b29df7e ("arm64: mm: only initialize swiotlb when necessary")
-CC: stable@vger.kernel.org
-CC: Jisheng Zhang <jszhang@marvell.com>
-Reported-by: Aaro Koskinen <aaro.koskinen@iki.fi>
-Signed-off-by: Robin Murphy <robin.murphy@arm.com>
-Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
----
-
-v2: Get the return value the right way round this time... After some
- careful reasoning it really is that simple.
-
- arch/arm64/mm/dma-mapping.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
-index e04082700bb1..1ffb7d5d299a 100644
---- a/arch/arm64/mm/dma-mapping.c
-+++ b/arch/arm64/mm/dma-mapping.c
-@@ -352,6 +352,13 @@ static int __swiotlb_dma_supported(struct device *hwdev, u64 mask)
- return 1;
- }
-
-+static int __swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t addr)
-+{
-+ if (swiotlb)
-+ return swiotlb_dma_mapping_error(hwdev, addr);
-+ return 0;
-+}
-+
- static struct dma_map_ops swiotlb_dma_ops = {
- .alloc = __dma_alloc,
- .free = __dma_free,
-@@ -366,7 +373,7 @@ static struct dma_map_ops swiotlb_dma_ops = {
- .sync_sg_for_cpu = __swiotlb_sync_sg_for_cpu,
- .sync_sg_for_device = __swiotlb_sync_sg_for_device,
- .dma_supported = __swiotlb_dma_supported,
-- .mapping_error = swiotlb_dma_mapping_error,
-+ .mapping_error = __swiotlb_dma_mapping_error,
- };
-
- static int __init atomic_pool_init(void)
diff --git a/baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I b/baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I
index e47c19e7e..54410db09 100644
--- a/baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I
+++ b/baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I
@@ -1 +1 @@
-CONFIG_RTC_DRV_SUN6I=m
+CONFIG_RTC_DRV_SUN6I=y
diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I b/baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I
index e47c19e7e..54410db09 100644
--- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I
+++ b/baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I
@@ -1 +1 @@
-CONFIG_RTC_DRV_SUN6I=m
+CONFIG_RTC_DRV_SUN6I=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index edd165525..d2c5ccd8e 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -4332,7 +4332,7 @@ CONFIG_RTC_DRV_S35390A=m
# CONFIG_RTC_DRV_SA1100 is not set
# CONFIG_RTC_DRV_SNVS is not set
CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_SUN6I=m
+CONFIG_RTC_DRV_SUN6I=y
CONFIG_RTC_DRV_TEGRA=m
# CONFIG_RTC_DRV_TEST is not set
CONFIG_RTC_DRV_V3020=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 99868582c..45505fb61 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -4310,7 +4310,7 @@ CONFIG_RTC_DRV_S35390A=m
# CONFIG_RTC_DRV_SA1100 is not set
# CONFIG_RTC_DRV_SNVS is not set
CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_SUN6I=m
+CONFIG_RTC_DRV_SUN6I=y
CONFIG_RTC_DRV_TEGRA=m
# CONFIG_RTC_DRV_TEST is not set
CONFIG_RTC_DRV_V3020=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index cf16a6793..6e442d9c0 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -4710,7 +4710,7 @@ CONFIG_RTC_DRV_S5M=m
# CONFIG_RTC_DRV_SA1100 is not set
CONFIG_RTC_DRV_SNVS=m
CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_SUN6I=m
+CONFIG_RTC_DRV_SUN6I=y
CONFIG_RTC_DRV_SUNXI=m
CONFIG_RTC_DRV_TEGRA=m
# CONFIG_RTC_DRV_TEST is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 1866b1638..2bfab2fc3 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -4448,7 +4448,7 @@ CONFIG_RTC_DRV_S5M=m
# CONFIG_RTC_DRV_SA1100 is not set
# CONFIG_RTC_DRV_SNVS is not set
CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_SUN6I=m
+CONFIG_RTC_DRV_SUN6I=y
CONFIG_RTC_DRV_SUNXI=m
CONFIG_RTC_DRV_TEGRA=m
# CONFIG_RTC_DRV_TEST is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 8ee9feedf..1f9d41517 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -4427,7 +4427,7 @@ CONFIG_RTC_DRV_S5M=m
# CONFIG_RTC_DRV_SA1100 is not set
# CONFIG_RTC_DRV_SNVS is not set
CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_SUN6I=m
+CONFIG_RTC_DRV_SUN6I=y
CONFIG_RTC_DRV_SUNXI=m
CONFIG_RTC_DRV_TEGRA=m
# CONFIG_RTC_DRV_TEST is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 51af64def..126f30ccd 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -4689,7 +4689,7 @@ CONFIG_RTC_DRV_S5M=m
# CONFIG_RTC_DRV_SA1100 is not set
CONFIG_RTC_DRV_SNVS=m
CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_SUN6I=m
+CONFIG_RTC_DRV_SUN6I=y
CONFIG_RTC_DRV_SUNXI=m
CONFIG_RTC_DRV_TEGRA=m
# CONFIG_RTC_DRV_TEST is not set
diff --git a/kernel.spec b/kernel.spec
index 39d554de2..fabfeae22 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -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 200
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -54,7 +54,7 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 1
+%define stable_update 2
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev %{stable_update}
@@ -517,9 +517,6 @@ Patch425: ARM-tegra-usb-no-reset.patch
Patch426: AllWinner-net-emac.patch
-# http://www.spinics.net/lists/arm-kernel/msg557831.html
-Patch427: arm64-dma-mapping-Fix-dma_mapping_error-when-bypassing-SWIOTLB.patch
-
# http://www.spinics.net/lists/devicetree/msg163238.html
Patch430: bcm2837-initial-support.patch
@@ -2187,6 +2184,9 @@ fi
#
#
%changelog
+* Mon Mar 13 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.2-200
+- Linux v4.10.2
+
* Tue Mar 07 2017 Laura Abbott <labbott@fedoraproject.org>
- CVE-2017-2636 Race condition access to n_hdlc.tbuf causes double free in n_hdlc_release (rhbz 1430049)
diff --git a/sources b/sources
index c76428f91..50dc62d94 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (linux-4.10.tar.xz) = c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90
SHA512 (perf-man-4.10.tar.gz) = 2c830e06f47211d70a8330961487af73a8bc01073019475e6b6131d3bb8c95658b77ca0ae5f1b44371accf103658bc5a3a4366b3e017a4088a8fd408dd6867e8
-SHA512 (patch-4.10.1.xz) = 7d36d210eade03df91dd3bbaa9cb9bdad0a2c60e21a7b6c1be36f7610d4329b6b517517ba8d971458a2e1bc219e639dacccc8ffe6b12b8954c3ba19bf527f239
+SHA512 (patch-4.10.2.xz) = 9a980fa3a028bef8926c2e2b7fcb1ff918c6d883e00ada95f1b0b35f59e2811e6badd2f9b2f2cc806397c072305ef0b3b2f8f18196c4b9a6ff7a9578bbe04457
generated by cgit (git 2.34.1) at 2024-05-04 08:09:30 +0000