Disintegrate UAPI for microblaze
Can you merge the following branch into the microblaze tree please.
This is to complete part of the UAPI disintegration for which the preparatory patches were pulled recently.
Note that there are some fixup patches which are at the base of the branch aimed at you, plus all arches get the asm-generic branch merged in too.
The following changes since commit 612a9aab56a93533e76e3ad91642db7033e03b69:
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux (2012-10-03 23:29:23 -0700)
are available in the git repository at:
git://git.infradead.org/users/dhowells/linux-headers.git disintegrate-microblaze
for you to fetch changes up to 7ca55698c6fdfabad768cd10f1a8a73bf2c705b6:
UAPI: (Scripted) Disintegrate arch/microblaze/include/asm (2012-10-04 18:21:00 +0100)
----------------------------------------------------------------
David Howells (6):
UAPI: Fix the guards on various asm/unistd.h files
UAPI: Split compound conditionals containing __KERNEL__ in Arm64 Merge remote-tracking branch 'c6x/for-linux-next' into uapi-prep
UAPI: Fix conditional header installation handling (notably kvm_para.h on m68k)
UAPI: (Scripted) Disintegrate include/asm-generic
UAPI: (Scripted) Disintegrate arch/microblaze/include/asm
Mark Salter (2):
c6x: make dsk6455 the default config
c6x: remove c6x signal.h
arch/arm64/include/asm/hwcap.h | 4 +-
arch/arm64/include/asm/stat.h | 4 +-
arch/arm64/include/asm/unistd.h | 8 +-
arch/arm64/include/asm/unistd32.h | 4 -
arch/c6x/Makefile | 2 +
arch/c6x/include/asm/Kbuild | 1 +
arch/c6x/include/asm/signal.h | 17 -
arch/c6x/include/asm/unistd.h | 4 -
arch/hexagon/include/asm/unistd.h | 5 -
arch/microblaze/include/asm/Kbuild | 3 -
arch/microblaze/include/asm/elf.h | 97 +--
arch/microblaze/include/asm/ptrace.h | 62 +-
arch/microblaze/include/asm/setup.h | 6 +-
arch/microblaze/include/asm/unistd.h | 390 +--------
arch/microblaze/include/uapi/asm/Kbuild | 32 +
arch/microblaze/include/{ => uapi}/asm/auxvec.h | 0
.../include/{ => uapi}/asm/bitsperlong.h | 0
arch/microblaze/include/{ => uapi}/asm/byteorder.h | 0
arch/microblaze/include/uapi/asm/elf.h | 121 +++
arch/microblaze/include/{ => uapi}/asm/errno.h | 0
arch/microblaze/include/{ => uapi}/asm/fcntl.h | 0
arch/microblaze/include/{ => uapi}/asm/ioctl.h | 0
arch/microblaze/include/{ => uapi}/asm/ioctls.h | 0
arch/microblaze/include/{ => uapi}/asm/ipcbuf.h | 0
arch/microblaze/include/{ => uapi}/asm/kvm_para.h | 0
arch/microblaze/include/{ => uapi}/asm/mman.h | 0
arch/microblaze/include/{ => uapi}/asm/msgbuf.h | 0
arch/microblaze/include/{ => uapi}/asm/param.h | 0
arch/microblaze/include/{ => uapi}/asm/poll.h | 0
.../include/{ => uapi}/asm/posix_types.h | 0
arch/microblaze/include/uapi/asm/ptrace.h | 72 ++
arch/microblaze/include/{ => uapi}/asm/resource.h | 0
arch/microblaze/include/{ => uapi}/asm/sembuf.h | 0
arch/microblaze/include/uapi/asm/setup.h | 19 +
arch/microblaze/include/{ => uapi}/asm/shmbuf.h | 0
.../microblaze/include/{ => uapi}/asm/sigcontext.h | 0
arch/microblaze/include/{ => uapi}/asm/siginfo.h | 0
arch/microblaze/include/{ => uapi}/asm/signal.h | 0
arch/microblaze/include/{ => uapi}/asm/socket.h | 0
arch/microblaze/include/{ => uapi}/asm/sockios.h | 0
arch/microblaze/include/{ => uapi}/asm/stat.h | 0
arch/microblaze/include/{ => uapi}/asm/statfs.h | 0
arch/microblaze/include/{ => uapi}/asm/swab.h | 0
arch/microblaze/include/{ => uapi}/asm/termbits.h | 0
arch/microblaze/include/{ => uapi}/asm/termios.h | 0
arch/microblaze/include/{ => uapi}/asm/types.h | 0
arch/microblaze/include/uapi/asm/unistd.h | 400 +++++++++
arch/openrisc/include/asm/unistd.h | 5 -
arch/score/include/asm/unistd.h | 5 -
arch/tile/include/asm/unistd.h | 5 -
arch/unicore32/include/asm/unistd.h | 4 -
include/asm-generic/Kbuild | 35 -
include/asm-generic/bitsperlong.h | 13 +-
include/asm-generic/int-l64.h | 26 +-
include/asm-generic/int-ll64.h | 31 +-
include/asm-generic/ioctl.h | 95 +--
include/asm-generic/kvm_para.h | 5 +-
include/asm-generic/param.h | 17 +-
include/asm-generic/resource.h | 66 +-
include/asm-generic/siginfo.h | 297 +------
include/asm-generic/signal.h | 117 +--
include/asm-generic/statfs.h | 81 +-
include/asm-generic/termios.h | 49 +-
include/asm-generic/unistd.h | 911 +--------------------
include/linux/Kbuild | 9 +-
include/uapi/asm-generic/Kbuild | 35 +
include/{ => uapi}/asm-generic/auxvec.h | 0
include/uapi/asm-generic/bitsperlong.h | 15 +
include/{ => uapi}/asm-generic/errno-base.h | 0
include/{ => uapi}/asm-generic/errno.h | 0
include/{ => uapi}/asm-generic/fcntl.h | 0
include/uapi/asm-generic/int-l64.h | 34 +
include/uapi/asm-generic/int-ll64.h | 39 +
include/uapi/asm-generic/ioctl.h | 98 +++
include/{ => uapi}/asm-generic/ioctls.h | 0
include/{ => uapi}/asm-generic/ipcbuf.h | 0
include/{ => uapi}/asm-generic/mman-common.h | 0
include/{ => uapi}/asm-generic/mman.h | 0
include/{ => uapi}/asm-generic/msgbuf.h | 0
include/uapi/asm-generic/param.h | 19 +
include/{ => uapi}/asm-generic/poll.h | 0
include/{ => uapi}/asm-generic/posix_types.h | 0
include/uapi/asm-generic/resource.h | 68 ++
include/{ => uapi}/asm-generic/sembuf.h | 0
include/{ => uapi}/asm-generic/setup.h | 0
include/{ => uapi}/asm-generic/shmbuf.h | 0
include/{ => uapi}/asm-generic/shmparam.h | 0
include/uapi/asm-generic/siginfo.h | 298 +++++++
include/{ => uapi}/asm-generic/signal-defs.h | 0
include/uapi/asm-generic/signal.h | 123 +++
include/{ => uapi}/asm-generic/socket.h | 0
include/{ => uapi}/asm-generic/sockios.h | 0
include/{ => uapi}/asm-generic/stat.h | 0
include/uapi/asm-generic/statfs.h | 83 ++
include/{ => uapi}/asm-generic/swab.h | 0
include/{ => uapi}/asm-generic/termbits.h | 0
include/uapi/asm-generic/termios.h | 50 ++
include/{ => uapi}/asm-generic/types.h | 0
include/{ => uapi}/asm-generic/ucontext.h | 0
include/uapi/asm-generic/unistd.h | 902 ++++++++++++++++++++
security/apparmor/Makefile | 2 +-
101 files changed, 2442 insertions(+), 2346 deletions(-)
delete mode 100644 arch/c6x/include/asm/signal.h
rename arch/microblaze/include/{ => uapi}/asm/auxvec.h (100%)
rename arch/microblaze/include/{ => uapi}/asm/bitsperlong.h (100%)
rename arch/microblaze/include/{ => uapi}/asm/byteorder.h (100%)
create mode 100644 arch/microblaze/include/uapi/asm/elf.h
rename arch/microblaze/include/{ => uapi}/asm/errno.h (100%)
rename arch/microblaze/include/{ => uapi}/asm/fcntl.h (100%)
rename arch/microblaze/include/{ => uapi}/asm/ioctl.h (100%)
rename arch/microblaze/include/{ => uapi}/asm/ioctls.h (100%)
rename arch/microblaze/include/{ => uapi}/asm/ipcbuf.h (100%)
rename arch/microblaze/include/{ => uapi}/asm/kvm_para.h (100%)
rename arch/microblaze/include/{ => uapi}/asm/mman.h (100%)
rename arch/microblaze/include/{ => uapi}/asm/msgbuf.h (100%)
rename arch/microblaze/include/{ => uapi}/asm/param.h (100%)
rename arch/microblaze/include/{ => uapi}/asm/poll.h (100%)
rename arch/microblaze/include/{ => uapi}/asm/posix_types.h (100%)
create mode 100644 arch/microblaze/include/uapi/asm/ptrace.h
rename arch/microblaze/include/{ => uapi}/asm/resource.h (100%)
rename arch/microblaze/include/{ => uapi}/asm/sembuf.h (100%)
create mode 100644 arch/microblaze/include/uapi/asm/setup.h
rename arch/microblaze/include/{ => uapi}/asm/shmbuf.h (100%)
rename arch/microblaze/include/{ => uapi}/asm/sigcontext.h (100%)
rename arch/microblaze/include/{ => uapi}/asm/siginfo.h (100%)
rename arch/microblaze/include/{ => uapi}/asm/signal.h (100%)
rename arch/microblaze/include/{ => uapi}/asm/socket.h (100%)
rename arch/microblaze/include/{ => uapi}/asm/sockios.h (100%)
rename arch/microblaze/include/{ => uapi}/asm/stat.h (100%)
rename arch/microblaze/include/{ => uapi}/asm/statfs.h (100%)
rename arch/microblaze/include/{ => uapi}/asm/swab.h (100%)
rename arch/microblaze/include/{ => uapi}/asm/termbits.h (100%)
rename arch/microblaze/include/{ => uapi}/asm/termios.h (100%)
rename arch/microblaze/include/{ => uapi}/asm/types.h (100%)
create mode 100644 arch/microblaze/include/uapi/asm/unistd.h
rename include/{ => uapi}/asm-generic/auxvec.h (100%)
create mode 100644 include/uapi/asm-generic/bitsperlong.h
rename include/{ => uapi}/asm-generic/errno-base.h (100%)
rename include/{ => uapi}/asm-generic/errno.h (100%)
rename include/{ => uapi}/asm-generic/fcntl.h (100%)
create mode 100644 include/uapi/asm-generic/int-l64.h
create mode 100644 include/uapi/asm-generic/int-ll64.h
create mode 100644 include/uapi/asm-generic/ioctl.h
rename include/{ => uapi}/asm-generic/ioctls.h (100%)
rename include/{ => uapi}/asm-generic/ipcbuf.h (100%)
create mode 100644 include/uapi/asm-generic/kvm_para.h
rename include/{ => uapi}/asm-generic/mman-common.h (100%)
rename include/{ => uapi}/asm-generic/mman.h (100%)
rename include/{ => uapi}/asm-generic/msgbuf.h (100%)
create mode 100644 include/uapi/asm-generic/param.h
rename include/{ => uapi}/asm-generic/poll.h (100%)
rename include/{ => uapi}/asm-generic/posix_types.h (100%)
create mode 100644 include/uapi/asm-generic/resource.h
rename include/{ => uapi}/asm-generic/sembuf.h (100%)
rename include/{ => uapi}/asm-generic/setup.h (100%)
rename include/{ => uapi}/asm-generic/shmbuf.h (100%)
rename include/{ => uapi}/asm-generic/shmparam.h (100%)
create mode 100644 include/uapi/asm-generic/siginfo.h
rename include/{ => uapi}/asm-generic/signal-defs.h (100%)
create mode 100644 include/uapi/asm-generic/signal.h
rename include/{ => uapi}/asm-generic/socket.h (100%)
rename include/{ => uapi}/asm-generic/sockios.h (100%)
rename include/{ => uapi}/asm-generic/stat.h (100%)
create mode 100644 include/uapi/asm-generic/statfs.h
rename include/{ => uapi}/asm-generic/swab.h (100%)
rename include/{ => uapi}/asm-generic/termbits.h (100%)
create mode 100644 include/uapi/asm-generic/termios.h
rename include/{ => uapi}/asm-generic/types.h (100%)
rename include/{ => uapi}/asm-generic/ucontext.h (100%)
create mode 100644 include/uapi/asm-generic/unistd.h.
Hi David,
Quoted 8 lines · David Howells
Can you merge the following branch into the microblaze tree please.
This is to complete part of the UAPI disintegration for which the preparatory patches were pulled recently.
Note that there are some fixup patches which are at the base of the branch aimed at you, plus all arches get the asm-generic branch merged in too.
Quoted 8 lines
The following changes since commit
612a9aab56a93533e76e3ad91642db7033e03b69:Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux (2012-10-03 23:29:23 -0700)are available in the git repository at:
git://git.infradead.org/users/dhowells/linux-headers.gitdisintegrate-microblaze
I have added this to our internal testing repository and I will start to do some tests.
I expect your intention is to merge this to mainline in current merge window, right?
Thanks,
Michal
Signature · 4 lines
Michal Simek, Ing. (M.Eng) w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/ Microblaze U-BOOT custodian
Quoted 2 lines · Michal Simek
I expect your intention is to merge this to mainline in current merge window, right?
It is preferred that it go through the maintainer's tree if possible. Note that I've posted a new version that doesn't have the dependencies any more as they've been merged upstream.
David