[PATCH 0/6] linux-yocto: consolidated pull request

[PATCH 0/6] linux-yocto: consolidated pull request

[Bruce Ashfield]

Hi all,

Here is a slightly delayed consolidated pull request for the kernels, and
kernel tools. I've been fighting with boot issues, which have now been
resolved and were unrelated to this update.

I've avoided merging korg -stable updates for now to keep the kernel trees
consistent and not introduce any extra churn.

Everything I've included in this pull reques is either a bug fix to the
tools, or an addition of config/branches that won't impact existing users.

The tools fixes deal with an issue found with the yocto-bsp tool, and
another that Saul found when using a kernel-cache with a korg based tree.
I've run regression here, and everything looks sane.

Take what you think looks safe, and definitely feed it to the autobuilder
to see if I missed anything.

Cheers,

Bruce

The following changes since commit 505a82673ac2487df5ea343a6422c2fc47018831:

  build-appliance-image: Update to jethro head revision (2015-10-21 23:13:11 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib zedd/kernel
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (6):
  linux-yocto: axxia configuration updates
  linux-yocto/4.1: drm/i915: Fix the VBT child device parsing for BSW
  linux-yocto: nf_tables: Add nf_tables feature
  kern-tools: avoid duplicate .scc file processing
  linux-yocto: skip kernel meta data branches when finding machine
    branch
  linux-yocto/3.19: fix ARM boot with gcc5.x

 meta/classes/kernel-yocto.bbclass                      |  4 +++-
 .../recipes-kernel/kern-tools/kern-tools-native_git.bb |  2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb       |  2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb        |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb     |  2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb      |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_3.14.bb          |  2 +-
 meta/recipes-kernel/linux/linux-yocto_3.19.bb          |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_4.1.bb           | 18 +++++++++---------
 9 files changed, 22 insertions(+), 20 deletions(-)

-- 
2.1.0

[PATCH 1/6] linux-yocto: axxia configuration updates

[Bruce Ashfield]

Updating the configuration fragments for the Intel Axxia on the 3.14
and 4.1 kernels.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb   | 2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb    | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb  | 2 +-
 meta/recipes-kernel/linux/linux-yocto_3.14.bb      | 2 +-
 meta/recipes-kernel/linux/linux-yocto_4.1.bb       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
index 4d3d5c88df07..978dc186039d 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
@@ -5,7 +5,7 @@ require recipes-kernel/linux/linux-yocto.inc
 
 SRCREV_machine ?= "8281915527ba8d79e59906c02f28e7aa11424723"
 SRCREV_machine_qemuppc ?= "5e7d372ebc327f28656fc972fab55605eea8aec3"
-SRCREV_meta ?= "3a09b38a9f5015c56d99d17aa7c2f200c566249b"
+SRCREV_meta ?= "060fa80b7996250001ee90c50a4978c8fdb87fc4"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-3.14;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
index 32c9f86f2352..fe3eab5a555a 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
@@ -3,7 +3,7 @@ KBRANCH ?= "standard/preempt-rt/base"
 require recipes-kernel/linux/linux-yocto.inc
 
 SRCREV_machine ?= "8acaa791408f146069473a96e3d98bed8be86244"
-SRCREV_meta ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e"
+SRCREV_meta ?= "d8bbf59771fb915fa71debc8591bf6c69d8fa49c"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
index 412c817ff5ab..e13cb80ce51e 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine ?= "578602a722dbfb260801f3b37c6eafd2abb2340d"
-SRCREV_meta ?= "3a09b38a9f5015c56d99d17aa7c2f200c566249b"
+SRCREV_meta ?= "060fa80b7996250001ee90c50a4978c8fdb87fc4"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
index f289d37867a2..da12edb106df 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d"
-SRCREV_meta ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e"
+SRCREV_meta ?= "d8bbf59771fb915fa71debc8591bf6c69d8fa49c"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
index 0a37cb6cf10d..1bd7d2ab1687 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "af1f7f586bd32d39c057f17606991b887eadb389"
 SRCREV_machine_qemux86-64 ?= "578602a722dbfb260801f3b37c6eafd2abb2340d"
 SRCREV_machine_qemumips64 ?= "a63d40b860a6d255005a541894d53729090b40ea"
 SRCREV_machine ?= "578602a722dbfb260801f3b37c6eafd2abb2340d"
-SRCREV_meta ?= "3a09b38a9f5015c56d99d17aa7c2f200c566249b"
+SRCREV_meta ?= "060fa80b7996250001ee90c50a4978c8fdb87fc4"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;branch=${KBRANCH};name=machine; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-3.14;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
index e98f2dec1eb2..44c34ece8309 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d"
 SRCREV_machine_qemux86-64 ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d"
 SRCREV_machine_qemumips64 ?= "8458e792e2c595f48bc5b2924e20e844f2a96522"
 SRCREV_machine ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d"
-SRCREV_meta ?= "3d8f1378d07dbc052ca8a7c22297339ad7998b5e"
+SRCREV_meta ?= "d8bbf59771fb915fa71debc8591bf6c69d8fa49c"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"
-- 
2.1.0

[PATCH 2/6] linux-yocto/4.1: drm/i915: Fix the VBT child device parsing for BSW

[Bruce Ashfield]

Updating the 4.1 SRCREVs to integrate the following fix:

[
    drm/i915: Fix the VBT child device parsing for BSW

    Recent BSW VBT has a VBT child device size 37 bytes instead of the 33
    bytes our code assumes. This means we fail to parse the VBT and thus
    fail to detect eDP ports properly and just register them as DP ports
    instead.

    Fix it up by using the reported child device size from the VBT instead
    of assuming it matches out struct defintions.

    The latest spec I have shows that the child device size should be 36
    bytes for rev >= 195, however on my BSW the size is actually 37 bytes.
    And our current struct definition is 33 bytes.

    Feels like the entire VBT parses would need to be rewritten to handle
    changes in the layout better, but for now I've decided to do just the
    bare minimum to get my eDP port back.

    Cc: Vijay Purushothaman <vijay.a.purushothaman@linux.intel.com>
    Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
    Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    (cherry picked from commit 90e4f1592bb6e82f6690f0e05a8aadcf04d7bce7)
    Signed-off-by: abdul arif abdul muttalib
    <abdul.arif.b.abdul.muttalib@intel.com>
    Signed-off-by: Tan Jui Nee <jui.nee.tan@intel.com>
    Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
]

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb   |  2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb |  2 +-
 meta/recipes-kernel/linux/linux-yocto_4.1.bb      | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
index fe3eab5a555a..ce20eb2e46b5 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
@@ -2,7 +2,7 @@ KBRANCH ?= "standard/preempt-rt/base"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-SRCREV_machine ?= "8acaa791408f146069473a96e3d98bed8be86244"
+SRCREV_machine ?= "f7e4bbfef684e29b1257eaf2d7f534b38e2e1b1e"
 SRCREV_meta ?= "d8bbf59771fb915fa71debc8591bf6c69d8fa49c"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
index da12edb106df..13a940db37bd 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "4.1.8"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d"
+SRCREV_machine ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"
 SRCREV_meta ?= "d8bbf59771fb915fa71debc8591bf6c69d8fa49c"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
index 44c34ece8309..84352d95ccaa 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
@@ -11,14 +11,14 @@ KBRANCH_qemux86  ?= "standard/base"
 KBRANCH_qemux86-64 ?= "standard/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "187e28708b478b5d01a7df9e6410a340347e4819"
-SRCREV_machine_qemuarm64 ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d"
-SRCREV_machine_qemumips ?= "dd6b1f0940dbffd5e0feef2beecbc89a25da8e8f"
-SRCREV_machine_qemuppc ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d"
-SRCREV_machine_qemux86 ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d"
-SRCREV_machine_qemux86-64 ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d"
-SRCREV_machine_qemumips64 ?= "8458e792e2c595f48bc5b2924e20e844f2a96522"
-SRCREV_machine ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d"
+SRCREV_machine_qemuarm ?= "bc11ecf659e30c8687604e086450ae1ff90c0169"
+SRCREV_machine_qemuarm64 ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"
+SRCREV_machine_qemumips ?= "181e2c553ffaae19d08a6730e98d288c7e337d39"
+SRCREV_machine_qemuppc ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"
+SRCREV_machine_qemux86 ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"
+SRCREV_machine_qemux86-64 ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"
+SRCREV_machine_qemumips64 ?= "2684711a16ed21f114d834742f860cee532f7438"
+SRCREV_machine ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"
 SRCREV_meta ?= "d8bbf59771fb915fa71debc8591bf6c69d8fa49c"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \
-- 
2.1.0

[PATCH 3/6] linux-yocto: nf_tables: Add nf_tables feature

[Bruce Ashfield]

Updating the META SRCREVs to make the nf_tables feature available.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb   | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto_4.1.bb      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
index ce20eb2e46b5..91e054d9b56d 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
@@ -3,7 +3,7 @@ KBRANCH ?= "standard/preempt-rt/base"
 require recipes-kernel/linux/linux-yocto.inc
 
 SRCREV_machine ?= "f7e4bbfef684e29b1257eaf2d7f534b38e2e1b1e"
-SRCREV_meta ?= "d8bbf59771fb915fa71debc8591bf6c69d8fa49c"
+SRCREV_meta ?= "aed902160251d69cc28d1e69a4f692e8ea8fa13b"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
index 13a940db37bd..9862006bb8b8 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"
-SRCREV_meta ?= "d8bbf59771fb915fa71debc8591bf6c69d8fa49c"
+SRCREV_meta ?= "aed902160251d69cc28d1e69a4f692e8ea8fa13b"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
index 84352d95ccaa..fba1fa136639 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"
 SRCREV_machine_qemux86-64 ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"
 SRCREV_machine_qemumips64 ?= "2684711a16ed21f114d834742f860cee532f7438"
 SRCREV_machine ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482"
-SRCREV_meta ?= "d8bbf59771fb915fa71debc8591bf6c69d8fa49c"
+SRCREV_meta ?= "aed902160251d69cc28d1e69a4f692e8ea8fa13b"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"
-- 
2.1.0

[PATCH 4/6] kern-tools: avoid duplicate .scc file processing

[Bruce Ashfield]

With the recent changes to improve patch processing times, the ability
to skip already applied patches is not active by default.

The automatic detection and resume was hiding issues with the include
files generated by scripts like yocto-bsp.

If a .scc file that contains a patch is included twice, the patch is
applied twice, and the second appliation fails for obvious reasons.

We can partially fix this by ensuring that already included
configuration fragments are not forced into the meta-series.

.scc files that are explicitly listed twice will continue to fail, and
recipes must be modified to avoid this.

[YOCTO: #8486]

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index 18be4ad61598..445d03a876b4 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70c
 
 DEPENDS = "git-native"
 
-SRCREV = "1fb91c2965193df894089fbcbcafe3bf775c21fd"
+SRCREV = "17d89d1861b532bbf1a81c1f024953e440db8de7"
 PR = "r12"
 PV = "0.2+git${SRCPV}"
 
-- 
2.1.0

[PATCH 5/6] linux-yocto: skip kernel meta data branches when finding machine branch

[Bruce Ashfield]

Before the fetcher validated the specified SRCREV was reachable on a
specified branch, linux-yocto style kernel's were comparing the value
of KBRANCH and branch on the SRC_URI and then allowing a SRC_URI
specified branch to override KBRANCH.

With the introduction of kernel meta data on the SRC_URI, this routine
is incorrectly picking up a kernel-cache repository and then attempting
to apply that branch information to the kernel repository.

The rationalization of the branch specification is largely no longer
required, and will may be removed in the future. But for now, to keep
changes minimal, we can simply not return branch information that comes
from kernel meta data by checking the 'type' parameter and skipping
if it is of type 'kmeta'.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/classes/kernel-yocto.bbclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 325f94c73560..00d9667fe0a6 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -52,7 +52,9 @@ def get_machine_branch(d, default):
         parm = urldata.parm
         if "branch" in parm:
             branches = urldata.parm.get("branch").split(',')
-            return branches[0]
+            btype = urldata.parm.get("type")
+            if btype != "kmeta":
+                return branches[0]
 	    
     return default
 
-- 
2.1.0

[PATCH 6/6] linux-yocto/3.19: fix ARM boot with gcc5.x

[Bruce Ashfield]

Updating the SRCREVs to apply the same fix as 3.14 and 4.1 already
have to fix qemuarm boots with gcc5.x

[YOCTO: #8415]

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto_3.19.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto_3.19.bb b/meta/recipes-kernel/linux/linux-yocto_3.19.bb
index 4143a093627e..3c10bcb54899 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.19.bb
@@ -11,14 +11,14 @@ KBRANCH_qemux86  ?= "standard/common-pc"
 KBRANCH_qemux86-64 ?= "standard/common-pc-64/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "963b4df663dba2584ac864e0c016825de0046558"
+SRCREV_machine_qemuarm ?= "857048f10bfe7089ca6007e72431f1c098b07115"
 SRCREV_machine_qemuarm64 ?= "e152349de59b43b2a75f2c332b44171df461d5a0"
 SRCREV_machine_qemumips ?= "cedbbc7b5e72df2e820bb9e7885f12132c5e2fff"
 SRCREV_machine_qemuppc ?= "23a83386e10986a63e6cef712a045445499d002b"
 SRCREV_machine_qemux86 ?= "e152349de59b43b2a75f2c332b44171df461d5a0"
 SRCREV_machine_qemux86-64 ?= "e152349de59b43b2a75f2c332b44171df461d5a0"
 SRCREV_machine_qemumips64 ?= "3eb70cea3532e22ab1b6da9864446621229e6616"
-SRCREV_machine ?= "e152349de59b43b2a75f2c332b44171df461d5a0"
+SRCREV_machine ?= "151571a39785218a57c3ae3355cd63694890cc8d"
 SRCREV_meta ?= "1016714868249d64fc16692fd7679672b1efa17b"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.19.git;name=machine;branch=${KBRANCH}; \
-- 
2.1.0

Re: [PATCH 5/6] linux-yocto: skip kernel meta data branches when finding machine branch

[Saul Wold]

On Fri, 2015-10-23 at 16:18 -0400, Bruce Ashfield wrote:
> Before the fetcher validated the specified SRCREV was reachable on a
> specified branch, linux-yocto style kernel's were comparing the value
> of KBRANCH and branch on the SRC_URI and then allowing a SRC_URI
> specified branch to override KBRANCH.
> 
> With the introduction of kernel meta data on the SRC_URI, this routine
> is incorrectly picking up a kernel-cache repository and then attempting
> to apply that branch information to the kernel repository.
> 
> The rationalization of the branch specification is largely no longer
> required, and will may be removed in the future. But for now, to keep
> changes minimal, we can simply not return branch information that comes
> from kernel meta data by checking the 'type' parameter and skipping
> if it is of type 'kmeta'.
> 
> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Tested-by: Saul Wold <sgw@linux.intel.com>

> ---
>  meta/classes/kernel-yocto.bbclass | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
> index 325f94c73560..00d9667fe0a6 100644
> --- a/meta/classes/kernel-yocto.bbclass
> +++ b/meta/classes/kernel-yocto.bbclass
> @@ -52,7 +52,9 @@ def get_machine_branch(d, default):
>          parm = urldata.parm
>          if "branch" in parm:
>              branches = urldata.parm.get("branch").split(',')
> -            return branches[0]
> +            btype = urldata.parm.get("type")
> +            if btype != "kmeta":
> +                return branches[0]
>  	    
>      return default
>  

[PATCH 0/6] linux-yocto: consolidated pull request

[Bruce Ashfield]

From: Bruce Ashfield <bruce.ashfield@gmail.com>

Richard,

As mentioned previously, here's my next set of -stable version bumps and
two boot/traces fixes.

These have been building and booting here without issue, so I don't expect
much trouble from them.

Cheers,

Bruce


The following changes since commit ed7151f9856791fc4a24b1a0a88f87c442b29f38:

  systemd-bootchart: Disable LTO to fix reproducibility (2021-03-01 11:12:16 +0000)

are available in the Git repository at:

  git://git.yoctoproject.org/poky-contrib zedd/kernel
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (6):
  linux-yocto/5.10: fix x86 32bit boot warnings
  linux-yocto/5.10: fix qemumips testimage failures
  linux-yocto/5.10: update to v5.10.17 and -rt31
  linux-yocto/5.4: update to v5.4.99
  linux-yocto/5.10: update to v5.10.19
  linux-yocto/5.4: update to v5.4.101

 .../linux/linux-yocto-rt_5.10.bb              |  6 ++---
 .../linux/linux-yocto-rt_5.4.bb               |  6 ++---
 .../linux/linux-yocto-tiny_5.10.bb            |  8 +++----
 .../linux/linux-yocto-tiny_5.4.bb             |  8 +++----
 meta/recipes-kernel/linux/linux-yocto_5.10.bb | 22 +++++++++----------
 meta/recipes-kernel/linux/linux-yocto_5.4.bb  | 22 +++++++++----------
 6 files changed, 36 insertions(+), 36 deletions(-)

-- 
2.19.1

[PATCH 0/6] linux-yocto: consolidated pull request

[Bruce Ashfield]

From: Bruce Ashfield <bruce.ashfield@gmail.com>

Richard,

These are the -stable and -rt bug fix bumps that I've been collecting
and testing for the active reference kernels.

I haven't picked up anything out of the ordinary, so they shouldn't
cause us any issues.

I've also bumped the -dev version to the full 5.11, since I was able
to integrate and test it earlier in the week.

Bruce

The following changes since commit f5f6504e5781c6e9d4cef3e9b1c2280fd0a8afdc:

  bitbake: contrib: Add Dockerfile for building hash server (2021-02-16 11:53:25 +0000)

are available in the Git repository at:

  git://git.yoctoproject.org/poky-contrib zedd/kernel
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (6):
  linux-yocto-rt/5.10: update to -rt25
  linux-yocto/5.10: update to v5.10.14
  linux-yocto/5.4: update to v5.4.96
  linux-yocto/5.10: update to v5.10.16
  linux-yocto/5.4: update to v5.4.98
  linux-yocto-dev: bump version to v5.11+

 meta/recipes-kernel/linux/linux-yocto-dev.bb  |  2 +-
 .../linux/linux-yocto-rt_5.10.bb              |  6 ++---
 .../linux/linux-yocto-rt_5.4.bb               |  6 ++---
 .../linux/linux-yocto-tiny_5.10.bb            |  8 +++----
 .../linux/linux-yocto-tiny_5.4.bb             |  8 +++----
 meta/recipes-kernel/linux/linux-yocto_5.10.bb | 22 +++++++++----------
 meta/recipes-kernel/linux/linux-yocto_5.4.bb  | 22 +++++++++----------
 7 files changed, 37 insertions(+), 37 deletions(-)

-- 
2.19.1

[PATCH 0/6] linux-yocto: consolidated pull request

[Bruce Ashfield]

From: Bruce Ashfield <bruce.ashfield@gmail.com>

Richard,

Here's the latest round of -stable updates for the active kernels in
master.

My first runs ran into the lttng-modules issues, and I've included a
10 patch backport of changes from lttng 2.12.x to address the various
build issues I found against 5.4 and 5.8.

There's a different lttng patch on the list, but it didn't address all
of my build failures, so I generated this full backport change.

Cheers,

Bruce

The following changes since commit 070d9b8f5e753e8928d2d7048e0c7bd9adbb3c29:

  linux-yocto/config: netfilter: Enable nat for ipv4 and ipv6 (2020-09-14 12:13:47 -0400)

are available in the Git repository at:

  git://git.yoctoproject.org/poky-contrib zedd/kernel
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (5):
  linux-yocto/5.8: update to v5.8.8
  linux-yocto/5.4: update to v5.4.64
  linux-yocto/config: configuration warning cleanup
  linux-yocto/5.8: update to v5.8.9
  linux-yocto/5.4: update to v5.4.65

Jens Rehsack (1):
  lttng-modules: backport patches from 2.12.x to fix 5.4.64+ and 5.8.9+
    builds

 .../linux/linux-yocto-rt_5.4.bb               |   6 +-
 .../linux/linux-yocto-rt_5.8.bb               |   6 +-
 .../linux/linux-yocto-tiny_5.4.bb             |   8 +-
 .../linux/linux-yocto-tiny_5.8.bb             |   8 +-
 meta/recipes-kernel/linux/linux-yocto_5.4.bb  |  22 +-
 meta/recipes-kernel/linux/linux-yocto_5.8.bb  |  22 +-
 ...ndency-issue-when-building-in-tree-w.patch |  54 ++
 ...ce.h-into-the-mmu-sub-directory-v5.9.patch |  41 +
 ...Make-kvm_mmu_page-definition-and-acc.patch |  39 +
 ...he-length-of-per-inode-prealloc-list.patch |  84 ++
 ...e-via-a-block-bitmap-read-is-prefetc.patch |  63 ++
 ...al-of-smp_-read_barrier_depends-v5.9.patch | 391 ++++++++
 ...teback-Drop-I_DIRTY_TIME_EXPIRE-v5.9.patch |  59 ++
 ...x-sync-livelock-due-to-b_dirty_time-.patch | 117 +++
 ...es-for-ext4_discard_preallocations-a.patch |  52 +
 .../0010-Fix-system-call-filter-table.patch   | 918 ++++++++++++++++++
 .../lttng/lttng-modules_2.12.2.bb             |  12 +-
 17 files changed, 1865 insertions(+), 37 deletions(-)
 create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-Kconfig-fix-dependency-issue-when-building-in-tree-w.patch
 create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0002-fix-Move-mmutrace.h-into-the-mmu-sub-directory-v5.9.patch
 create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0003-fix-KVM-x86-mmu-Make-kvm_mmu_page-definition-and-acc.patch
 create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0004-fix-ext4-limit-the-length-of-per-inode-prealloc-list.patch
 create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0005-fix-ext4-indicate-via-a-block-bitmap-read-is-prefetc.patch
 create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0006-fix-removal-of-smp_-read_barrier_depends-v5.9.patch
 create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0007-fix-writeback-Drop-I_DIRTY_TIME_EXPIRE-v5.9.patch
 create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0008-fix-writeback-Fix-sync-livelock-due-to-b_dirty_time-.patch
 create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0009-fix-version-ranges-for-ext4_discard_preallocations-a.patch
 create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0010-Fix-system-call-filter-table.patch

-- 
2.19.1

[PATCH 0/6] linux-yocto: consolidated pull request

[Bruce Ashfield]

Hi all,

This pull request is for some configuration fixes, and -stable bumps
that are worth getting into the upcoming release. I'm holding any
changes that are not related to bugs from now, until the release is
done.

Cheers,

Bruce

The following changes since commit b02f3bfe2fee291a9db85094e5f31b1933acf871:

  local.conf.sample.extended: add another warning to comment about GLIBC_GENERATE_LOCALES (2018-10-14 23:45:40 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib zedd/kernel
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (6):
  linux-yocto-rt/4.18: update to -rt5
  rt: fixup 4.14 merge issues
  linux-yocto-dev: update PV to v4.19
  linux-yocto/4.18: kernel configuration cleanups
  linux-yocto/4.18: update to v4.18.14
  linux-yocto/4.14: update to v4.14.76

 meta/recipes-kernel/linux/linux-yocto-dev.bb       |  2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb   |  6 +++---
 meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb   |  6 +++---
 meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb |  6 +++---
 meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb |  6 +++---
 meta/recipes-kernel/linux/linux-yocto_4.14.bb      | 20 ++++++++++----------
 meta/recipes-kernel/linux/linux-yocto_4.18.bb      | 20 ++++++++++----------
 7 files changed, 33 insertions(+), 33 deletions(-)

-- 
2.5.0

[PATCH 0/6] linux-yocto: consolidated pull request

[Bruce Ashfield]

Hi all,

Here is the latest consolidated set of linux yocto 4.1 and 4.4
kernel changes.

We have two korg -stable updates (4.1.27 and 4.4.14), as well as
mainline feature backports. (linux-yocto-dev is now on 4.7-rc6
for anyone that cares).

Sanity and smoke testing have passed in my test builds.

Cheers,

Bruce

The following changes since commit 4e889c04ba518dac492c193224a790a877f43f40:

  scripts/lib/bsp/help.py: Changed help of yocto-bsp to match latest syntax (2016-07-07 13:38:13 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib zedd/kernel
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (6):
  linux-yocto/4.1/4.4: x86, power and usb-c mainline backports
  linux-yocto/4.1/4.1: mei, usb and extcon changes
  linux-yocto/4.4: cpumask: Export cpumask_any_but()
  linux-yocto/config: mei, gpio and usb type c
  linux-yocto/4.1: update to 4.1.27
  linux-yocto/4.4: update to v4.4.14

 meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb   |  6 +++---
 meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb   |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb |  6 +++---
 meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb |  6 +++---
 meta/recipes-kernel/linux/linux-yocto_4.1.bb      | 20 ++++++++++----------
 meta/recipes-kernel/linux/linux-yocto_4.4.bb      | 20 ++++++++++----------
 6 files changed, 31 insertions(+), 31 deletions(-)

-- 
2.5.0

[PATCH 0/6] linux-yocto: consolidated pull request

[Bruce Ashfield]

Hi all,

Here's a pull request for some backports and routine updates to newer
-stable kernels. Nothing particularly exiciting in this series.

I've sanity tested here.

Cheers,

Bruce

The following changes since commit 71765a90d1ff455608a006ed32cf42110e779217:

  bitbake: cooker.py: fix warn() -> warning() (2016-06-13 12:16:10 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib zedd/kernel
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (6):
  linux-yocto/4.1: serial, mmc, mtd mainline backports
  linux-yocto/4.1: bump to v4.1.26
  linux-yocto/4.4: update to v4.4.13
  linux-yocto/4.1: intel_idle: backport BXT CPU support
  linux-yocto/4.1: Always Running Timer Support
  linux-yocto/4.1: powerclamp: APL CPU

 meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb   |  6 +++---
 meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb   |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb |  6 +++---
 meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb |  6 +++---
 meta/recipes-kernel/linux/linux-yocto_4.1.bb      | 20 ++++++++++----------
 meta/recipes-kernel/linux/linux-yocto_4.4.bb      | 20 ++++++++++----------
 6 files changed, 31 insertions(+), 31 deletions(-)

-- 
2.5.0

[PATCH 0/6] linux-yocto: consolidated pull request

[Bruce Ashfield]

Hi all,

I've built and boot tested the pending changes for the 3.14, 3.19 and
4.1 linux-yocto variants.

In this series we have:

 - gcc5.x build fixes for 3.14 (from Richard)
 - 4.1.6 and -rt5 updates
 - configuration changes for CIRRUS graphics and EXT4 for EXT2/3 use
 - quark BSP configuration changes from Saul

This is the first round of updates since I split the meta-data from the
kernel repository itself, so all my update and test scripts had to be
changed .. I've built and tested this, but with three kernels and two
different kernel types in play, there are limits to how much I can build
and test before sending out the changes. So this definitely needs to
be sanity checked by the autobuilder(s).

Cheers,

Bruce

The following changes since commit a3d228a484cf471e999b6537987e2897d8a7bd4e:

  bitbake: main: Handle RuntimeError exception in list_extension_modules (2015-08-20 22:04:43 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib zedd/kernel
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (6):
  linux-yocto/4.1: fix qemuarm preempt-rt configuration
  linux-yocto/3.19/4.1: add coretemp to intel-common-drivers
  linux-yocto/4.1: quark configuration and thermal support
  linux-yocto/3.14: cleanups and gcc5 ARM build fixes
  linux-yocto/4.1: update to v4.1.6 and v4.1.6-rt5
  linux-yocto/4.1: enable DRM_CIRRUS_QEMU and EXT4_USE_FOR_EXT23

 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb   |  6 +++---
 meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb    |  6 +++---
 meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb |  2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb  |  6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.14.bb      | 18 +++++++++---------
 meta/recipes-kernel/linux/linux-yocto_3.19.bb      |  2 +-
 meta/recipes-kernel/linux/linux-yocto_4.1.bb       | 20 ++++++++++----------
 8 files changed, 32 insertions(+), 32 deletions(-)

-- 
2.1.0

[PATCH 0/6] linux-yocto: consolidated pull request

[Bruce Ashfield]

Richard (or whoever is picking these up for testing),

Here's the nearly final update for the kernel bits in the 1.7 release.
These took far longer than I wanted to get out, but 3.17-rc6 was not the
last, and I had to work through another round of tools and kernel build
issues for both 3.14 and 3.17 (i.e. I spent another day or two working
with perf and 3.17).

We had some feature breakage creep into 3.14 and 3.17 trees, but Paul
Gortmaker helped me out, and we've now worked through the issues with
3.14 and 3.17.

I also have a small kern-tools fix for YOCTO #6753 as part of this
series.

So the summary is:

  - 3.14 feature fixes
  - 3.17 updates to rc7
  - kern tools bug fix
  - perf fix 3.17 breakage

I've built and booted this series for all arches, using my kernel-dev
image for extended build coverage, and we've had multiple eyes confirming
the 3.14 fixes.

** My warning is that I'm on vacation for the next week, and will only have
external access to email. So this needs to go through a build cycle before
merging .. and if there are problems, I'll be back mid next week to fix them
up for sure, or sooner if I see email on the external list.

Cheers,

Bruce


The following changes since commit abf9372358e5db70e7d707a5a732c4ec7d0f2efe:

  build-appliance-image: Update to dizzy head revision (2014-09-30 21:48:12 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib zedd/kernel
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (6):
  kern-tools: fix overly greedy path relocations
  linux-yocto/3.14/3.17: menuconfig and cryptodev
  linux-yocto/3.14: revert BFP feature, and fix intel-common -rt
  linux-yocto/3.14/3.17: allmodconfig/allyesconfig build fixes
  linux-yocto/3.17: update to v3.17-rc7
  perf: fix undefined pr_* routines

 .../recipes-kernel/kern-tools/kern-tools-native_git.bb |  2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb       |  6 +++---
 meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb     |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_3.17.bb     |  6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.14.bb          | 16 ++++++++--------
 meta/recipes-kernel/linux/linux-yocto_3.17.bb          | 18 +++++++++---------
 meta/recipes-kernel/perf/perf.bb                       | 11 ++++++++---
 7 files changed, 34 insertions(+), 29 deletions(-)

-- 
1.8.1.2

[PATCH 0/6] linux-yocto: consolidated pull request

[Bruce Ashfield]

Richard/Saul,

Here's a consolidated pull request for kernel updates and small fixes
that I've queued since the 1.6 release.

The quoting issue was reporting on the mailing list, and I realized
that my fix for it had never been sent, so I dusted it off and here
it is. 

As a side effect of that fix, and the fact that there's no way to tell
between a full defconfig and a saved alldefconfig by inspection .. that
offering some guidance in the example custom recipe would be nice.

Everything else is are the -stable and SRCREV updates.

Cheers,

Bruce

The following changes since commit 7b78c364b7de901f97cd8dbe56d5e02f545bf3d3:

  cleanup-workdir: Fix crosssdk reference after addition of PN (2014-05-05 09:05:42 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib zedd/kernel
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (6):
  kernel-yocto: quote kconfig mode check
  linux-yocto-custom: provide defconfig guidance
  linux-yocto/3.4: update to v3.4.88
  linux-yocto/3.10: update to v3.10.38
  linux-yocto/3.14: update to v3.14.2
  linux-yocto/3.10: mei.cfg: enable Intel chipsets

 .../recipes-kernel/linux/linux-yocto-custom.bb         | 10 ++++++++++
 meta/classes/kernel-yocto.bbclass                      |  2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb       |  8 ++++----
 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb       |  8 ++++----
 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb        |  8 ++++----
 meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb     |  6 +++---
 meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb     |  6 +++---
 meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb      |  6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.10.bb          | 18 +++++++++---------
 meta/recipes-kernel/linux/linux-yocto_3.14.bb          | 18 +++++++++---------
 meta/recipes-kernel/linux/linux-yocto_3.4.bb           | 16 ++++++++--------
 11 files changed, 58 insertions(+), 48 deletions(-)

-- 
1.8.1.2