diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-12-21 10:49:14 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-06 10:13:56 +0000 |
commit | bedcbb0db1ce8ad63ad7b38b22c6f0d7fab9846d (patch) | |
tree | be182da164476a99f3febfe15d2af09e3ae5b3df /meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb | |
parent | ba400aa269af125eeb9f2d6c9924644ba139b1a2 (diff) | |
download | poky-bedcbb0db1ce8ad63ad7b38b22c6f0d7fab9846d.tar.gz |
linux-yocto/4.12: ipv4 stable backport and config changes
Integrating the following ipv4 backport:
ipv4: net namespace does not inherit network configurations
patch from https://lkml.org/lkml/2014/7/29/119
Ipv4 net namespace requires a similar logic change as commit a79ca223e029
[ipv6: fix bad free of addrconf_init_net] introduces for newer kernels.
Since a net namespace is independent to another. That is, there
is no any relationship between the net namespaces. So a new net
namespace should not inherit network configurations from another
net namespace including the host.
CC: Hong Zhiguo <honkiko@gmail.com>
CC: David S. Miller <davem@davemloft.net>
Signed-off-by: Zhu Yanjun <zyjzyj2000@gmail.com>
Signed-off-by: yzhu1 <yanjun.zhu@windriver.com>
Signed-off-by: Liwei Song <liwei.song@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
And the following configuration changes:
3574bb061c1b mti-malta32: enable CONFIG_HIGHMEM for qemumips to support up to 2GiB RAM
f187df8fca31 features/i915/i915.cfg: compile i915 as a module
332b38cb83a2 common-pc*.scc: Add igb to common-pc drivers
(From OE-Core rev: 6f344749f56a16b5d2799caa3735ab0b3a8ce603)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 7e0b87ffce90dad248a7a0f0b9d661583e047568)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb index adbb0ccbad..efa4f05bb0 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb | |||
@@ -11,8 +11,8 @@ python () { | |||
11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "82dfc739621af193e6b5cb8f27f55c66db8e631b" | 14 | SRCREV_machine ?= "51c45f6489df4cdbce78e9c90b8a26fa7e7c875c" |
15 | SRCREV_meta ?= "e3c9041f48ae980cc4461f969d0e3ed9bb43be5b" | 15 | SRCREV_meta ?= "3574bb061c1bfbdcf4df8308870c03f88ef0788f" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" |