diff options
| author | Mark Brown <broonie@kernel.org> | 2020-04-27 17:04:50 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-04-27 17:04:50 +0300 |
| commit | e5c9a223da3c5bb9563ecf4ebe0c32de39dbc620 (patch) | |
| tree | 20f998f15d0df609423c5580a7562ba2d27e3fb8 /scripts/checkpatch.pl | |
| parent | dc234825997ec6ff05980ca9e2204f4ac3f8d695 (diff) | |
| parent | 6a8b55ed4056ea5559ebe4f6a4b247f627870d4c (diff) | |
| download | linux-e5c9a223da3c5bb9563ecf4ebe0c32de39dbc620.tar.xz | |
Merge tag 'v5.7-rc3' into spi-5.8
Linux 5.7-rc3
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 )}; |