All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 00/10] kernel-yocto: consolidated pull request
@ 2017-02-01 15:30 Bruce Ashfield
  2017-02-01 15:30 ` [PATCH 01/10] linux-yocto/4.9: update to 4.9.4 Bruce Ashfield
                   ` (9 more replies)
  0 siblings, 10 replies; 11+ messages in thread
From: Bruce Ashfield @ 2017-02-01 15:30 UTC (permalink / raw)
  To: richard.purdie; +Cc: openembedded-core

Hi all,

Here is the next batch of kernel updates. These were gathered in preparation
for the removal of the 4.8 kernel and to make 4.9 the default/latest available.

I'll follow up with patches to make 4.9 the default to the appropriate lists.

Change summary:

  - stable updates
  - 4.9-rt refresh (via Paul Gortmaker)
  - kernel configuration tweaks.

  - I fixed the configuration warning that Martin Jansa reported in commit:

       [ kernel-yocto/meta: common-pc: add pci-siov to feature fragments ]

  - the kern-tools capability of merging feature branches at build time:

       [ kern-tools: re-enable scc merge command ]

   - Saul fixed and issue with kernel-devsrc packaging, and that fix will head
     upstream as well.

       [ ver_linux: Use /usr/bin/awk instead of /bin/awk ]

Cheers,

Bruce

The following changes since commit ec3d83f9a90288403b96be25da855fa280aadd8d:

  xmlto: Don't hardcode the path to tail (2017-01-31 23:47:33 +0000)

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 (10):
  linux-yocto/4.9: update to 4.9.4
  kernel-yocto/features: enable TPM
  kern-tools: re-enable scc merge command
  kernel-yocto: ecryptfs, NFC and CAN bus config updates
  ver_linux: Use /usr/bin/awk instead of /bin/awk
  linux-yocto/4.9: update to v4.9.6
  kernel-yocto/meta: common-pc: add pci-siov to feature fragments
  linux-yocto/4.9: update to -rt3
  kernel-yocto: log the BSP definition file
  linux-yocto/4.9: yaffs2 fixes

 meta/classes/kernel-yocto.bbclass                    | 17 ++++++++++++++++-
 .../kern-tools/kern-tools-native_git.bb              |  2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb      |  2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb      |  6 +++---
 meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb    |  2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb    |  6 +++---
 meta/recipes-kernel/linux/linux-yocto_4.8.bb         |  2 +-
 meta/recipes-kernel/linux/linux-yocto_4.9.bb         | 20 ++++++++++----------
 8 files changed, 36 insertions(+), 21 deletions(-)

-- 
2.5.0



^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH 01/10] linux-yocto/4.9: update to 4.9.4
  2017-02-01 15:30 [PATCH 00/10] kernel-yocto: consolidated pull request Bruce Ashfield
@ 2017-02-01 15:30 ` Bruce Ashfield
  2017-02-01 15:30 ` [PATCH 02/10] kernel-yocto/features: enable TPM Bruce Ashfield
                   ` (8 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Bruce Ashfield @ 2017-02-01 15:30 UTC (permalink / raw)
  To: richard.purdie; +Cc: openembedded-core

Integrating the korg -stable release with the following changes:

   75353ac8ff43 Linux 4.9.4
   6fea974494af rtlwifi: rtl_usb: Fix missing entry in USB driver's private data
   7dae85b5c355 rtlwifi: Fix enter/exit power_save
   3f41ee3a45cb drm/i915/gen9: Fix PCODE polling during CDCLK change notification
   93f2976eb027 ALSA: usb-audio: Add a quirk for Plantronics BT600
   f52e670a5b29 spi: mvebu: fix baudrate calculation for armada variant
   05b7bdf1c3d8 ARM: omap2+: am437x: rollback to use omap3_gptimer_timer_init()
   b8ba5faa7a6b ARM: 8631/1: clkdev: Detect errors in clk_hw_register_clkdev() for mass registration
   87dbf3dc1652 ARM: OMAP4+: Fix bad fallthrough for cpuidle
   b336dc57bc92 ARM: OMAP5: Fix build for PM code
   0f665deba9bc ARM: OMAP5: Fix mpuss_early_init
   aa1c7b01c9c7 bus: arm-ccn: Prevent hotplug callback leak
   bd99e7a6036e svcrdma: Clear xpt_bc_xps in xprt_setup_rdma_bc() error exit arm
   c2ce1c4133b3 ARM: qcom_defconfig: Fix MDM9515 LCC and GCC config
   e925eb342659 ARM: zynq: Reserve correct amount of non-DMA RAM
   78e2d9405e2d ARM: pxa: fix pxa25x interrupt init
   596ff0afbe8e ARM64: dts: bcm2835: Fix bcm2837 compatible string
   e3937bc1cc0b ARM64: dts: bcm2837-rpi-3-b: remove incorrect pwr LED
   d40152d5ac67 arm64: dts: mt8173: Fix auxadc node
   08aed6e8883d tools/virtio: fix READ_ONCE()
   e7d05ec1923e powerpc: Fix build warning on 32-bit PPC
   2fc33ff4ba81 ALSA: firewire-tascam: Fix to handle error from initialization of stream data
   2c867216c555 HID: hid-cypress: validate length of report
   e425ed1d3c75 net: vrf: do not allow table id 0
   7b7a5a85b1d9 net: ipv4: Fix multipath selection with vrf
   7cc73483a4c7 net/mlx5e: Remove WARN_ONCE from adaptive moderation code
   17a561b19a27 gro: Disable frag0 optimization on IPv6 ext headers
   934ca017c850 gro: use min_t() in skb_gro_reset_offset()
   ec0fdcb88c6f gro: Enter slow-path if there is no tailroom
   33364eee1fe4 net: add the AF_QIPCRTR entries to family name tables
   2ff4a0243c9e net: dsa: Ensure validity of dst->ds[0]
   66f24d624baa r8152: fix rx issue for runtime suspend
   c8a89b4f5248 r8152: split rtl8152_suspend function
   294f2c889637 net: dsa: bcm_sf2: Utilize nested MDIO read/write
   ac77aab46168 net: dsa: bcm_sf2: Do not clobber b53_switch_ops
   b55f6ca7380d bpf: change back to orig prog on too many passes
   a4d205a59521 net: vrf: Add missing Rx counters
   efc455f08ea8 ipv4: Do not allow MAIN to be alias for new LOCAL w/ custom rules
   fe1e13cfe2c4 igmp: Make igmp group member RFC 3376 compliant
   7826d11cf44c flow_dissector: Update pptp handling to avoid null pointer deref.
   9f65f5d4746b drop_monitor: consider inserted data in genlmsg_end
   9f7551e05b0f drop_monitor: add missing call to genlmsg_end
   a8a213f296ae net: ipv4: dst for local input routes should use l3mdev if relevant
   e7422080e35d net: fix incorrect original ingress device index in PKTINFO
   2ffc694b5727 rtnl: stats - add missing netlink message size checks
   8cb7d6277f01 net/mlx5e: Disable netdev after close
   ee9f2fd3f6b6 net/mlx5e: Don't sync netdev state when not registered
   33c782dd1514 net/mlx5: Prevent setting multicast macs for VFs
   b22c86ff8e78 net/mlx5: Mask destination mac value in ethtool steering rules
   efbbc75c00fc net/mlx5: Avoid shadowing numa_node
   ca8a64467f2a net/mlx5: Cancel recovery work in remove flow
   7bf1de7f2749 net/mlx5: Check FW limitations on log_max_qp before setting it
   9b4a34ff8987 net/sched: cls_flower: Fix missing addr_type in classify
   99f40c6bf565 net: stmmac: Fix race between stmmac_drv_probe and stmmac_open
   09babe4ce12e net, sched: fix soft lockup in tc_classify
   ee99e2bc5e8a ipv6: handle -EFAULT from skb_copy_bits
   d36a1cb1e328 inet: fix IP(V6)_RECVORIGDSTADDR for udp sockets
   ed3cc329c7bc sctp: sctp_transport_lookup_process should rcu_read_unlock when transport is null
   8b8fbe5c25ab net: vrf: Drop conntrack data after pass through VRF device on Tx
   d4a0b2e40c46 net: vrf: Fix NAT within a VRF

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

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
index e745ff76ea18..1c26ef3ac97b 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
@@ -11,13 +11,13 @@ python () {
         raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "2751bf0b7339c4f3227b3a7d45b2dbe5726906aa"
-SRCREV_meta ?= "03a2d3f7f999a555c8725b5f1fd69660ebd4af83"
+SRCREV_machine ?= "628a985d1bb4d992b76c727afd373788bd496c90"
+SRCREV_meta ?= "78e8e39c7c73ab9d98864f492b1fd9658124d635"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
 
-LINUX_VERSION ?= "4.9.3"
+LINUX_VERSION ?= "4.9.4"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
index fa5dbfef1ea0..12a64887d677 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
@@ -4,13 +4,13 @@ KCONFIG_MODE = "--allnoconfig"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-LINUX_VERSION ?= "4.9.3"
+LINUX_VERSION ?= "4.9.4"
 
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "881cba95ae2597482870f6c4060a60d84af4c5d1"
-SRCREV_meta ?= "03a2d3f7f999a555c8725b5f1fd69660ebd4af83"
+SRCREV_machine ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
+SRCREV_meta ?= "78e8e39c7c73ab9d98864f492b1fd9658124d635"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.9.bb b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
index f57024f7f605..b42603bad2c6 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
@@ -11,20 +11,20 @@ KBRANCH_qemux86  ?= "standard/base"
 KBRANCH_qemux86-64 ?= "standard/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "09b1056330a9a4fc077d569513c2b40e8340e813"
-SRCREV_machine_qemuarm64 ?= "881cba95ae2597482870f6c4060a60d84af4c5d1"
-SRCREV_machine_qemumips ?= "858b4f40b3c2dbb6cb2ac76cc27dd5275d83f1f9"
-SRCREV_machine_qemuppc ?= "881cba95ae2597482870f6c4060a60d84af4c5d1"
-SRCREV_machine_qemux86 ?= "881cba95ae2597482870f6c4060a60d84af4c5d1"
-SRCREV_machine_qemux86-64 ?= "881cba95ae2597482870f6c4060a60d84af4c5d1"
-SRCREV_machine_qemumips64 ?= "32baa0c2e903fdfa714c38428ba055ad861d058d"
-SRCREV_machine ?= "881cba95ae2597482870f6c4060a60d84af4c5d1"
-SRCREV_meta ?= "03a2d3f7f999a555c8725b5f1fd69660ebd4af83"
+SRCREV_machine_qemuarm ?= "9027d6fa2661251146c08851a13ca623bc2c1156"
+SRCREV_machine_qemuarm64 ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
+SRCREV_machine_qemumips ?= "ce10acbd809335dd0c6f697770b3279ae168d145"
+SRCREV_machine_qemuppc ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
+SRCREV_machine_qemux86 ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
+SRCREV_machine_qemux86-64 ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
+SRCREV_machine_qemumips64 ?= "303f51499cfe9f770c4a843a2042228897cea1b4"
+SRCREV_machine ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
+SRCREV_meta ?= "78e8e39c7c73ab9d98864f492b1fd9658124d635"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
 
-LINUX_VERSION ?= "4.9.3"
+LINUX_VERSION ?= "4.9.4"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
-- 
2.5.0



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 02/10] kernel-yocto/features: enable TPM
  2017-02-01 15:30 [PATCH 00/10] kernel-yocto: consolidated pull request Bruce Ashfield
  2017-02-01 15:30 ` [PATCH 01/10] linux-yocto/4.9: update to 4.9.4 Bruce Ashfield
@ 2017-02-01 15:30 ` Bruce Ashfield
  2017-02-01 15:30 ` [PATCH 03/10] kern-tools: re-enable scc merge command Bruce Ashfield
                   ` (7 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Bruce Ashfield @ 2017-02-01 15:30 UTC (permalink / raw)
  To: richard.purdie; +Cc: openembedded-core

Adding a feature fragment that enables a broad range of TPM
drivers. They service as a baseline for production kernels.

Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb   | 2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb   | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto_4.8.bb      | 2 +-
 meta/recipes-kernel/linux/linux-yocto_4.9.bb      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
index c0ff503676ad..f76b590055ef 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb
@@ -12,7 +12,7 @@ python () {
 }
 
 SRCREV_machine ?= "9c4f52cb2bafd9657c51cef2166db2b73a95aaa9"
-SRCREV_meta ?= "3edb4de355873d32da9307a011adea2542bd05a7"
+SRCREV_meta ?= "ceb1eeb63f96e903a4caee1bad4dda238192fb6a"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
index 1c26ef3ac97b..7b214e40531b 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
@@ -12,7 +12,7 @@ python () {
 }
 
 SRCREV_machine ?= "628a985d1bb4d992b76c727afd373788bd496c90"
-SRCREV_meta ?= "78e8e39c7c73ab9d98864f492b1fd9658124d635"
+SRCREV_meta ?= "2adba5d7c1a6c0425b02b1a650e7a6c320ee3acf"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
index 11b0dc9ea4b0..1f0406b30468 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine ?= "b62f29ac5c15d6333a13811db030d704b35ace8f"
-SRCREV_meta ?= "3edb4de355873d32da9307a011adea2542bd05a7"
+SRCREV_meta ?= "ceb1eeb63f96e903a4caee1bad4dda238192fb6a"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
index 12a64887d677..12f19f313ab3 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
-SRCREV_meta ?= "78e8e39c7c73ab9d98864f492b1fd9658124d635"
+SRCREV_meta ?= "2adba5d7c1a6c0425b02b1a650e7a6c320ee3acf"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.8.bb b/meta/recipes-kernel/linux/linux-yocto_4.8.bb
index 0ebd071463de..dba7a4aa115e 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.8.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "9bcb4ea3fa107f1a8790c8c3408eb250e8d1d66e"
 SRCREV_machine_qemux86-64 ?= "9bcb4ea3fa107f1a8790c8c3408eb250e8d1d66e"
 SRCREV_machine_qemumips64 ?= "b90b544d7a5b004b635cf337b29e15294cb17553"
 SRCREV_machine ?= "9bcb4ea3fa107f1a8790c8c3408eb250e8d1d66e"
-SRCREV_meta ?= "3edb4de355873d32da9307a011adea2542bd05a7"
+SRCREV_meta ?= "ceb1eeb63f96e903a4caee1bad4dda238192fb6a"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.9.bb b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
index b42603bad2c6..81a42489f53c 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
 SRCREV_machine_qemux86-64 ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
 SRCREV_machine_qemumips64 ?= "303f51499cfe9f770c4a843a2042228897cea1b4"
 SRCREV_machine ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
-SRCREV_meta ?= "78e8e39c7c73ab9d98864f492b1fd9658124d635"
+SRCREV_meta ?= "2adba5d7c1a6c0425b02b1a650e7a6c320ee3acf"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
-- 
2.5.0



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 03/10] kern-tools: re-enable scc merge command
  2017-02-01 15:30 [PATCH 00/10] kernel-yocto: consolidated pull request Bruce Ashfield
  2017-02-01 15:30 ` [PATCH 01/10] linux-yocto/4.9: update to 4.9.4 Bruce Ashfield
  2017-02-01 15:30 ` [PATCH 02/10] kernel-yocto/features: enable TPM Bruce Ashfield
@ 2017-02-01 15:30 ` Bruce Ashfield
  2017-02-01 15:30 ` [PATCH 04/10] kernel-yocto: ecryptfs, NFC and CAN bus config updates Bruce Ashfield
                   ` (6 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Bruce Ashfield @ 2017-02-01 15:30 UTC (permalink / raw)
  To: richard.purdie; +Cc: openembedded-core

The ability to merge two branches directly from a .scc file was
dropped during the streamlining of the tools.

As was pointed out by David Vincent <freesilicon@gmail.com>, there is
once again a valid use case for this functionality, so we restore the
capability.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/classes/kernel-yocto.bbclass                       | 16 +++++++++++++++-
 meta/recipes-kernel/kern-tools/kern-tools-native_git.bb |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 5cfd8aff5007..36f61c5694fb 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -148,7 +148,7 @@ do_kernel_metadata() {
 	# run1: pull all the configuration fragments, no matter where they come from
 	elements="`echo -n ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}`"
 	if [ -n "${elements}" ]; then
-		scc --force -o ${S}/${meta_dir}:cfg,meta ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
+		scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
 		if [ $? -ne 0 ]; then
 			bbfatal_log "Could not generate configuration queue for ${KMACHINE}."
 		fi
@@ -165,6 +165,7 @@ do_kernel_metadata() {
 }
 
 do_patch() {
+	set +e
 	cd ${S}
 
 	check_git_config
@@ -177,6 +178,19 @@ do_patch() {
 			bbfatal_log "Patch failures can be resolved in the linux source directory ${S})"
 		fi
 	fi
+
+	if [ -f "${meta_dir}/merge.queue" ]; then
+		# we need to merge all these branches
+		for b in $(cat ${meta_dir}/merge.queue); do
+			git show-ref --verify --quiet refs/heads/${b}
+			if [ $? -eq 0 ]; then
+				bbnote "Merging branch ${b}"
+				git merge -q --no-ff -m "Merge branch ${b}" ${b}
+			else
+				bbfatal "branch ${b} does not exist, cannot merge"
+			fi
+		done
+	fi
 }
 
 do_kernel_checkout() {
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 9e3e968a46aa..4b1de5752c93 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=a6c2fa8aef1b
 
 DEPENDS = "git-native"
 
-SRCREV = "bf2942f7559d114e96f7c7f1287bf7e5120632a3"
+SRCREV = "c14440d4e7ae0160c260ed65c3e123be5dc97ae8"
 PR = "r12"
 PV = "0.2+git${SRCPV}"
 
-- 
2.5.0



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 04/10] kernel-yocto: ecryptfs, NFC and CAN bus config updates
  2017-02-01 15:30 [PATCH 00/10] kernel-yocto: consolidated pull request Bruce Ashfield
                   ` (2 preceding siblings ...)
  2017-02-01 15:30 ` [PATCH 03/10] kern-tools: re-enable scc merge command Bruce Ashfield
@ 2017-02-01 15:30 ` Bruce Ashfield
  2017-02-01 15:30 ` [PATCH 05/10] ver_linux: Use /usr/bin/awk instead of /bin/awk Bruce Ashfield
                   ` (5 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Bruce Ashfield @ 2017-02-01 15:30 UTC (permalink / raw)
  To: richard.purdie; +Cc: openembedded-core

Integrating the following kernel config updates:

  f7f388ec4d89 Add support and drivers for CAN bus as feature
  2b20935eb14b Filesystem encryption support
  8520e18f2956 Update NFC support
  a079d66845cd Add eCryptFS filesystem feature

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

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
index 7b214e40531b..a0adb3830c41 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
@@ -12,7 +12,7 @@ python () {
 }
 
 SRCREV_machine ?= "628a985d1bb4d992b76c727afd373788bd496c90"
-SRCREV_meta ?= "2adba5d7c1a6c0425b02b1a650e7a6c320ee3acf"
+SRCREV_meta ?= "39aa01a6d4332a8ef746a03246e56a41a69fae99"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
index 12f19f313ab3..8d8c082612a5 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
-SRCREV_meta ?= "2adba5d7c1a6c0425b02b1a650e7a6c320ee3acf"
+SRCREV_meta ?= "39aa01a6d4332a8ef746a03246e56a41a69fae99"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.9.bb b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
index 81a42489f53c..0ca3d2c8f77c 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
 SRCREV_machine_qemux86-64 ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
 SRCREV_machine_qemumips64 ?= "303f51499cfe9f770c4a843a2042228897cea1b4"
 SRCREV_machine ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
-SRCREV_meta ?= "2adba5d7c1a6c0425b02b1a650e7a6c320ee3acf"
+SRCREV_meta ?= "39aa01a6d4332a8ef746a03246e56a41a69fae99"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
-- 
2.5.0



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 05/10] ver_linux: Use /usr/bin/awk instead of /bin/awk
  2017-02-01 15:30 [PATCH 00/10] kernel-yocto: consolidated pull request Bruce Ashfield
                   ` (3 preceding siblings ...)
  2017-02-01 15:30 ` [PATCH 04/10] kernel-yocto: ecryptfs, NFC and CAN bus config updates Bruce Ashfield
@ 2017-02-01 15:30 ` Bruce Ashfield
  2017-02-01 15:30 ` [PATCH 06/10] linux-yocto/4.9: update to v4.9.6 Bruce Ashfield
                   ` (4 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Bruce Ashfield @ 2017-02-01 15:30 UTC (permalink / raw)
  To: richard.purdie; +Cc: openembedded-core

To avoid kernel-devsrc failing with missing a dependency on "/bin/awk".
Due to the way this script is invoked, using #!/usr/bin/env can run into
issue when invoked.

Since most distros have awk in /usr/bin and not /bin, we change the
script while this is sorted out upstream.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb   |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_4.9.bb      | 18 +++++++++---------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
index a0adb3830c41..904a8465b32c 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
@@ -11,8 +11,8 @@ python () {
         raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "628a985d1bb4d992b76c727afd373788bd496c90"
-SRCREV_meta ?= "39aa01a6d4332a8ef746a03246e56a41a69fae99"
+SRCREV_machine ?= "0898601446c6bde63cb97fb6236d114886ed5f2a"
+SRCREV_meta ?= "8c71361007816dcabe297f40cd5a38ed5d7d7599"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
index 8d8c082612a5..c2931df20188 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.9.4"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
-SRCREV_meta ?= "39aa01a6d4332a8ef746a03246e56a41a69fae99"
+SRCREV_machine ?= "087b65ddac049813eef2513c4440cb1d02971357"
+SRCREV_meta ?= "8c71361007816dcabe297f40cd5a38ed5d7d7599"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.9.bb b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
index 0ca3d2c8f77c..eb3f027e70e9 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
@@ -11,15 +11,15 @@ KBRANCH_qemux86  ?= "standard/base"
 KBRANCH_qemux86-64 ?= "standard/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "9027d6fa2661251146c08851a13ca623bc2c1156"
-SRCREV_machine_qemuarm64 ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
-SRCREV_machine_qemumips ?= "ce10acbd809335dd0c6f697770b3279ae168d145"
-SRCREV_machine_qemuppc ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
-SRCREV_machine_qemux86 ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
-SRCREV_machine_qemux86-64 ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
-SRCREV_machine_qemumips64 ?= "303f51499cfe9f770c4a843a2042228897cea1b4"
-SRCREV_machine ?= "6fdf2bca12625c67b64f39e08b1b4ae7c610f8bd"
-SRCREV_meta ?= "39aa01a6d4332a8ef746a03246e56a41a69fae99"
+SRCREV_machine_qemuarm ?= "ebd7956fb8f43632fff9537579d2788532ec5dad"
+SRCREV_machine_qemuarm64 ?= "087b65ddac049813eef2513c4440cb1d02971357"
+SRCREV_machine_qemumips ?= "2e81d7a5cc2cbfae377f4d07d85c34800c04e3c2"
+SRCREV_machine_qemuppc ?= "087b65ddac049813eef2513c4440cb1d02971357"
+SRCREV_machine_qemux86 ?= "087b65ddac049813eef2513c4440cb1d02971357"
+SRCREV_machine_qemux86-64 ?= "087b65ddac049813eef2513c4440cb1d02971357"
+SRCREV_machine_qemumips64 ?= "af223adb1634de8cb279ff809c6d13266b87e5dc"
+SRCREV_machine ?= "087b65ddac049813eef2513c4440cb1d02971357"
+SRCREV_meta ?= "8c71361007816dcabe297f40cd5a38ed5d7d7599"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
-- 
2.5.0



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 06/10] linux-yocto/4.9: update to v4.9.6
  2017-02-01 15:30 [PATCH 00/10] kernel-yocto: consolidated pull request Bruce Ashfield
                   ` (4 preceding siblings ...)
  2017-02-01 15:30 ` [PATCH 05/10] ver_linux: Use /usr/bin/awk instead of /bin/awk Bruce Ashfield
@ 2017-02-01 15:30 ` Bruce Ashfield
  2017-02-01 15:30 ` [PATCH 07/10] kernel-yocto/meta: common-pc: add pci-siov to feature fragments Bruce Ashfield
                   ` (3 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Bruce Ashfield @ 2017-02-01 15:30 UTC (permalink / raw)
  To: richard.purdie; +Cc: openembedded-core

Integrating the 4.9.5 and 4.9.6 -stable updates. The commit logs
are as follows:

   09f886dc5a69 Linux 4.9.6
   f77ef5348d4b libceph: stop allocating a new cipher on every crypto request
   5b482bf58868 libceph: uninline ceph_crypto_key_destroy()
   12274f2c17f2 tools/virtio/ringtest: fix run-on-all.sh for offline cpus
   fa555d021d2b selftest/powerpc: Wrong PMC initialized in pmc56_overflow test
   f37b7a3004bb soc: ti: wkup_m3_ipc: Fix error return code in wkup_m3_ipc_probe()
   97d5e2057564 spi: pxa2xx: add missed break
   d21814a8068a dmaengine: pl330: Fix runtime PM support for terminated transfers
   172270c74348 dmaengine: rcar-dmac: unmap slave resource when channel is freed
   3bef7578e05f s5p-mfc: Fix clock management in s5p_mfc_release() function
   d47e1e7c46fe s5p-cec: mark PM functions as __maybe_unused again
   dfe8e5730fa1 st-hva: fix some error handling in hva_hw_probe()
   b9dc16170dbf ite-cir: initialize use_demodulator before using it
   278997a8e002 gs1662: drop kfree for memory allocated with devm_kzalloc
   cec5ef6ac520 platform: pxa_camera: add VIDEO_V4L2 dependency
   2a3060531768 blackfin: check devm_pinctrl_get() for errors
   fcdab6ca9c31 rpmsg: virtio_rpmsg_bus: fix channel creation
   0f3418442d7b mtd: spi-nor: Fix some error codes in cqspi_setup_flash()
   e55e6c026b7c mtd: spi-nor: Off by one in cqspi_setup_flash()
   ebdfcaa14eef PM / devfreq: Fix the bug of devfreq_add_device when governor is NULL
   795983547317 PM / devfreq: exynos-bus: Fix the wrong return value
   16236802bfec scsi: mpt3sas: fix hang on ata passthrough commands
   a07a122ad2a2 scsi: ses: Fix SAS device detection in enclosure
   41c6b3e8989e swiotlb: Add swiotlb=noforce debug option
   1fd1e6cd6314 swiotlb: Convert swiotlb_force from int to enum
   776c2b2d165d arm64: Fix swiotlb fallback allocation
   962957889d74 arm64: mm: avoid name clash in __page_to_voff()
   d34b6684e60f xprtrdma: Squelch "max send, max recv" messages at connect time
   8ade1c2b4530 xprtrdma: Make FRWR send queue entry accounting more accurate
   a193c7247596 libceph: make sure ceph_aes_crypt() IV is aligned
   6e9fa67c58cc ceph: fix endianness bug in frag_tree_split_cmp
   2e4f2131b66f ceph: fix endianness of getattr mask in ceph_d_revalidate
   8934e069674a ceph: fix ceph_get_caps() interruption
   48baa924108e ceph: fix scheduler warning due to nested blocking
   04c9fe63166f ARM: 8613/1: Fix the uaccess crash on PB11MPCore
   dd8334a5e17e ARM: ux500: fix prcmu_is_cpu_in_wfi() calculation
   cd9601caa2fa ARM: dts: omap3: Fix Card Detect and Write Protect on Logic PD SOM-LV
   a075ac9c0a40 ARM: dts: imx6qdl-nitrogen6_max: fix sgtl5000 pinctrl init
   cfcb94b3a498 ARM: dts: omap2: Add an empty chosen node to top level DTSI
   5921b26bf744 ARM: dts: omap3: Add an empty chosen node to top level DTSI
   bec062cd47bd ARM: dts: am4372: Add an empty chosen node to top level DTSI
   c3f7ca43b2d4 ARM: dts: omap5: Add an empty chosen node to top level DTSI
   835bf872d924 ARM: dts: omap4: Add an empty chosen node to top level DTSI
   355a8fced2bf ARM: dts: am33xx: Add an empty chosen node to top level DTSI
   3e1c70972204 ARM: dts: dm814x: Add an empty chosen node to top level DTSI
   ab6dc01db1f7 ARM: dts: dm816x: Add an empty chosen node to top level DTSI
   d4f12aa133db ARM: dts: dra7: Add an empty chosen node to top level DTSI
   b8add6715c9a libceph: remove now unused ceph_*{en,de}crypt*() functions
   2982b9c92a66 libceph: switch ceph_x_decrypt() to ceph_crypt()
   717a145bd5a9 libceph: switch ceph_x_encrypt() to ceph_crypt()
   6e371f9a4144 libceph: tweak calcu_signature() a little
   788a0bbc7011 libceph: rename and align ceph_x_authorizer::reply_buf
   ecf7ced85628 libceph: introduce ceph_crypt() for in-place en/decryption
   0548b8298938 libceph: introduce ceph_x_encrypt_offset()
   be60457612a2 libceph: old_key in process_one_ticket() is redundant
   2e62bf3c6fe9 libceph: ceph_x_encrypt_buflen() takes in_len
   6d9b544d88a4 Input: ALPS - fix TrackStick support for SS5 hardware
   6e53a62a0d52 arm64/ptrace: Reject attempts to set incomplete hardware breakpoint fields
   f9081dd0c8be arm64/ptrace: Avoid uninitialised struct padding in fpr_set()
   5c5839be0842 arm64/ptrace: Preserve previous registers for short regset write - 3
   a4aafb8c4204 arm64/ptrace: Preserve previous registers for short regset write - 2
   357cfd6c83ee arm64/ptrace: Preserve previous registers for short regset write
   de327948c009 arm64: avoid returning from bad_mode
   71c496495514 ARM: dts: da850-evm: fix read access to SPI flash
   5b6618615215 ARM: dts: OMAP5 / DRA7: indicate that SATA port 0 is available.
   1f75575aca7b ceph: fix bad endianness handling in parse_reply_info_extra
   a14aeccb65e5 ibmvscsis: Fix max transfer length
   51cff2c64d20 ibmvscsis: Fix sleeping in interrupt context
   df35a8f51fcb ARM: 8634/1: hw_breakpoint: blacklist Scorpion CPUs
   73a2e2405d30 svcrdma: avoid duplicate dma unmapping during error recovery
   c49b31b585a1 clocksource/exynos_mct: Clear interrupt when cpu is shut down
   ce5c52f039cf ubifs: Fix journal replay wrt. xattr nodes
   bab10a549fd6 mac80211: implement multicast forwarding on fast-RX path
   beecb1e72cc5 qla2xxx: Fix crash due to null pointer access
   33038189bcab x86/ioapic: Restore IO-APIC irq_chip retrigger callback
   bf15e45eee7a powerpc: Ignore reserved field in DCSR and PVR reads and writes
   e09778546713 powerpc/ptrace: Preserve previous TM fprs/vsrs on short regset write
   9e10a0fc7312 powerpc/ptrace: Preserve previous fprs/vsrs on short regset write
   98e60a8345ae powerpc/perf: Fix PM_BRU_CMPL event code for power9
   09187cdf50c1 powerpc/icp-opal: Fix missing KVM case and harden replay
   26c4d513b6af KVM: arm/arm64: vgic: Fix deadlock on error handling
   e0641f201114 KVM: s390: do not expose random data via facility bitmap
   001ed27d088a mtd: nand: xway: fix build because of module functions
   c8dce6e0ef2c mtd: nand: xway: disable module support
   d8d82ac42e27 mtd: nand: lpc32xx: fix invalid error handling of a requested irq
   86249aef233e ieee802154: atusb: do not use the stack for buffers to make them DMA able
   ad17175732ca mmc: mxs-mmc: Fix additional cycles after transmission stop
   c1274eeb2fe3 mmc: sdhci-acpi: Only powered up enabled acpi child devices
   35028599bc88 HID: corsair: fix control-transfer error handling
   63df1ccb937f HID: corsair: fix DMA buffers on stack
   4922a6a5cfa7 PCI: Enumerate switches below PCI-to-PCIe bridges
   c6bdc450fe93 PCI: designware: Check for iATU unroll only on platforms that use ATU
   07f0267561c6 fuse: fix time_to_jiffies nsec sanity check
   0181b3603681 fuse: clear FR_PENDING flag when moving requests out of pending queue
   bb82fb48df8c ARC: module: Fix !CONFIG_ARC_DW2_UNWIND builds
   3c4d83a1a41e libnvdimm, namespace: fix pmem namespace leak, delete when size set to zero
   f29f3616b932 svcrpc: don't leak contexts on PROC_DESTROY
   a297ed84b928 sunrpc: don't call sleeping functions from the notifier block callbacks
   90687fc3c8c3 rcu: Narrow early boot window of illegal synchronous grace periods
   bdeaa468e221 rcu: Remove cond_resched() from Tiny synchronize_sched()
   f779e00d2e86 x86/PCI: Ignore _CRS on Supermicro X8DTH-i/6/iF/6F
   782b361c9306 tmpfs: clear S_ISGID when setting posix ACLs
   9170948a24b7 ARM: dts: omap3: Add DTS for Logic PD SOM-LV 37xx Dev Kit
   efba7a37efe2 ARM: dts: imx31: fix AVIC base address
   173470b1b10a ARM: dts: imx31: move CCM device node to AIPS2 bus devices
   979f63227c98 ARM: dts: imx31: fix clock control module interrupts description
   e95bd2ca11a9 ARM: dts: imx6q-cm-fx6: fix fec pinctrl
   387812143cbe ARM: dts: r8a7794: remove Z clock
   57a10f29e0b3 ARM: dts: r8a7794: Use SYSC "always-on" PM Domain for sound
   97136d1ef47a ARM: dts: bcm283x: fix typo in mailbox address
   03f5be20ec9b perf jit: Enable jitdump support without dwarf
   3ef6a3c0136b perf scripting: Avoid leaking the scripting_context variable
   ea738532666a perf callchain: Fixup help/config for no-unwinding
   a1d308914090 perf diff: Do not overwrite valid build id
   0f242c0ae0a6 perf trace: Check if MAP_32BIT is defined (again)
   8b5484fab145 perf mem: Fix --all-user/--all-kernel options
   567eea578016 perf trace: Use the syscall raw_syscalls:sys_enter timestamp
   d622b626270a IB/IPoIB: Remove can't use GFP_NOIO warning
   656a7d657533 IB/mlx4: Check if GRH is available before using it
   661600ff77f1 IB/mlx4: When no DMFS for IPoIB, don't allow NET_IF QPs
   8f95735412ad IB/mlx4: Fix port query for 56Gb Ethernet links
   1039b7f5c7ef IB/mlx4: Handle well-known-gid in mad_demux processing
   618d14b01a45 IB/mlx4: Fix out-of-range array index in destroy qp flow
   970f6806c2b1 IB/mlx4: Set traffic class in AH
   0d64860aa638 IB/mlx5: Wait for all async command completions to complete
   7c8441c89043 IB/mlx5: Assign SRQ type earlier
   dae9f4f14411 IB/mlx5: Fix reported max SGE calculation
   4db097fe49ea IB/mlx5: Avoid system crash when enabling many VFs
   45f3a7eb2ca0 IB/rxe: avoid putting a large struct rxe_qp on stack
   25c72b518734 IB/rxe: Increase max number of completions to 32k
   b7c551559834 IB/core: Release allocated memory in cache setup failure
   40bf0662fe3f Linux 4.9.5
   4e764538512e pinctrl: sh-pfc: Do not unconditionally support PIN_CONFIG_BIAS_DISABLE
   b90a617fef04 arm64: hugetlb: fix the wrong return value for huge_ptep_set_access_flags
   2021e55d719a arm64: hugetlb: remove the wrong pmd check in find_num_contig()
   736aec92c4e9 arm64: hugetlb: fix the wrong address for several functions
   3083593700dd powerpc/powernv: Don't warn on PE init if unfreeze is unsupported
   dcd15c20c208 powerpc/ibmebus: Fix device reference leaks in sysfs interface
   25bba7152f2a powerpc/ibmebus: Fix further device reference leaks
   ae4c24b2d584 powerpc/mm: Correct process and partition table max size
   42eded92c42b bus: vexpress-config: fix device reference leak
   d9c19f90f3a5 blk-mq: Always schedule hctx->next_cpu
   cb50d45c3d42 power: supply: bq27xxx_battery: Fix register map for BQ27510 and BQ27520
   df386a0c2804 bq24190_charger: Fix PM runtime use for bq24190_battery_set_property
   4b07d85374f5 iw_cxgb4: Fix error return code in c4iw_rdev_open()
   aa3ee06a2ae2 powercap/intel_rapl: fix and tidy up error handling
   f53cfb081f00 ACPI / APEI: Fix NMI notification handling
   f57d8710096d block: cfq_cpd_alloc() should use @gfp
   f99694cdaf76 block: Change extern inline to static inline
   a4e73cc229d8 ACPI / CPPC: set an error code on probe error path
   26991b28b47c regulators: helpers: Fix handling of bypass_val_on in get_bypass_regmap
   89c728ed9237 cpufreq: powernv: Disable preemption while checking CPU throttling state
   e5f33ef0a601 powerpc/64: Simplify adaptation to new ISA v3.00 HPTE format
   f607fd883654 remoteproc: st: Fix error return code in st_rproc_probe()
   0e38a0b7acbb remoteproc: qcom_wcnss: Fix circular module dependency
   b4a69e3877ca drm: Initialise drm_mm.head_node.allocated
   5bdb57418845 drm/i915: Move the min_pixclk[] handling to the end of readout
   699fbc4cb7d4 drm/panel: simple: Check against num_timings when setting preferred for timing
   214417a0419b drm: avoid uninitialized timestamp use in wait_vblank
   3b376640445a drm/i915/gen9: Fix PCODE polling during SAGV disabling
   26eae206b786 i2c: mux: pca954x: fix i2c mux selection caching
   396b25173370 NFSv4.1: nfs4_fl_prepare_ds must be careful about reporting success.
   e331f2f2b1fb NFS: Fix a performance regression in readdir
   4c4d4bec6c90 pNFS: Fix race in pnfs_wait_on_layoutreturn
   633b57037699 NFS: fix typo in parameter description
   a5209aa99042 pinctrl: meson: fix gpio request disabling other modes
   7a1dcd92fd39 btrfs: fix error handling when run_delayed_extent_op fails
   003e3163fcc7 btrfs: fix locking when we put back a delayed ref that's too new
   0aefd99f37f3 nvme: apply DELAY_BEFORE_CHK_RDY quirk at probe time too
   9bae3c370a9e x86/cpu: Fix bootup crashes by sanitizing the argument of the 'clearcpuid=' command-line option
   64e236812197 i2c: piix4: Avoid race conditions with IMC
   ce31072b4342 net/mlx5: Only cancel recovery work when cleaning up device
   2f946414a080 USB: serial: ch341: fix modem-control and B0 handling
   12a26bd342b5 drm/amdgpu: drop verde dpm quirks
   d52e714b39ce drm/amdgpu: update si kicker smc firmware
   0c37b07002d5 drm/radeon: drop verde dpm quirks
   7cd7aea3dc78 drm/radeon: update smc firmware selection for SI
   5375b71f3b17 drm: Clean up planes in atomic commit helper failure path
   6d15a83af982 drm/i915/gen9: Fix PCODE polling timeout in stable backport
   9297e0c189f5 net/af_iucv: don't use paged skbs for TX on HiperSockets
   00cf64fbaa1e sysctl: Drop reference added by grab_header in proc_sys_readdir
   eca02f01be96 Clearing FIFOs in RS485 emulation mode causes subsequent transmits to break
   86820a103f51 extcon: return error code on failure
   ef8ee4495171 sysrq: attach sysrq handler correctly for 32-bit kernel
   4a940d6503e1 orinoco: Use shash instead of ahash for MIC calculations
   0edcc47cdb7f ibmvscsis: Fix srp_transfer_data fail return code
   ba04d869974e tty/serial: atmel_serial: BUG: stop DMA from transmitting in stop_tx
   2d789bd1fc24 tty/serial: atmel: RS485 half duplex w/DMA: enable RX after TX is done
   199c89fd32b2 virtio_blk: avoid DMA to stack for the sense buffer
   6c6ae8c43df9 dmaengine: omap-dma: Fix dynamic lch_map allocation
   3fbaff3adc76 drivers: char: mem: Fix thinkos in kmem address checks
   1a62a0f76556 mnt: Protect the mountpoint hashtable with mount_lock
   52fd0ab07676 pid: fix lockdep deadlock warning due to ucount_lock
   57bfd5a3710b vme: Fix wrong pointer utilization in ca91cx42_slave_get
   1f363639eb30 Revert "tty: serial: 8250: add CON_CONSDEV to flags"
   f9cf776b0555 ASoC: hdmi-codec: use unsigned type to structure members with bit-field
   28dad9aa9b36 btrfs: fix crash when tracepoint arguments are freed by wq callbacks
   4d0f302bf56a xhci: fix deadlock at host remove by running watchdog correctly
   d06367ac1730 fix a fencepost error in pipe_advance()
   ab8957396a69 i2c: fix kernel memory disclosure in dev interface
   93c94ec23fae i2c: print correct device invalid address
   61a8c3372adb Input: elants_i2c - avoid divide by 0 errors on bad touchscreen data
   0556a65e8b7d USB: serial: ch341: fix open and resume after B0
   3ed1f6da3a17 USB: serial: ch341: fix control-message error handling
   139556a98511 USB: serial: ch341: fix open error handling
   1685daad0b0c USB: serial: ch341: fix resume after reset
   4aeab97a0515 USB: serial: ch341: fix initial modem-control state
   58ede4beda66 USB: serial: kl5kusb105: fix line-state error handling
   dfd48efcde84 usb: musb: fix runtime PM in debugfs
   88d3670a1de4 wusbcore: Fix one more crypto-on-the-stack bug
   99ff99b830c1 x86/CPU/AMD: Fix Bulldozer topology
   bd7e769457f9 x86/bugs: Separate AMD E400 erratum and C1E bug
   e2d9ad2c540b x86/cpu/AMD: Clean up cpu_llc_id assignment per topology feature
   259495a0440f bridge: netfilter: Fix dropping packets that moving through bridge interface
   6ba35da690f3 xfs: Timely free truncated dirty pages
   86673e9331c9 gpio: Move freeing of GPIO hogs before numbing of the device
   0a28f5393689 nl80211: fix sched scan netlink socket owner destruction
   14d6c966744d x86/efi: Don't allocate memmap through memblock after mm_init()
   99b17ac0014b efi/x86: Prune invalid memory map entries and fix boot regression
   74ce3fd64bc4 efi/libstub/arm*: Pass latest memory map to the kernel
   736e77c07fba KVM: x86: Introduce segmented_write_std
   83fedbb76051 KVM: x86: emulate FXSAVE and FXRSTOR
   aae8f3464b1f KVM: x86: add asm_safe wrapper
   bc5e1316efd6 KVM: x86: add Align16 instruction flag
   90f70fcd6f72 KVM: x86: fix NULL deref in vcpu_scan_ioapic
   5ed21cc0cf26 KVM: x86: flush pending lapic jump label updates on module unload
   483ecebb22c1 jump_labels: API for flushing deferred jump label updates
   7caf473f99b8 KVM: eventfd: fix NULL deref irqbypass consumer
   7718ffcf9a64 KVM: x86: fix emulation of "MOV SS, null selector"
   1e26cec60668 mm/hugetlb.c: fix reservation race when freeing surplus pages
   8315c22ea879 mm/slab.c: fix SLAB freelist randomization duplicate entries
   6ca29ee3ca0d mm: support anonymous stable page
   07fc9575e88a mm, memcg: fix the active list aging for lowmem requests when memcg is enabled
   6c9bd81cb9ea ocfs2: fix crash caused by stale lvb with fsdlm plugin
   692755b1006d mm: fix devm_memremap_pages crash, use mem_hotplug_{begin, done}
   8edd365ee94c mm: pmd dirty emulation in page fault handler
   87fa6f37fa29 dax: fix deadlock with DAX 4k holes
   2e264fb546fa zram: support BDI_CAP_STABLE_WRITES
   ad4764b4c8eb zram: revalidate disk under init_lock
   057ac4429aef selftests: do not require bash for the generated test
   91ee732cb563 selftests: do not require bash to run netsocktests testcase
   d65146c7fb91 drm/savage: dereferencing an error pointer
   c730a84aff6f drm/vc4: Fix a couple error codes in vc4_cl_lookup_bos()
   a63bb198dc14 drm/tegra: dpaux: Fix error handling
   6b94626c9edf regulator: axp20x: Fix axp809 ldo_io registration error on cold boot
   8ac055af47ae regulator: tps65086: Fix 25mV ranges for BUCK regulators
   9229336861cb pinctrl: sh-pfc: Add helper to handle bias lookup table
   5e1595223a2c pinctrl: sh-pfc: r8a7795: Use lookup function for bias data
   b01bbf221fcc pinctrl: imx: fix imx_pinctrl_desc initialization
   f34fbb92fe81 Input: i8042 - add Pegatron touchpad to noloop table
   5975358bf2ad Input: xpad - use correct product id for x360w controllers

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

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
index 904a8465b32c..e85d7c7b18c0 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
@@ -11,13 +11,13 @@ python () {
         raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "0898601446c6bde63cb97fb6236d114886ed5f2a"
-SRCREV_meta ?= "8c71361007816dcabe297f40cd5a38ed5d7d7599"
+SRCREV_machine ?= "1d5e0d6f25c65f2404c47de11bef86f3dbc7f29d"
+SRCREV_meta ?= "0f58ab994909b0a15939f505458cec35a9663e5d"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
 
-LINUX_VERSION ?= "4.9.4"
+LINUX_VERSION ?= "4.9.6"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
index c2931df20188..a052dad5d1fa 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
@@ -4,13 +4,13 @@ KCONFIG_MODE = "--allnoconfig"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-LINUX_VERSION ?= "4.9.4"
+LINUX_VERSION ?= "4.9.6"
 
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "087b65ddac049813eef2513c4440cb1d02971357"
-SRCREV_meta ?= "8c71361007816dcabe297f40cd5a38ed5d7d7599"
+SRCREV_machine ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
+SRCREV_meta ?= "0f58ab994909b0a15939f505458cec35a9663e5d"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.9.bb b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
index eb3f027e70e9..a61bb137b999 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
@@ -11,20 +11,20 @@ KBRANCH_qemux86  ?= "standard/base"
 KBRANCH_qemux86-64 ?= "standard/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "ebd7956fb8f43632fff9537579d2788532ec5dad"
-SRCREV_machine_qemuarm64 ?= "087b65ddac049813eef2513c4440cb1d02971357"
-SRCREV_machine_qemumips ?= "2e81d7a5cc2cbfae377f4d07d85c34800c04e3c2"
-SRCREV_machine_qemuppc ?= "087b65ddac049813eef2513c4440cb1d02971357"
-SRCREV_machine_qemux86 ?= "087b65ddac049813eef2513c4440cb1d02971357"
-SRCREV_machine_qemux86-64 ?= "087b65ddac049813eef2513c4440cb1d02971357"
-SRCREV_machine_qemumips64 ?= "af223adb1634de8cb279ff809c6d13266b87e5dc"
-SRCREV_machine ?= "087b65ddac049813eef2513c4440cb1d02971357"
-SRCREV_meta ?= "8c71361007816dcabe297f40cd5a38ed5d7d7599"
+SRCREV_machine_qemuarm ?= "9dc59f0efe6cd1dd806b5b6089faf803db9018a4"
+SRCREV_machine_qemuarm64 ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
+SRCREV_machine_qemumips ?= "0ed887a8c24e2c2a8a2f136b9ef5031bdf6cde8c"
+SRCREV_machine_qemuppc ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
+SRCREV_machine_qemux86 ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
+SRCREV_machine_qemux86-64 ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
+SRCREV_machine_qemumips64 ?= "06fff8284bbec52a36fb3d054354db2f593376ac"
+SRCREV_machine ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
+SRCREV_meta ?= "0f58ab994909b0a15939f505458cec35a9663e5d"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
 
-LINUX_VERSION ?= "4.9.4"
+LINUX_VERSION ?= "4.9.6"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
-- 
2.5.0



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 07/10] kernel-yocto/meta: common-pc: add pci-siov to feature fragments
  2017-02-01 15:30 [PATCH 00/10] kernel-yocto: consolidated pull request Bruce Ashfield
                   ` (5 preceding siblings ...)
  2017-02-01 15:30 ` [PATCH 06/10] linux-yocto/4.9: update to v4.9.6 Bruce Ashfield
@ 2017-02-01 15:30 ` Bruce Ashfield
  2017-02-01 15:30 ` [PATCH 08/10] linux-yocto/4.9: update to -rt3 Bruce Ashfield
                   ` (2 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Bruce Ashfield @ 2017-02-01 15:30 UTC (permalink / raw)
  To: richard.purdie; +Cc: openembedded-core

The common-pc ethernet selection has drivers that depend on pci_iov
being defined. As such, we should include that feature fragment
or we get build warnings:

    ---------- CONFIG_BNX2X_SRIOV -----------------
    Config: CONFIG_BNX2X_SRIOV
    From:   work-shared/qemux86-64/kernel-source/.kernel-meta/configs/standard/bsp/common-pc/common-pc-eth.cfg
    Requested value:  CONFIG_BNX2X_SRIOV=y
    Actual value:

    Config 'BNX2X_SRIOV' has the following conditionals:
    BNX2X && PCI_IOV (value: "n")
    BNX2X && PCI_IOV (value: "n")
    Dependency values are:
      BNX2X [m] PCI_IOV [n] y [y]

    ---------- CONFIG_BNXT_SRIOV -----------------
    Config: CONFIG_BNXT_SRIOV
    From: work-shared/qemux86-64/kernel-source/.kernel-meta/configs/standard/bsp/common-pc/common-pc-eth.cfg
    Requested value:  CONFIG_BNXT_SRIOV=y
    Actual value:

    Config 'BNXT_SRIOV' has the following conditionals:
    BNXT && PCI_IOV (value: "n")
    BNXT && PCI_IOV (value: "n")
    Dependency values are:
      y [y] BNXT [m] PCI_IOV [n]

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

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
index e85d7c7b18c0..155815e5df09 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
@@ -12,7 +12,7 @@ python () {
 }
 
 SRCREV_machine ?= "1d5e0d6f25c65f2404c47de11bef86f3dbc7f29d"
-SRCREV_meta ?= "0f58ab994909b0a15939f505458cec35a9663e5d"
+SRCREV_meta ?= "20b8e96e097b796673bea982918868d47d51081b"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
index a052dad5d1fa..beb2d4de30e4 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
-SRCREV_meta ?= "0f58ab994909b0a15939f505458cec35a9663e5d"
+SRCREV_meta ?= "20b8e96e097b796673bea982918868d47d51081b"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.9.bb b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
index a61bb137b999..241eb94f6ab0 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
 SRCREV_machine_qemux86-64 ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
 SRCREV_machine_qemumips64 ?= "06fff8284bbec52a36fb3d054354db2f593376ac"
 SRCREV_machine ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
-SRCREV_meta ?= "0f58ab994909b0a15939f505458cec35a9663e5d"
+SRCREV_meta ?= "20b8e96e097b796673bea982918868d47d51081b"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
-- 
2.5.0



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 08/10] linux-yocto/4.9: update to -rt3
  2017-02-01 15:30 [PATCH 00/10] kernel-yocto: consolidated pull request Bruce Ashfield
                   ` (6 preceding siblings ...)
  2017-02-01 15:30 ` [PATCH 07/10] kernel-yocto/meta: common-pc: add pci-siov to feature fragments Bruce Ashfield
@ 2017-02-01 15:30 ` Bruce Ashfield
  2017-02-01 15:30 ` [PATCH 09/10] kernel-yocto: log the BSP definition file Bruce Ashfield
  2017-02-01 15:30 ` [PATCH 10/10] linux-yocto/4.9: yaffs2 fixes Bruce Ashfield
  9 siblings, 0 replies; 11+ messages in thread
From: Bruce Ashfield @ 2017-02-01 15:30 UTC (permalink / raw)
  To: richard.purdie; +Cc: openembedded-core

Paul Gortmaker has refreshed the 4.9 -rt support to -rt3.

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

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
index 155815e5df09..b2986e32afd8 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
@@ -11,8 +11,8 @@ python () {
         raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "1d5e0d6f25c65f2404c47de11bef86f3dbc7f29d"
-SRCREV_meta ?= "20b8e96e097b796673bea982918868d47d51081b"
+SRCREV_machine ?= "35cfaa68bf6ceaf59cf2bcd020d4e66155e19c46"
+SRCREV_meta ?= "3715fc90f7b69de59ca0870f6c7cda27cdc0f895"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
index beb2d4de30e4..a9d17549d6dd 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
@@ -10,7 +10,7 @@ KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
-SRCREV_meta ?= "20b8e96e097b796673bea982918868d47d51081b"
+SRCREV_meta ?= "3715fc90f7b69de59ca0870f6c7cda27cdc0f895"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.9.bb b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
index 241eb94f6ab0..e5f6064fc939 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
 SRCREV_machine_qemux86-64 ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
 SRCREV_machine_qemumips64 ?= "06fff8284bbec52a36fb3d054354db2f593376ac"
 SRCREV_machine ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
-SRCREV_meta ?= "20b8e96e097b796673bea982918868d47d51081b"
+SRCREV_meta ?= "3715fc90f7b69de59ca0870f6c7cda27cdc0f895"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
-- 
2.5.0



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 09/10] kernel-yocto: log the BSP definition file
  2017-02-01 15:30 [PATCH 00/10] kernel-yocto: consolidated pull request Bruce Ashfield
                   ` (7 preceding siblings ...)
  2017-02-01 15:30 ` [PATCH 08/10] linux-yocto/4.9: update to -rt3 Bruce Ashfield
@ 2017-02-01 15:30 ` Bruce Ashfield
  2017-02-01 15:30 ` [PATCH 10/10] linux-yocto/4.9: yaffs2 fixes Bruce Ashfield
  9 siblings, 0 replies; 11+ messages in thread
From: Bruce Ashfield @ 2017-02-01 15:30 UTC (permalink / raw)
  To: richard.purdie; +Cc: openembedded-core

When debugging a kernel configuration issue, one of the first questions
is "what BSP was used". To answer this qusetion, we log the BSP .scc
file that was used to generate the kernel configuration in the kernel
source meta directory.

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

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 36f61c5694fb..a7b635638186 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -148,6 +148,7 @@ do_kernel_metadata() {
 	# run1: pull all the configuration fragments, no matter where they come from
 	elements="`echo -n ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}`"
 	if [ -n "${elements}" ]; then
+		echo "${bsp_definition}}" > ${S}/${meta_dir}/bsp_definition
 		scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} ${bsp_definition} ${sccs} ${patches} ${KERNEL_FEATURES}
 		if [ $? -ne 0 ]; then
 			bbfatal_log "Could not generate configuration queue for ${KMACHINE}."
-- 
2.5.0



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 10/10] linux-yocto/4.9: yaffs2 fixes
  2017-02-01 15:30 [PATCH 00/10] kernel-yocto: consolidated pull request Bruce Ashfield
                   ` (8 preceding siblings ...)
  2017-02-01 15:30 ` [PATCH 09/10] kernel-yocto: log the BSP definition file Bruce Ashfield
@ 2017-02-01 15:30 ` Bruce Ashfield
  9 siblings, 0 replies; 11+ messages in thread
From: Bruce Ashfield @ 2017-02-01 15:30 UTC (permalink / raw)
  To: richard.purdie; +Cc: openembedded-core

Merging three fixes to yaffs2, which adjust to mainline changes in the
vfs subsystem:

  4700f2f8b9db fs: yaffs2: fix the prototype of function yaffs_rename()
  56e654cab1db fs: yaffs2: switch to the generic xattr handler
  102082f3c245 fs/yaffs2: adjust to the change of inode_change_ok()

Signed-off-by: Kevin Hao <kexin.hao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb   |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_4.9.bb      | 18 +++++++++---------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
index b2986e32afd8..8eaec528d62b 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
@@ -11,8 +11,8 @@ python () {
         raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "35cfaa68bf6ceaf59cf2bcd020d4e66155e19c46"
-SRCREV_meta ?= "3715fc90f7b69de59ca0870f6c7cda27cdc0f895"
+SRCREV_machine ?= "71569cd064e02564211737430c31a4b0e9c810fb"
+SRCREV_meta ?= "6fd9dcbb3f0becf90c555a1740d21d18c331af99"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
index a9d17549d6dd..5510b0f8ff3d 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.9.6"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
-SRCREV_meta ?= "3715fc90f7b69de59ca0870f6c7cda27cdc0f895"
+SRCREV_machine ?= "4700f2f8b9dbaad5ae441b682d04b09e811135fc"
+SRCREV_meta ?= "6fd9dcbb3f0becf90c555a1740d21d18c331af99"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.9.bb b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
index e5f6064fc939..a7593848f61c 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
@@ -11,15 +11,15 @@ KBRANCH_qemux86  ?= "standard/base"
 KBRANCH_qemux86-64 ?= "standard/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "9dc59f0efe6cd1dd806b5b6089faf803db9018a4"
-SRCREV_machine_qemuarm64 ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
-SRCREV_machine_qemumips ?= "0ed887a8c24e2c2a8a2f136b9ef5031bdf6cde8c"
-SRCREV_machine_qemuppc ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
-SRCREV_machine_qemux86 ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
-SRCREV_machine_qemux86-64 ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
-SRCREV_machine_qemumips64 ?= "06fff8284bbec52a36fb3d054354db2f593376ac"
-SRCREV_machine ?= "0b52a52fb892c0dd20823268830ab22a9e3a92b8"
-SRCREV_meta ?= "3715fc90f7b69de59ca0870f6c7cda27cdc0f895"
+SRCREV_machine_qemuarm ?= "103383d270939399bc73365c31cd6f93c567114f"
+SRCREV_machine_qemuarm64 ?= "4700f2f8b9dbaad5ae441b682d04b09e811135fc"
+SRCREV_machine_qemumips ?= "c8425cad333ec85f61d63054051fe17df53ece29"
+SRCREV_machine_qemuppc ?= "4700f2f8b9dbaad5ae441b682d04b09e811135fc"
+SRCREV_machine_qemux86 ?= "4700f2f8b9dbaad5ae441b682d04b09e811135fc"
+SRCREV_machine_qemux86-64 ?= "4700f2f8b9dbaad5ae441b682d04b09e811135fc"
+SRCREV_machine_qemumips64 ?= "42fe7d605fc92985c8ba10363de487ea06bd068a"
+SRCREV_machine ?= "4700f2f8b9dbaad5ae441b682d04b09e811135fc"
+SRCREV_meta ?= "6fd9dcbb3f0becf90c555a1740d21d18c331af99"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
-- 
2.5.0



^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2017-02-01 15:30 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-01 15:30 [PATCH 00/10] kernel-yocto: consolidated pull request Bruce Ashfield
2017-02-01 15:30 ` [PATCH 01/10] linux-yocto/4.9: update to 4.9.4 Bruce Ashfield
2017-02-01 15:30 ` [PATCH 02/10] kernel-yocto/features: enable TPM Bruce Ashfield
2017-02-01 15:30 ` [PATCH 03/10] kern-tools: re-enable scc merge command Bruce Ashfield
2017-02-01 15:30 ` [PATCH 04/10] kernel-yocto: ecryptfs, NFC and CAN bus config updates Bruce Ashfield
2017-02-01 15:30 ` [PATCH 05/10] ver_linux: Use /usr/bin/awk instead of /bin/awk Bruce Ashfield
2017-02-01 15:30 ` [PATCH 06/10] linux-yocto/4.9: update to v4.9.6 Bruce Ashfield
2017-02-01 15:30 ` [PATCH 07/10] kernel-yocto/meta: common-pc: add pci-siov to feature fragments Bruce Ashfield
2017-02-01 15:30 ` [PATCH 08/10] linux-yocto/4.9: update to -rt3 Bruce Ashfield
2017-02-01 15:30 ` [PATCH 09/10] kernel-yocto: log the BSP definition file Bruce Ashfield
2017-02-01 15:30 ` [PATCH 10/10] linux-yocto/4.9: yaffs2 fixes Bruce Ashfield

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.