Merge branch 'akpm' (final batch from Andrew)
Merge third patch-bumb from Andrew Morton:
"This wraps me up for -rc1.
- Lots of misc stuff and things which were deferred/missed from
patchbombings 1 & 2.
- ocfs2 things
- lib/scatterlist
- hfsplus
- fatfs
- documentation
- signals
- procfs
- lockdep
- coredump
- seqfile core
- kexec
- Tejun's large IDR tree reworkings
- ipmi
- partitions
- nbd
- random() things
- kfifo
- tools/testing/selftests updates
- Sasha's large and pointless hlist cleanup"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (163 commits)
hlist: drop the node parameter from iterators
kcmp: make it depend on CHECKPOINT_RESTORE
selftests: add a simple doc
tools/testing/selftests/Makefile: rearrange targets
selftests/efivarfs: add create-read test
selftests/efivarfs: add empty file creation test
selftests: add tests for efivarfs
kfifo: fix kfifo_alloc() and kfifo_init()
kfifo: move kfifo.c from kernel/ to lib/
arch Kconfig: centralise CONFIG_ARCH_NO_VIRT_TO_BUS
w1: add support for DS2413 Dual Channel Addressable Switch
memstick: move the dereference below the NULL test
drivers/pps/clients/pps-gpio.c: use devm_kzalloc
Documentation/DMA-API-HOWTO.txt: fix typo
include/linux/eventfd.h: fix incorrect filename is a comment
mtd: mtd_stresstest: use prandom_bytes()
mtd: mtd_subpagetest: convert to use prandom library
mtd: mtd_speedtest: use prandom_bytes
mtd: mtd_pagetest: convert to use prandom library
mtd: mtd_oobtest: convert to use prandom library
...
This commit is contained in:
@@ -2930,7 +2930,7 @@ sub process {
|
||||
my $var = $1;
|
||||
if ($var !~ /$Constant/ &&
|
||||
$var =~ /[A-Z]\w*[a-z]|[a-z]\w*[A-Z]/ &&
|
||||
$var !~ /^Page[A-Z]/ &&
|
||||
$var !~ /"^(?:Clear|Set|TestClear|TestSet|)Page[A-Z]/ &&
|
||||
!defined $camelcase{$var}) {
|
||||
$camelcase{$var} = 1;
|
||||
WARN("CAMELCASE",
|
||||
|
||||
@@ -611,6 +611,10 @@ sub get_maintainers {
|
||||
$hash{$tvi} = $value_pd;
|
||||
}
|
||||
}
|
||||
} elsif ($type eq 'K') {
|
||||
if ($file =~ m/$value/x) {
|
||||
$hash{$tvi} = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -1750,7 +1750,7 @@ sub dump_struct($$) {
|
||||
# strip kmemcheck_bitfield_{begin,end}.*;
|
||||
$members =~ s/kmemcheck_bitfield_.*?;//gos;
|
||||
# strip attributes
|
||||
$members =~ s/__aligned\s*\(\d+\)//gos;
|
||||
$members =~ s/__aligned\s*\(.+\)//gos;
|
||||
|
||||
create_parameterlist($members, ';', $file);
|
||||
check_sections($file, $declaration_name, "struct", $sectcheck, $struct_actual, $nested);
|
||||
|
||||
Reference in New Issue
Block a user