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.
Now that the fixups and the asm-generic chunk have been merged, I've
regenerated the patches to get rid of those dependencies and to take account of
any changes made so far in the merge window. If you have already pulled the
older version of the branch aimed at you, then please feel free to ignore this
request.
The following changes since commit 9e2d8656f5e8aa214e66b462680cf86b210b74a8:
Merge branch 'akpm' (Andrew's patch-bomb) (2012-10-09 16:23:15 +0900)
are available in the git repository at:
git://git.infradead.org/users/dhowells/linux-headers.git tags/disintegrate-microblaze-20121009
for you to fetch changes up to 1883baaa2ea07d83228d5a83a3133cd02bab7fc6:
UAPI: (Scripted) Disintegrate arch/microblaze/include/asm (2012-10-09 09:47:10 +0100)
----------------------------------------------------------------
UAPI Disintegration 2012-10-09
----------------------------------------------------------------
David Howells (1):
UAPI: (Scripted) Disintegrate arch/microblaze/include/asm
arch/microblaze/include/asm/Kbuild | 2 -
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 +++++++++++++++++++++
38 files changed, 649 insertions(+), 552 deletions(-)
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
.
2012/10/9 David Howells <[email protected]>:
> 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.
>
> Now that the fixups and the asm-generic chunk have been merged, I've
> regenerated the patches to get rid of those dependencies and to take account of
> any changes made so far in the merge window. If you have already pulled the
> older version of the branch aimed at you, then please feel free to ignore this
> request.
>
> The following changes since commit 9e2d8656f5e8aa214e66b462680cf86b210b74a8:
>
> Merge branch 'akpm' (Andrew's patch-bomb) (2012-10-09 16:23:15 +0900)
>
> are available in the git repository at:
Add to microblaze next branch.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng)
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian