diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-10-06 21:00:36 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-10-06 21:58:41 +1100 |
| commit | 0aed47737c8f366c5e6895c57f0b193ff0eb43a3 (patch) | |
| tree | 1206e3075357a3f4561ba937859d69df7f3537db /vendor/golang.org/x/sys/unix/mkerrors.sh | |
| parent | 6e076472b8fb2d052e0b1c35d3fff3dd263ae722 (diff) | |
bump go-git to fix invalid merge error
Diffstat (limited to 'vendor/golang.org/x/sys/unix/mkerrors.sh')
| -rw-r--r-- | vendor/golang.org/x/sys/unix/mkerrors.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vendor/golang.org/x/sys/unix/mkerrors.sh b/vendor/golang.org/x/sys/unix/mkerrors.sh index 1bef7148d..197301fb8 100644 --- a/vendor/golang.org/x/sys/unix/mkerrors.sh +++ b/vendor/golang.org/x/sys/unix/mkerrors.sh @@ -527,7 +527,7 @@ ccflags="$@" $2 ~ /^RND/ || $2 ~ /^KEY_(SPEC|REQKEY_DEFL)_/ || $2 ~ /^KEYCTL_/ || - $2 ~ /^PERF_EVENT_IOC_/ || + $2 ~ /^PERF_/ || $2 ~ /^SECCOMP_MODE_/ || $2 ~ /^SPLICE_/ || $2 ~ /^SYNC_FILE_RANGE_/ || @@ -546,7 +546,7 @@ ccflags="$@" $2 ~ /^XATTR_(CREATE|REPLACE|NO(DEFAULT|FOLLOW|SECURITY)|SHOWCOMPRESSION)/ || $2 ~ /^ATTR_(BIT_MAP_COUNT|(CMN|VOL|FILE)_)/ || $2 ~ /^FSOPT_/ || - $2 ~ /^WDIOC_/ || + $2 ~ /^WDIO[CFS]_/ || $2 ~ /^NFN/ || $2 ~ /^XDP_/ || $2 ~ /^RWF_/ || |