diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-25 22:05:32 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-25 22:05:32 +0300 |
| commit | 42dc45e84452c1ee72c482d477a2e71c0689b143 (patch) | |
| tree | 572f312c128587f5b28b3eae40b921d76b1611e7 /scripts/nsdeps | |
| parent | 11cc92eb747aace5aa2b54b65b5cb8325a8981de (diff) | |
| parent | d8f6e5c6c83737cfdad46077e614885a3db9e809 (diff) | |
| download | linux-42dc45e84452c1ee72c482d477a2e71c0689b143.tar.xz | |
Merge branch 'for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jlawall/linux
Pull coccinelle updates from Julia Lawall.
* 'for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jlawall/linux:
scripts: coccicheck: Correct usage of make coccicheck
coccinelle: update expiring email addresses
coccinnelle: Remove ptr_ret script
kbuild: do not use scripts/ld-version.sh for checking spatch version
remove boolinit.cocci
Diffstat (limited to 'scripts/nsdeps')
| -rw-r--r-- | scripts/nsdeps | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/nsdeps b/scripts/nsdeps index dab4c1a0e27d..e8ce2a4d704a 100644 --- a/scripts/nsdeps +++ b/scripts/nsdeps @@ -12,11 +12,9 @@ if [ ! -x "$SPATCH" ]; then exit 1 fi -SPATCH_REQ_VERSION_NUM=$(echo $SPATCH_REQ_VERSION | ${DIR}/scripts/ld-version.sh) SPATCH_VERSION=$($SPATCH --version | head -1 | awk '{print $3}') -SPATCH_VERSION_NUM=$(echo $SPATCH_VERSION | ${DIR}/scripts/ld-version.sh) -if [ "$SPATCH_VERSION_NUM" -lt "$SPATCH_REQ_VERSION_NUM" ] ; then +if ! { echo "$SPATCH_REQ_VERSION"; echo "$SPATCH_VERSION"; } | sort -CV ; then echo "spatch needs to be version $SPATCH_REQ_VERSION or higher" exit 1 fi |