diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-03-15 09:00:12 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-15 09:01:06 +0100 |
| commit | 8bc6782fe20bd2584c73a35c47329c9fd0a8d34c (patch) | |
| tree | c7fc6f467ee212e4ef442e70843c48fcf3c67c17 /scripts | |
| parent | e23604edac2a7be6a8808a5d13fac6b9df4eb9a8 (diff) | |
| parent | 3500efae4410454522697c94c23fc40323c0cee9 (diff) | |
Merge commit 'fixes.2015.02.23a' into core/rcu
Conflicts:
kernel/rcu/tree.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/checkpatch.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 0147c91fa549..874132b26d23 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -269,7 +269,8 @@ our $Sparse = qr{ __init_refok| __kprobes| __ref| - __rcu + __rcu| + __private }x; our $InitAttributePrefix = qr{__(?:mem|cpu|dev|net_|)}; our $InitAttributeData = qr{$InitAttributePrefix(?:initdata\b)}; |