Hi Tom,

Here is a second attempt with this patch pulled in:

http://patchwork.ozlabs.org/patch/681814/

The following changes since commit c69f6d04ec66433f2360490a5cd0263c83aab18f:

Merge branch 'master' of http://git.denx.de/u-boot-mmc (2016-10-13 08:13:56 -0400)

are available in the git repository at:

git://git.denx.de/u-boot-fdt.git

for you to fetch changes up to 42b7600d62ae288a8c12431d232b89b26ec61721:

libfdt: Drop inlining of fdt_path_offset() (2016-10-13 14:12:40 -0600)

---------------------------------------------------------------- David Gibson (1): libfdt: Fix undefined behaviour in fdt_offset_ptr()

Hannes Schmelzer (1): cmd/fdt: add possibilty to have 'extrasize' on fdt resize

Simon Glass (4): libfdt: Sync up with upstream libfdt: Bring in upstream stringlist functions libfdt: Sync fdt_for_each_subnode() with upstream libfdt: Drop inlining of fdt_path_offset()

arch/arm/mach-tegra/xusb-padctl-common.c | 18 +++++----- arch/arm/mach-uniphier/board_late_init.c | 5 ++- arch/x86/cpu/irq.c | 5 +-- board/compulab/cm_fx6/cm_fx6.c | 2 +- cmd/fdt.c | 9 +++-- common/fdt_support.c | 3 +- common/image-fdt.c | 2 +- common/image-fit.c | 21 +++++------ common/image-sig.c | 8 ++--- common/image.c | 19 +++++----- drivers/clk/clk-uclass.c | 6 ++-- drivers/core/device.c | 2 +- drivers/gpio/dwapb_gpio.c | 3 +- drivers/i2c/mxc_i2c.c | 2 +- drivers/mailbox/mailbox-uclass.c | 6 ++-- drivers/net/cpsw.c | 2 +- drivers/net/keystone_net.c | 4 +-- drivers/net/mvpp2.c | 2 +- drivers/net/sun8i_emac.c | 5 +-- drivers/pci/pci_tegra.c | 2 +- drivers/phy/marvell/comphy_core.c | 2 +- drivers/pinctrl/exynos/pinctrl-exynos.c | 9 +++-- drivers/pinctrl/meson/pinctrl-meson.c | 4 +-- drivers/pinctrl/pinctrl-generic.c | 10 +++--- drivers/pinctrl/pinctrl-uclass.c | 2 +- drivers/power/pmic/palmas.c | 2 +- drivers/reset/reset-uclass.c | 6 ++-- drivers/spi/fsl_qspi.c | 2 +- drivers/video/sunxi_display.c | 2 +- include/fdt_support.h | 10 +++++- include/libfdt.h | 187 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------- lib/fdtdec.c | 4 +-- lib/libfdt/fdt.c | 13 +++---- lib/libfdt/fdt_overlay.c | 8 ++--- lib/libfdt/fdt_ro.c | 119 ++++++++++++++++++++++++++++++++++++++------------------------ lib/libfdt/fdt_rw.c | 4 ++- lib/libfdt/fdt_wip.c | 6 ++-- test/overlay/cmd_ut_overlay.c | 5 ++- 38 files changed, 299 insertions(+), 222 deletions(-)

Regards, Simon