History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Two easy cases of overlapping changes.

David S. Miller committed 7 years ago

Commit 8b448362 parents c049d56 cd8dead247 files · +1881 −715Browse files

Showing the changes to scripts (1 of 247 files). Show all

Unified · Split

scripts/atomic/gen-atomics.sh+1−1
@@ -13,7 +13,7 @@ gen-atomic-long.sh asm-generic/atomic-long.h · 12 unmodified lines
13gen-atomic-fallback.sh linux/atomic-fallback.h13gen-atomic-fallback.sh linux/atomic-fallback.h
14EOF14EOF
15while read script header; do15while read script header; do
16 ${ATOMICDIR}/${script} ${ATOMICTBL} > ${LINUXDIR}/include/${header}16 /bin/sh ${ATOMICDIR}/${script} ${ATOMICTBL} > ${LINUXDIR}/include/${header}
17 HASH="$(sha1sum ${LINUXDIR}/include/${header})"17 HASH="$(sha1sum ${LINUXDIR}/include/${header})"
18 HASH="${HASH%% *}"18 HASH="${HASH%% *}"
19 printf "// %s\n" "${HASH}" >> ${LINUXDIR}/include/${header}19 printf "// %s\n" "${HASH}" >> ${LINUXDIR}/include/${header}