diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-17 13:40:22 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-17 13:40:22 -0700 |
commit | 985c9e615a605041d728c08b83d3dda19ae7def8 (patch) | |
tree | cde10f45cf4bbbb78a88f6a20c3c4474119d5391 /security/apparmor | |
parent | 18673533256a2953ccefded52df2679de8640685 (diff) | |
parent | bb2bab177408e44079ba6bd37242fa8b26dfc2a7 (diff) | |
download | op-kernel-dev-985c9e615a605041d728c08b83d3dda19ae7def8.zip op-kernel-dev-985c9e615a605041d728c08b83d3dda19ae7def8.tar.gz |
Merge tag 'uapi-fixes-20121017' of git://git.infradead.org/users/dhowells/linux-headers
Pull misc UAPI fixes from David Howells:
"They do a number of things:
(1) Import a patch from Catalin Marinas to extend the generic-y in
Kbuild facility to uapi directories.
(2) Make arch/tile's ucontext.h file use (1) and remove the header-y
line from the kernel internal side of things.
(3) Remove some now-empty conditional bits from include/linux/Kbuild.
The contents got moved to the UAPI side of things along with new
conditionals.
(4) Deal with now-empty files:
(a) Empty Kbuild files under include/ get removed.
(b) Empty Kbuild files under arch/ get comments to hold them as
they are likely to end up with generic-y or genhdr-y lines.
Deleting them appears to work if we want to go that route.
(c) Put a comment into uapi/asm-generic/kvm_para.h to prevent the
patch program from deleting that, and made the arches with
empty kvm_para.h uapi files use that instead of having their
own files.
(d) Put comments into four other empty uapi/ headers to prevent the
patch program from deleting them.
A question: Is this the right way to deal with the now-empty Kbuild
files?
The ones under include/ are unlikely to be used - even for generated
files, I think - so getting rid of them is probably okay. Once all
the bits are in, we can probably remove all the Kbuild files under
include/ that aren't also under include/uapi/.
The ones under arch/ are more of an issue because of the potential for
generic-y and genhdr-y."
* tag 'uapi-fixes-20121017' of git://git.infradead.org/users/dhowells/linux-headers:
UAPI: Make arch/sparc/include/uapi/asm/sigcontext.h non-empty
UAPI: Make arch/sh/include/uapi/asm/hw_breakpoint.h non-empty
UAPI: Make arch/mn10300/include/uapi/asm/setup.h non-empty
UAPI: Put a comment into uapi/asm-generic/kvm_para.h and use it from arches
UAPI: The tile arch uses the generic ucontext.h file
UAPI: Place comments in empty arch Kbuilds to make them non-empty
UAPI: Remove empty non-UAPI Kbuild files
UAPI: Remove empty conditionals from include/linux/Kbuild
UAPI: Make uapi/linux/irqnr.h non-empty
uapi: Allow automatic generation of uapi/asm/ header files
Diffstat (limited to 'security/apparmor')
0 files changed, 0 insertions, 0 deletions