aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/layerscape')
-rw-r--r--target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch4
-rw-r--r--target/linux/layerscape/patches-4.14/817-platform-security-support-layerscape.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
index 1ca21db90c..05dafbb69f 100644
--- a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
@@ -74,7 +74,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
} else if (has_acpi_companion(dma_dev)) {
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
-@@ -1337,7 +1337,8 @@ void bond_lower_state_changed(struct sla
+@@ -1330,7 +1330,8 @@ void bond_lower_state_changed(struct sla
}
/* enslave device <slave> to bond device <master> */
@@ -84,7 +84,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
{
struct bonding *bond = netdev_priv(bond_dev);
const struct net_device_ops *slave_ops = slave_dev->netdev_ops;
-@@ -3509,7 +3510,7 @@ static int bond_do_ioctl(struct net_devi
+@@ -3502,7 +3503,7 @@ static int bond_do_ioctl(struct net_devi
switch (cmd) {
case BOND_ENSLAVE_OLD:
case SIOCBONDENSLAVE:
diff --git a/target/linux/layerscape/patches-4.14/817-platform-security-support-layerscape.patch b/target/linux/layerscape/patches-4.14/817-platform-security-support-layerscape.patch
index 8f378d40ca..a9728cc05b 100644
--- a/target/linux/layerscape/patches-4.14/817-platform-security-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.14/817-platform-security-support-layerscape.patch
@@ -103,7 +103,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
+ $ keyctl load secure kmk-master "load 'cat secure_key.blob'" @u
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -7645,6 +7645,18 @@ F: include/keys/trusted-type.h
+@@ -7646,6 +7646,18 @@ F: include/keys/trusted-type.h
F: security/keys/trusted.c
F: security/keys/trusted.h