diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-20 15:31:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-20 15:31:49 -0700 |
| commit | 8f49309a261dbe9b5217908e0e8ee8da7f148695 (patch) | |
| tree | c4c606e15eefd9ce06f798e02b3ad682971f6b35 /scripts/extract-ikconfig | |
| parent | b153f1d37a7d469501482bb3b38f398d4e778616 (diff) | |
| parent | 33236415ece63d5689411f3ddb676eeb93af2698 (diff) | |
| download | linux-8f49309a261dbe9b5217908e0e8ee8da7f148695.tar.bz2 | |
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull misc kbuild updates:
"This is the remaining part of kbuild stuff for v4.1-rc1:
- One wew coccinelle script and a clarification of the proposed fix
in bugon.coccinelle
- CONFIG_KERNEL_LZ4 support for extract-ikconfig"
* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
scripts/coccinelle/misc/bugon.cocci: update bug_on conversion warning
scripts/extract-ikconfig: Support LZ4-compressed images.
irqf_oneshot.cocci: add check of devm_request_threaded_irq()
Diffstat (limited to 'scripts/extract-ikconfig')
| -rwxr-xr-x | scripts/extract-ikconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/extract-ikconfig b/scripts/extract-ikconfig index e1862429ccda..3b42f255e2ba 100755 --- a/scripts/extract-ikconfig +++ b/scripts/extract-ikconfig @@ -61,6 +61,7 @@ try_decompress '\3757zXZ\000' abcde unxz try_decompress 'BZh' xy bunzip2 try_decompress '\135\0\0\0' xxx unlzma try_decompress '\211\114\132' xy 'lzop -d' +try_decompress '\002\041\114\030' xyy 'lz4 -d -l' # Bail out: echo "$me: Cannot find kernel config." >&2 |