kernel: bump 4.9 to 4.9.82
Refresh patches. Remove upstreamed patches: - ar7/002-MIPS-AR7-ensure-the-port-type-s-FCR-value-is-used.patch - backport/040-crypto-fix-typo-in-KPP-dependency-of-CRYPTO_ECDH.patch Remove layerscape/819-Revert-dmaengine-dmatest-move-callback-wait-queue-to.patch, it is superseded by upstream commit 297c7cc4b5651b174a62925b6c961085f04979fd. Remove pending/650-pppoe_header_pad.patch, it is superseded by upstream commit 1bd21b158e07e0b8c5a2ce832305a0ebfe42c480. Update patches that no longer apply: - ar71xx/004-register_gpio_driver_earlier.patch - hack/204-module_strip.patch - pending/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch Fixes CVE-2017-8824. Compile-tested: ar71xx. Runtime-tested: ar71xx. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
This commit is contained in:
@@ -16,8 +16,6 @@ Signed-off-by: Michael Zoran <mzoran@crowfest.net>
|
||||
4 files changed, 48 insertions(+), 111 deletions(-)
|
||||
create mode 120000 arch/arm64/boot/dts/overlays
|
||||
|
||||
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
|
||||
index 7d213c2c..101794f 100644
|
||||
--- a/arch/arm64/Kconfig.platforms
|
||||
+++ b/arch/arm64/Kconfig.platforms
|
||||
@@ -1,27 +1,5 @@
|
||||
@@ -48,8 +46,6 @@ index 7d213c2c..101794f 100644
|
||||
config ARCH_SUNXI
|
||||
bool "Allwinner sunxi 64-bit SoC Family"
|
||||
select GENERIC_IRQ_CHIP
|
||||
diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
|
||||
index 2152448..7aa03be 100644
|
||||
--- a/arch/arm64/boot/dts/broadcom/Makefile
|
||||
+++ b/arch/arm64/boot/dts/broadcom/Makefile
|
||||
@@ -1,7 +1,15 @@
|
||||
@@ -69,16 +65,6 @@ index 2152448..7aa03be 100644
|
||||
|
||||
always := $(dtb-y)
|
||||
subdir-y := $(dts-dirs)
|
||||
diff --git a/arch/arm64/boot/dts/overlays b/arch/arm64/boot/dts/overlays
|
||||
new file mode 120000
|
||||
index 0000000..ded0864
|
||||
--- /dev/null
|
||||
+++ b/arch/arm64/boot/dts/overlays
|
||||
@@ -0,0 +1 @@
|
||||
+../../../arm/boot/dts/overlays
|
||||
\ No newline at end of file
|
||||
diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
|
||||
index 53da5c7..c7e891d 100644
|
||||
--- a/arch/arm64/configs/bcmrpi3_defconfig
|
||||
+++ b/arch/arm64/configs/bcmrpi3_defconfig
|
||||
@@ -1,52 +1,9 @@
|
||||
@@ -405,6 +391,3 @@ index 53da5c7..c7e891d 100644
|
||||
CONFIG_LIBCRC32C=y
|
||||
-CONFIG_BCM2708_VCHIQ=n
|
||||
-CONFIG_ARCH_BCM2835=y
|
||||
--
|
||||
2.1.4
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
|
||||
#include "linux/pm_runtime.h"
|
||||
#include "vc4_drv.h"
|
||||
#include "vc4_regs.h"
|
||||
@@ -185,8 +188,23 @@ static int vc4_v3d_bind(struct device *d
|
||||
@@ -188,8 +191,23 @@ static int vc4_v3d_bind(struct device *d
|
||||
struct drm_device *drm = dev_get_drvdata(master);
|
||||
struct vc4_dev *vc4 = to_vc4_dev(drm);
|
||||
struct vc4_v3d *v3d = NULL;
|
||||
@@ -76,4 +76,4 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
|
||||
+EXPORT_SYMBOL(cma_get_size);
|
||||
|
||||
static unsigned long cma_bitmap_aligned_mask(const struct cma *cma,
|
||||
int align_order)
|
||||
unsigned int align_order)
|
||||
|
||||
Reference in New Issue
Block a user