Merge the rest of Andrew's patches for -rc1: "A bunch of fixes and misc missed-out-on things. That'll do for -rc1. I still have a batch of IPC patches which still have a possible bug report which I'm chasing down." * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (25 commits) keys: use keyring_alloc() to create module signing keyring keys: fix unreachable code sendfile: allows bypassing of notifier events SGI-XP: handle non-fatal traps fat: fix incorrect function comment Documentation: ABI: remove testing/sysfs-devices-node proc: fix inconsistent lock state linux/kernel.h: fix DIV_ROUND_CLOSEST with unsigned divisors memcg: don't register hotcpu notifier from ->css_alloc() checkpatch: warn on uapi #includes that #include <uapi/... revert "rtc: recycle id when unloading a rtc driver" mm: clean up transparent hugepage sysfs error messages hfsplus: add error message for the case of failure of sync fs in delayed_sync_fs() method hfsplus: rework processing of hfs_btree_write() returned error hfsplus: rework processing errors in hfsplus_free_extents() hfsplus: avoid crash on failed block map free kcmp: include linux/ptrace.h drivers/rtc/rtc-imxdi.c: must include <linux/spinlock.h> mm: cma: WARN if freed memory is still in use exec: do not leave bprm->interp on stack ...
Showing the changes to scripts (1 of 30 files). Show all
Unified · Split
| @@ -2226,8 +2226,11 @@ sub process { · 2225 unmodified lines | ||
| 2226 | 2226 | my $path = $1; |
| 2227 | 2227 | if ($path =~ m{//}) { |
| 2228 | 2228 | ERROR("MALFORMED_INCLUDE", |
| 2229 | − "malformed #include filename\n" . | |
| 2230 | − $herecurr); | |
| 2229 | + "malformed #include filename\n" . $herecurr); | |
| 2230 | + } | |
| 2231 | + if ($path =~ "^uapi/" && $realfile =~ m@\binclude/uapi/@) { | |
| 2232 | + ERROR("UAPI_INCLUDE", | |
| 2233 | + "No #include in ...include/uapi/... should use a uapi/ path prefix\n" . $herecurr); | |
| 2231 | 2234 | } |
| 2232 | 2235 | } |
| 2233 | 2236 | |