diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-12-21 10:49:20 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-21 16:26:53 +0000 |
commit | 894aa73d4ad59be2a1df3eee1b2e6ee5738d8277 (patch) | |
tree | 563c88c96d54b0cf3f026fdbd5a4d37ae36c667a /meta | |
parent | 7fbb9a4bb65b4a1cf0b4eb34b30c5567f1c1c1ad (diff) | |
download | poky-894aa73d4ad59be2a1df3eee1b2e6ee5738d8277.tar.gz |
linux-yocto/4.12: CQM and kmemleak fixes
Integrating the following commits for kmemleak fixes and CQM
backports:
58fe84d691a mm: kmemleak: treat vm_struct as alternative reference to vmalloc'ed objects
5babb9c8f695 mm: kmemleak: factor object reference updating out of scan_block()
8c22ef5ee138 mm: kmemleak: slightly reduce the size of some structures on 64-bit architectures
7ea6b560ef4c netfilter: conntrack: do not enable connection tracking unless needed
4fdf0a5a0863 netfilter: nf_ct_dccp/sctp: fix memory leak after netns cleanup
85385ffd1e9b netfilter: move table iteration out of netns exit paths
c95b3f8e1cbc netfilter: conntrack: add nf_ct_iterate_destroy
753c83b98a1e netfilter: conntrack: don't call iter for non-confirmed conntracks
bcf21cba7fd5 netfilter: conntrack: rename nf_ct_iterate_cleanup
f5c3a4c19075 perf/x86/intel/uncore: Fix missing marker for skx_uncore_cha_extra_regs
c44ebea2f116 perf/x86/intel/uncore: Fix SKX CHA event extra regs
1d70f7feb408 perf/x86/intel/uncore: Remove invalid Skylake server CHA filter field
eb3059e9e0ea perf/x86/intel/uncore: Fix Skylake server CHA LLC_LOOKUP event umask
3514c02c7bff perf/x86/intel/uncore: Fix Skylake server PCU PMU event format
804530f02515 perf/x86/intel/uncore: Fix Skylake UPI PMU event masks
(From OE-Core rev: 3cf8bda5e4d4a345793aa72be97e94c41520ec01)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.12.bb | 16 |
3 files changed, 10 insertions, 10 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 7fe078b17a..25f3963c74 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb | |||
@@ -11,7 +11,7 @@ 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 ?= "8f6a2f93758166ef40e56f907a067801fee88d75" | 14 | SRCREV_machine ?= "8dd0b4d434394e5293702c729164b424f2da6b57" |
15 | SRCREV_meta ?= "b66a4f9730339b3c0c4af1db03dd26da71e419d5" | 15 | SRCREV_meta ?= "b66a4f9730339b3c0c4af1db03dd26da71e419d5" |
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 \ |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb index 784efc07f4..5f2118712d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb | |||
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "4.12.18" | |||
9 | KMETA = "kernel-meta" | 9 | KMETA = "kernel-meta" |
10 | KCONF_BSP_AUDIT_LEVEL = "2" | 10 | KCONF_BSP_AUDIT_LEVEL = "2" |
11 | 11 | ||
12 | SRCREV_machine ?= "79394be8305b3c3ba2d6711ae48e08bf015fbae9" | 12 | SRCREV_machine ?= "558fe84d691abbb8c8f5e149aa29ef4a478d0128" |
13 | SRCREV_meta ?= "b66a4f9730339b3c0c4af1db03dd26da71e419d5" | 13 | SRCREV_meta ?= "b66a4f9730339b3c0c4af1db03dd26da71e419d5" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.12.bb b/meta/recipes-kernel/linux/linux-yocto_4.12.bb index 771c8b262c..2911d14c1b 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.12.bb | |||
@@ -11,14 +11,14 @@ KBRANCH_qemux86 ?= "standard/base" | |||
11 | KBRANCH_qemux86-64 ?= "standard/base" | 11 | KBRANCH_qemux86-64 ?= "standard/base" |
12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" | 12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" |
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "d293ce5ce9097c2a269cabed7ae6fcc66f92af09" | 14 | SRCREV_machine_qemuarm ?= "01295fb92f5b47c5ebdadd63497cc1f964a873ff" |
15 | SRCREV_machine_qemuarm64 ?= "79394be8305b3c3ba2d6711ae48e08bf015fbae9" | 15 | SRCREV_machine_qemuarm64 ?= "558fe84d691abbb8c8f5e149aa29ef4a478d0128" |
16 | SRCREV_machine_qemumips ?= "3bac03d93aa8eda49cae6563ba13996460dffd4f" | 16 | SRCREV_machine_qemumips ?= "674e17014797e9b085474eb6fef5bd6193a43218" |
17 | SRCREV_machine_qemuppc ?= "79394be8305b3c3ba2d6711ae48e08bf015fbae9" | 17 | SRCREV_machine_qemuppc ?= "558fe84d691abbb8c8f5e149aa29ef4a478d0128" |
18 | SRCREV_machine_qemux86 ?= "79394be8305b3c3ba2d6711ae48e08bf015fbae9" | 18 | SRCREV_machine_qemux86 ?= "558fe84d691abbb8c8f5e149aa29ef4a478d0128" |
19 | SRCREV_machine_qemux86-64 ?= "79394be8305b3c3ba2d6711ae48e08bf015fbae9" | 19 | SRCREV_machine_qemux86-64 ?= "558fe84d691abbb8c8f5e149aa29ef4a478d0128" |
20 | SRCREV_machine_qemumips64 ?= "8c0a56e5a553ac3a985949ae8d0fc35d54779756" | 20 | SRCREV_machine_qemumips64 ?= "aea1b0ab4353dfdb326f40a913006261e37d2834" |
21 | SRCREV_machine ?= "79394be8305b3c3ba2d6711ae48e08bf015fbae9" | 21 | SRCREV_machine ?= "558fe84d691abbb8c8f5e149aa29ef4a478d0128" |
22 | SRCREV_meta ?= "b66a4f9730339b3c0c4af1db03dd26da71e419d5" | 22 | SRCREV_meta ?= "b66a4f9730339b3c0c4af1db03dd26da71e419d5" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \ |