kernel: bump 4.14 to 4.14.204
Resovle conflicted: - layerscape/708-mc-bus-support-layerscape.patch Refreshed all patches. Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
This commit is contained in:
parent
5b5100daf9
commit
013dae6201
@ -7,11 +7,11 @@ ifdef CONFIG_TESTING_KERNEL
|
||||
endif
|
||||
|
||||
LINUX_VERSION-4.9 = .241
|
||||
LINUX_VERSION-4.14 = .203
|
||||
LINUX_VERSION-4.14 = .204
|
||||
LINUX_VERSION-4.19 = .154
|
||||
|
||||
LINUX_KERNEL_HASH-4.9.241 = c4c6d04f91d881e68524bda6062b5c1835f285bd03344bf8f2eaeef3394bb32c
|
||||
LINUX_KERNEL_HASH-4.14.203 = ac963bb6086eee98bea1981ef79606078bd3c8dc9f939cdfa7c9e63a900e3931
|
||||
LINUX_KERNEL_HASH-4.14.204 = 9e832899ec75dbfce393c9f7a07df24183b28f0bb95ad4dd8b1fa027bc668ad9
|
||||
LINUX_KERNEL_HASH-4.19.154 = 698c908c846b9ba2ba545cd229a67571fe4de18bb5547429a00d786abe556646
|
||||
|
||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
||||
|
||||
@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
--- a/init/Kconfig
|
||||
+++ b/init/Kconfig
|
||||
@@ -1903,6 +1903,13 @@ config TRIM_UNUSED_KSYMS
|
||||
@@ -1904,6 +1904,13 @@ config TRIM_UNUSED_KSYMS
|
||||
|
||||
If unsure, or if you need to build out-of-tree modules, say N.
|
||||
|
||||
|
||||
@ -41,7 +41,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
+#endif
|
||||
--- a/init/Kconfig
|
||||
+++ b/init/Kconfig
|
||||
@@ -1009,6 +1009,10 @@ config RELAY
|
||||
@@ -1010,6 +1010,10 @@ config RELAY
|
||||
|
||||
If unsure, say N.
|
||||
|
||||
|
||||
@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
--- a/init/Kconfig
|
||||
+++ b/init/Kconfig
|
||||
@@ -1081,6 +1081,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
|
||||
@@ -1082,6 +1082,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
|
||||
the unaligned access emulation.
|
||||
see arch/parisc/kernel/unaligned.c for reference
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@ Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
|
||||
|
||||
--- a/arch/powerpc/Kconfig
|
||||
+++ b/arch/powerpc/Kconfig
|
||||
@@ -199,6 +199,7 @@ config PPC
|
||||
@@ -200,6 +200,7 @@ config PPC
|
||||
select HAVE_IOREMAP_PROT
|
||||
select HAVE_IRQ_EXIT_ON_IRQ_STACK
|
||||
select HAVE_KERNEL_GZIP
|
||||
|
||||
@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
||||
|
||||
--- a/init/Kconfig
|
||||
+++ b/init/Kconfig
|
||||
@@ -1427,6 +1427,15 @@ config EMBEDDED
|
||||
@@ -1428,6 +1428,15 @@ config EMBEDDED
|
||||
an embedded system so certain expert options are available
|
||||
for configuration.
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@ Subject: [PATCH 30/38] NET: add qualcomm mdio and PHY
|
||||
|
||||
--- a/drivers/net/phy/Kconfig
|
||||
+++ b/drivers/net/phy/Kconfig
|
||||
@@ -481,6 +481,20 @@ config XILINX_GMII2RGMII
|
||||
@@ -482,6 +482,20 @@ config XILINX_GMII2RGMII
|
||||
the Reduced Gigabit Media Independent Interface(RGMII) between
|
||||
Ethernet physical media devices and the Gigabit Ethernet controller.
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
|
||||
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
|
||||
@@ -2337,7 +2337,7 @@ ath10k_update_per_peer_tx_stats(struct a
|
||||
@@ -2343,7 +2343,7 @@ ath10k_update_per_peer_tx_stats(struct a
|
||||
sgi = ATH10K_HW_GI(peer_stats->flags);
|
||||
|
||||
if (txrate.flags == WMI_RATE_PREAMBLE_VHT && txrate.mcs > 9) {
|
||||
@ -9,7 +9,7 @@
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -2395,7 +2395,7 @@ static void ath10k_htt_fetch_peer_stats(
|
||||
@@ -2401,7 +2401,7 @@ static void ath10k_htt_fetch_peer_stats(
|
||||
ppdu_len = resp->peer_tx_stats.ppdu_len * sizeof(__le32);
|
||||
|
||||
if (skb->len < sizeof(struct htt_resp_hdr) + num_ppdu * ppdu_len) {
|
||||
@ -18,7 +18,7 @@
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -2407,8 +2407,8 @@ static void ath10k_htt_fetch_peer_stats(
|
||||
@@ -2413,8 +2413,8 @@ static void ath10k_htt_fetch_peer_stats(
|
||||
spin_lock_bh(&ar->data_lock);
|
||||
peer = ath10k_peer_find_by_id(ar, peer_id);
|
||||
if (!peer) {
|
||||
@ -60,7 +60,7 @@
|
||||
}
|
||||
--- a/drivers/net/wireless/ath/ath10k/sdio.c
|
||||
+++ b/drivers/net/wireless/ath/ath10k/sdio.c
|
||||
@@ -1884,8 +1884,8 @@ static int ath10k_sdio_hif_map_service_t
|
||||
@@ -1888,8 +1888,8 @@ static int ath10k_sdio_hif_map_service_t
|
||||
ar_sdio->mbox_addr[eid], ar_sdio->mbox_size[eid]);
|
||||
break;
|
||||
default:
|
||||
|
||||
@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
|
||||
|
||||
--- a/arch/arm/Kconfig
|
||||
+++ b/arch/arm/Kconfig
|
||||
@@ -1934,6 +1934,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
|
||||
@@ -1936,6 +1936,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
|
||||
The command-line arguments provided by the boot loader will be
|
||||
appended to the the device tree bootargs property.
|
||||
|
||||
|
||||
@ -8611,7 +8611,7 @@ Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
|
||||
+}
|
||||
--- a/drivers/staging/fsl-mc/bus/mc-io.c
|
||||
+++ /dev/null
|
||||
@@ -1,292 +0,0 @@
|
||||
@@ -1,297 +0,0 @@
|
||||
-// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
|
||||
-/*
|
||||
- * Copyright 2013-2016 Freescale Semiconductor Inc.
|
||||
@ -8754,7 +8754,12 @@ Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
|
||||
- */
|
||||
-void fsl_destroy_mc_io(struct fsl_mc_io *mc_io)
|
||||
-{
|
||||
- struct fsl_mc_device *dpmcp_dev = mc_io->dpmcp_dev;
|
||||
- struct fsl_mc_device *dpmcp_dev;
|
||||
-
|
||||
- if (!mc_io)
|
||||
- return;
|
||||
-
|
||||
- dpmcp_dev = mc_io->dpmcp_dev;
|
||||
-
|
||||
- if (dpmcp_dev)
|
||||
- fsl_mc_io_unset_dpmcp(mc_io);
|
||||
@ -8906,7 +8911,7 @@ Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
|
||||
-EXPORT_SYMBOL_GPL(fsl_mc_portal_reset);
|
||||
--- /dev/null
|
||||
+++ b/drivers/bus/fsl-mc/mc-io.c
|
||||
@@ -0,0 +1,281 @@
|
||||
@@ -0,0 +1,286 @@
|
||||
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
|
||||
+/*
|
||||
+ * Copyright 2013-2016 Freescale Semiconductor Inc.
|
||||
@ -9038,7 +9043,12 @@ Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
|
||||
+ */
|
||||
+void fsl_destroy_mc_io(struct fsl_mc_io *mc_io)
|
||||
+{
|
||||
+ struct fsl_mc_device *dpmcp_dev = mc_io->dpmcp_dev;
|
||||
+ struct fsl_mc_device *dpmcp_dev;
|
||||
+
|
||||
+ if (!mc_io)
|
||||
+ return;
|
||||
+
|
||||
+ dpmcp_dev = mc_io->dpmcp_dev;
|
||||
+
|
||||
+ if (dpmcp_dev)
|
||||
+ fsl_mc_io_unset_dpmcp(mc_io);
|
||||
|
||||
@ -382,7 +382,7 @@ Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com>
|
||||
dwc->lpm_nyet_threshold = lpm_nyet_threshold;
|
||||
dwc->tx_de_emphasis = tx_de_emphasis;
|
||||
|
||||
@@ -1376,12 +1541,14 @@ static int dwc3_resume_common(struct dwc
|
||||
@@ -1387,12 +1552,14 @@ static int dwc3_resume_common(struct dwc
|
||||
|
||||
switch (dwc->dr_mode) {
|
||||
case USB_DR_MODE_PERIPHERAL:
|
||||
@ -1206,7 +1206,7 @@ Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com>
|
||||
struct list_head cached_itd_list;
|
||||
--- a/drivers/usb/host/fsl-mph-dr-of.c
|
||||
+++ b/drivers/usb/host/fsl-mph-dr-of.c
|
||||
@@ -229,6 +229,17 @@ static int fsl_usb2_mph_dr_of_probe(stru
|
||||
@@ -232,6 +232,17 @@ static int fsl_usb2_mph_dr_of_probe(stru
|
||||
pdata->has_fsl_erratum_a005697 =
|
||||
of_property_read_bool(np, "fsl,usb_erratum-a005697");
|
||||
|
||||
|
||||
@ -106,7 +106,7 @@
|
||||
reg = <6>;
|
||||
label = "cpu";
|
||||
ethernet = <&gmac0>;
|
||||
@@ -187,8 +227,6 @@
|
||||
@@ -188,8 +228,6 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -16,7 +16,7 @@ Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
|
||||
|
||||
--- a/arch/arm64/Kconfig.platforms
|
||||
+++ b/arch/arm64/Kconfig.platforms
|
||||
@@ -91,12 +91,13 @@ config ARCH_HISI
|
||||
@@ -92,12 +92,13 @@ config ARCH_HISI
|
||||
This enables support for Hisilicon ARMv8 SoC family
|
||||
|
||||
config ARCH_MEDIATEK
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- a/arch/powerpc/Kconfig
|
||||
+++ b/arch/powerpc/Kconfig
|
||||
@@ -837,6 +837,14 @@ config CMDLINE_FORCE
|
||||
@@ -838,6 +838,14 @@ config CMDLINE_FORCE
|
||||
This is useful if you cannot or don't want to change the
|
||||
command-line options your boot loader passes to the kernel.
|
||||
|
||||
|
||||
@ -28,7 +28,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
|
||||
|
||||
--- a/arch/arm/Kconfig
|
||||
+++ b/arch/arm/Kconfig
|
||||
@@ -1934,6 +1934,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
|
||||
@@ -1936,6 +1936,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
|
||||
The command-line arguments provided by the boot loader will be
|
||||
appended to the the device tree bootargs property.
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- a/drivers/staging/octeon/ethernet.c
|
||||
+++ b/drivers/staging/octeon/ethernet.c
|
||||
@@ -673,6 +673,7 @@ static int cvm_oct_probe(struct platform
|
||||
@@ -674,6 +674,7 @@ static int cvm_oct_probe(struct platform
|
||||
int interface;
|
||||
int fau = FAU_NUM_PACKET_BUFFERS_TO_FREE;
|
||||
int qos;
|
||||
@ -8,7 +8,7 @@
|
||||
struct device_node *pip;
|
||||
int mtu_overhead = ETH_HLEN + ETH_FCS_LEN;
|
||||
|
||||
@@ -796,13 +797,19 @@ static int cvm_oct_probe(struct platform
|
||||
@@ -797,13 +798,19 @@ static int cvm_oct_probe(struct platform
|
||||
}
|
||||
|
||||
num_interfaces = cvmx_helper_get_number_of_interfaces();
|
||||
|
||||
@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
|
||||
|
||||
--- a/arch/arm/Kconfig
|
||||
+++ b/arch/arm/Kconfig
|
||||
@@ -1934,6 +1934,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
|
||||
@@ -1936,6 +1936,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
|
||||
The command-line arguments provided by the boot loader will be
|
||||
appended to the the device tree bootargs property.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user