diff options
| author | Borislav Petkov <bp@suse.de> | 2020-05-07 13:27:43 +0300 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2020-05-07 13:27:43 +0300 |
| commit | 51485635ebc25267ebab548a1bce43f823d9c0c5 (patch) | |
| tree | 152408c7f8959f6871b655d9193a76b529faa4bb /scripts/checkpatch.pl | |
| parent | e9d7144597b10ff13ff2264c059f7d4a7fbc89ac (diff) | |
| parent | fb9cbbc895eb6e986dc90c928a35c793d75f435a (diff) | |
| download | linux-51485635ebc25267ebab548a1bce43f823d9c0c5.tar.xz | |
Merge 'x86/urgent' into x86/cpu
... to resolve conflicting changes to arch/x86/kernel/apic/apic.c
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'scripts/checkpatch.pl')
| -rwxr-xr-x | scripts/checkpatch.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index d64c67b67e3c..eac40f0abd56 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -479,7 +479,7 @@ our $allocFunctions = qr{(?x: (?:kv|k|v)[czm]alloc(?:_node|_array)? | kstrdup(?:_const)? | kmemdup(?:_nul)?) | - (?:\w+)?alloc_skb(?:ip_align)? | + (?:\w+)?alloc_skb(?:_ip_align)? | # dev_alloc_skb/netdev_alloc_skb, et al dma_alloc_coherent )}; |