#!/bin/sh
# Simple script to update the version of DTC carried by the Linux kernel
#
# This script assumes that the dtc and the linux git trees are in the
# same directory. After building dtc in the dtc directory, it copies the
# source files and generated source files into the scripts/dtc directory
# in the kernel and creates a git commit updating them to the new
# version.
#
# Usage: from the top level Linux source tree, run:
# $ ./scripts/dtc/update-dtc-source.sh
#
# The script will change into the dtc tree, build and test dtc, copy the
# relevant files into the kernel tree and create a git commit. The commit
# message will need to be modified to reflect the version of DTC being
# imported
#
# TODO:
# This script is pretty basic, but it is seldom used so a few manual tasks
# aren't a big deal. If anyone is interested in making it more robust, the
# the following would be nice:
# * Actually fail to complete if any testcase fails.
#   - The dtc "make check" target needs to return a failure
# * Extract the version number from the dtc repo for the commit message
# * Build dtc in the kernel tree
# * run 'make check" on dtc built from the kernel tree

set -ev

DTC_UPSTREAM_PATH=`pwd`/../dtc
DTC_LINUX_PATH=`pwd`/scripts/dtc

DTC_SOURCE="checks.c data.c dtc.c dtc.h flattree.c fstree.c livetree.c srcpos.c \
		srcpos.h treesource.c util.c util.h version_gen.h Makefile.dtc \
		dtc-lexer.l dtc-parser.y"
DTC_GENERATED="dtc-lexer.lex.c dtc-parser.tab.c dtc-parser.tab.h"
LIBFDT_SOURCE="Makefile.libfdt fdt.c fdt.h fdt_empty_tree.c fdt_ro.c fdt_rw.c fdt_strerror.c fdt_sw.c fdt_wip.c libfdt.h libfdt_env.h libfdt_internal.h"

# Build DTC
cd $DTC_UPSTREAM_PATH
make clean
make check

# Copy the files into the Linux tree
cd $DTC_LINUX_PATH
for f in $DTC_SOURCE; do
	cp ${DTC_UPSTREAM_PATH}/${f} ${f}
	git add ${f}
done
for f in $DTC_GENERATED; do
	cp ${DTC_UPSTREAM_PATH}/$f ${f}_shipped
	git add ${f}_shipped
done
for f in $LIBFDT_SOURCE; do
       cp ${DTC_UPSTREAM_PATH}/libfdt/${f} libfdt/${f}
       git add libfdt/${f}
done

sed -i -- 's/#include <libfdt_env.h>/#include "libfdt_env.h"/g' ./libfdt/libfdt.h
sed -i -- 's/#include <fdt.h>/#include "fdt.h"/g' ./libfdt/libfdt.h
git add ./libfdt/libfdt.h

git commit -e -v -m "scripts/dtc: Update to upstream version [CHANGEME]"
ht' method='get' action='/cgit.cgi/linux/net-next.git/log/net/rds/ib_cm.c'>
<input type='hidden' name='h' value='nds-private-remove'/><input type='hidden' name='id' value='11e3b725cfc282efe9d4a354153e99d86a16af08'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit.cgi/linux/net-next.git/commit/?h=nds-private-remove&amp;id=11e3b725cfc282efe9d4a354153e99d86a16af08'>root</a>/<a href='/cgit.cgi/linux/net-next.git/commit/net?h=nds-private-remove&amp;id=11e3b725cfc282efe9d4a354153e99d86a16af08'>net</a>/<a href='/cgit.cgi/linux/net-next.git/commit/net/rds?h=nds-private-remove&amp;id=11e3b725cfc282efe9d4a354153e99d86a16af08'>rds</a>/<a href='/cgit.cgi/linux/net-next.git/commit/net/rds/ib_cm.c?h=nds-private-remove&amp;id=11e3b725cfc282efe9d4a354153e99d86a16af08'>ib_cm.c</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='h' value='nds-private-remove'/><input type='hidden' name='id' value='11e3b725cfc282efe9d4a354153e99d86a16af08'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Ard Biesheuvel &lt;ard.biesheuvel@linaro.org&gt;</td><td class='right'>2017-01-17 13:46:29 +0000</td></tr>
<tr><th>committer</th><td>Herbert Xu &lt;herbert@gondor.apana.org.au&gt;</td><td class='right'>2017-01-23 22:41:33 +0800</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/net/rds/ib_cm.c?h=nds-private-remove&amp;id=11e3b725cfc282efe9d4a354153e99d86a16af08'>11e3b725cfc282efe9d4a354153e99d86a16af08</a> (<a href='/cgit.cgi/linux/net-next.git/patch/net/rds/ib_cm.c?id=11e3b725cfc282efe9d4a354153e99d86a16af08'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/tree/?h=nds-private-remove&amp;id=11e3b725cfc282efe9d4a354153e99d86a16af08'>8b5b9e0e1bcae1ab98ee652ffb7b13b05c209bd6</a> /<a href='/cgit.cgi/linux/net-next.git/tree/net/rds/ib_cm.c?h=nds-private-remove&amp;id=11e3b725cfc282efe9d4a354153e99d86a16af08'>net/rds/ib_cm.c</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/net/rds/ib_cm.c?h=nds-private-remove&amp;id=d6040764adcb5cb6de1489422411d701c158bb69'>d6040764adcb5cb6de1489422411d701c158bb69</a> (<a href='/cgit.cgi/linux/net-next.git/diff/net/rds/ib_cm.c?h=nds-private-remove&amp;id=11e3b725cfc282efe9d4a354153e99d86a16af08&amp;id2=d6040764adcb5cb6de1489422411d701c158bb69'>diff</a>)</td></tr></table>
<div class='commit-subject'>crypto: arm64/aes-blk - honour iv_out requirement in CBC and CTR modes</div><div class='commit-msg'>Update the ARMv8 Crypto Extensions and the plain NEON AES implementations
in CBC and CTR modes to return the next IV back to the skcipher API client.
This is necessary for chaining to work correctly.

Note that for CTR, this is only done if the request is a round multiple of
the block size, since otherwise, chaining is impossible anyway.

Cc: &lt;stable@vger.kernel.org&gt; # v3.16+
Signed-off-by: Ard Biesheuvel &lt;ard.biesheuvel@linaro.org&gt;
Signed-off-by: Herbert Xu &lt;herbert@gondor.apana.org.au&gt;
</div><div class='diffstat-header'><a href='/cgit.cgi/linux/net-next.git/diff/?h=nds-private-remove&amp;id=11e3b725cfc282efe9d4a354153e99d86a16af08'>Diffstat</a> (limited to 'net/rds/ib_cm.c')</div><table summary='diffstat' class='diffstat'>