diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-12 07:07:47 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-12 07:07:47 +0300 |
| commit | 7184487f14eb7c2fcf8337bb16c6a63b6db1252e (patch) | |
| tree | 95bd179196eb98fa2c31bbcacd782db80be44f3e /include/linux/audit.h | |
| parent | 59d53737a8640482995fea13c6e2c0fd016115d6 (diff) | |
| parent | 2fded7f44b8fcf79e274c3f0cfbd0298f95308f3 (diff) | |
| download | linux-7184487f14eb7c2fcf8337bb16c6a63b6db1252e.tar.xz | |
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit
Pull audit fix from Paul Moore:
"Just one patch from the audit tree for v3.20, and a very minor one at
that.
The patch simply removes an old, unused field from the audit_krule
structure, a private audit-only struct. In audit related news, we did
a proper overhaul of the audit pathname code and removed the nasty
getname()/putname() hacks for audit, you should see those patches in
Al's vfs tree if you haven't already.
That's it for audit this time, let's hope for a quiet -rcX series"
* 'upstream' of git://git.infradead.org/users/pcmoore/audit:
audit: remove vestiges of vers_ops
Diffstat (limited to 'include/linux/audit.h')
| -rw-r--r-- | include/linux/audit.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/audit.h b/include/linux/audit.h index af84234e1f6e..599f3bd2d6c5 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -46,7 +46,6 @@ struct audit_tree; struct sk_buff; struct audit_krule { - int vers_ops; u32 pflags; u32 flags; u32 listnr; |