Update to 4.3-rc5
This commit is contained in:
parent
715523dba3
commit
96c69c65e9
|
@ -1,3 +1,9 @@
|
|||
linux (4.3~rc5-1~exp1) UNRELEASED; urgency=medium
|
||||
|
||||
* New upstream release candidate
|
||||
|
||||
-- Ben Hutchings <ben@decadent.org.uk> Tue, 13 Oct 2015 20:16:02 +0100
|
||||
|
||||
linux (4.3~rc4-1~exp1) experimental; urgency=medium
|
||||
|
||||
* New upstream release candidate
|
||||
|
|
|
@ -1,35 +0,0 @@
|
|||
From: Josh Boyer <jwboyer@fedoraproject.org>
|
||||
Date: Fri, 4 Sep 2015 08:49:34 -0400
|
||||
Subject: ARM: dts: Fix Makefile target for sun4i-a10-itead-iteaduino-plus
|
||||
Origin: https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git//commit?id=f594297830b29c8204c421fafe66001178ac0f9a
|
||||
|
||||
Commit 79ae3e66f8d (ARM: dts: sun4i: Add Iteaduino Plus A10) added a new
|
||||
make target for the sun4i-a10-itead-iteaduino-plus dts file, but mistakenly
|
||||
used .dts instead of the correct .dtb suffix. This resulted in a build error
|
||||
like:
|
||||
|
||||
scripts/Makefile.dtbinst:42: target 'sun4i-a10-itead-iteaduino-plus.dts' doesn't match the target pattern
|
||||
|
||||
when doing a make dtbs_install.
|
||||
|
||||
Fix it to use the proper file name.
|
||||
|
||||
Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
---
|
||||
arch/arm/boot/dts/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
|
||||
index 233159d..bb8fa02 100644
|
||||
--- a/arch/arm/boot/dts/Makefile
|
||||
+++ b/arch/arm/boot/dts/Makefile
|
||||
@@ -578,7 +578,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \
|
||||
sun4i-a10-hackberry.dtb \
|
||||
sun4i-a10-hyundai-a7hd.dtb \
|
||||
sun4i-a10-inet97fv2.dtb \
|
||||
- sun4i-a10-itead-iteaduino-plus.dts \
|
||||
+ sun4i-a10-itead-iteaduino-plus.dtb \
|
||||
sun4i-a10-jesurun-q5.dtb \
|
||||
sun4i-a10-marsboard.dtb \
|
||||
sun4i-a10-mini-xplus.dtb \
|
|
@ -1,27 +0,0 @@
|
|||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Tue, 6 Oct 2015 00:17:04 +0100
|
||||
Subject: MIPS: io: Define ioremap_uc
|
||||
Forwarded: http://mid.gmane.org/1444089416.2956.2.camel@decadent.org.uk
|
||||
|
||||
All architectures must now define ioremap_uc(), but MIPS currently
|
||||
only has ioremap_nocache().
|
||||
|
||||
Fixes: 4c73e8926623 ("arch/*/io.h: Add ioremap_uc() to all architectures")
|
||||
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
Cc: Luis R. Rodriguez <mcgrof@suse.com>
|
||||
---
|
||||
arch/mips/include/asm/io.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h
|
||||
index 9e777cd..d10fd80 100644
|
||||
--- a/arch/mips/include/asm/io.h
|
||||
+++ b/arch/mips/include/asm/io.h
|
||||
@@ -256,6 +256,7 @@ static inline void __iomem * __ioremap_mode(phys_addr_t offset, unsigned long si
|
||||
*/
|
||||
#define ioremap_nocache(offset, size) \
|
||||
__ioremap_mode((offset), (size), _CACHE_UNCACHED)
|
||||
+#define ioremap_uc ioremap_nocache
|
||||
|
||||
/*
|
||||
* ioremap_cachable - map bus memory into CPU space
|
|
@ -80,7 +80,5 @@ features/all/grsecurity/grsecurity-kconfig.patch
|
|||
features/all/grsecurity/grkernsec_perf_harden.patch
|
||||
|
||||
bugfix/all/media-uvcvideo-disable-hardware-timestamps-by-defaul.patch
|
||||
bugfix/arm/arm-dts-fix-makefile-target-for-sun4i-a10-itead-itea.patch
|
||||
bugfix/mips/mips-io-define-ioremap_uc.patch
|
||||
bugfix/all/ovl-conditionally-use-o_largefile-in-ovl_copy_up.patch
|
||||
bugfix/x86/crypto-x86-camellia_aesni_avx-fix-cpu-feature-checks.patch
|
||||
|
|
Loading…
Reference in New Issue