| Message ID | 17438.1349380312@warthog.procyon.org.uk |
|---|---|
| State | Changes Requested |
| Delegated to: | David Miller |
| Headers | show |
From: David Howells <dhowells@redhat.com> Date: Thu, 04 Oct 2012 20:51:52 +0100 > Can you merge the following branch into the sparc 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. When I pull the sparc branch, I get c6x and arm64 commits too. 37d11ab8b478ccb7aa2270666603ca2e5ac4c11d 1c1e436269fe840cdbecfaf397b21778dd276f26 I don't want that going in via the sparc tree, it really doesn't belong there. -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
David Miller <davem@davemloft.net> wrote: > When I pull the sparc branch, I get c6x and arm64 commits too. > > 37d11ab8b478ccb7aa2270666603ca2e5ac4c11d > 1c1e436269fe840cdbecfaf397b21778dd276f26 > > I don't want that going in via the sparc tree, it really > doesn't belong there. They're at the base of every branch so that I can test those arches on every branch. I suppose I could exclude them from unrelated arch branches, or perhaps better still if I can get Linus to pull them. David -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Can you merge the following branch into the sparc 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-sparc for you to fetch changes up to d4ae6a1549e06de45a1c8a4fb596a2874f5f83e5: UAPI: (Scripted) Disintegrate arch/sparc/include/asm (2012-10-04 18:21:32 +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/sparc/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/openrisc/include/asm/unistd.h | 5 - arch/score/include/asm/unistd.h | 5 - arch/sparc/include/asm/Kbuild | 16 - arch/sparc/include/asm/fbio.h | 260 +------ arch/sparc/include/asm/ioctls.h | 129 +--- arch/sparc/include/asm/mman.h | 25 +- arch/sparc/include/asm/psr.h | 36 +- arch/sparc/include/asm/ptrace.h | 347 +-------- arch/sparc/include/asm/setup.h | 10 +- arch/sparc/include/asm/sigcontext.h | 4 +- arch/sparc/include/asm/siginfo.h | 24 +- arch/sparc/include/asm/signal.h | 185 +---- arch/sparc/include/asm/termbits.h | 260 +------ arch/sparc/include/asm/termios.h | 41 +- arch/sparc/include/asm/traps.h | 111 +-- arch/sparc/include/asm/unistd.h | 412 +---------- arch/sparc/include/uapi/asm/Kbuild | 46 ++ arch/sparc/include/{ => uapi}/asm/apc.h | 0 arch/sparc/include/{ => uapi}/asm/asi.h | 0 arch/sparc/include/{ => uapi}/asm/auxvec.h | 0 arch/sparc/include/{ => uapi}/asm/bitsperlong.h | 0 arch/sparc/include/{ => uapi}/asm/byteorder.h | 0 arch/sparc/include/{ => uapi}/asm/display7seg.h | 0 arch/sparc/include/{ => uapi}/asm/envctrl.h | 0 arch/sparc/include/{ => uapi}/asm/errno.h | 0 arch/sparc/include/uapi/asm/fbio.h | 259 +++++++ arch/sparc/include/{ => uapi}/asm/fcntl.h | 0 arch/sparc/include/{ => uapi}/asm/ioctl.h | 0 arch/sparc/include/uapi/asm/ioctls.h | 131 ++++ arch/sparc/include/{ => uapi}/asm/ipcbuf.h | 0 arch/sparc/include/{ => uapi}/asm/jsflash.h | 0 arch/sparc/include/{ => uapi}/asm/kvm_para.h | 0 arch/sparc/include/uapi/asm/mman.h | 27 + arch/sparc/include/{ => uapi}/asm/msgbuf.h | 0 arch/sparc/include/{ => uapi}/asm/openpromio.h | 0 arch/sparc/include/{ => uapi}/asm/param.h | 0 arch/sparc/include/{ => uapi}/asm/perfctr.h | 0 arch/sparc/include/{ => uapi}/asm/poll.h | 0 arch/sparc/include/{ => uapi}/asm/posix_types.h | 0 arch/sparc/include/uapi/asm/psr.h | 47 ++ arch/sparc/include/{ => uapi}/asm/psrcompat.h | 0 arch/sparc/include/{ => uapi}/asm/pstate.h | 0 arch/sparc/include/uapi/asm/ptrace.h | 352 +++++++++ arch/sparc/include/{ => uapi}/asm/resource.h | 0 arch/sparc/include/{ => uapi}/asm/sembuf.h | 0 arch/sparc/include/uapi/asm/setup.h | 15 + arch/sparc/include/{ => uapi}/asm/shmbuf.h | 0 arch/sparc/include/uapi/asm/siginfo.h | 26 + arch/sparc/include/uapi/asm/signal.h | 185 +++++ arch/sparc/include/{ => uapi}/asm/socket.h | 0 arch/sparc/include/{ => uapi}/asm/sockios.h | 0 arch/sparc/include/{ => uapi}/asm/stat.h | 0 arch/sparc/include/{ => uapi}/asm/statfs.h | 0 arch/sparc/include/{ => uapi}/asm/swab.h | 0 arch/sparc/include/uapi/asm/termbits.h | 263 +++++++ arch/sparc/include/uapi/asm/termios.h | 43 ++ arch/sparc/include/uapi/asm/traps.h | 120 ++++ arch/sparc/include/{ => uapi}/asm/types.h | 0 arch/sparc/include/{ => uapi}/asm/uctx.h | 0 arch/sparc/include/uapi/asm/unistd.h | 422 +++++++++++ arch/sparc/include/{ => uapi}/asm/utrap.h | 0 arch/sparc/include/{ => uapi}/asm/watchdog.h | 0 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 +- 123 files changed, 3745 insertions(+), 3637 deletions(-) delete mode 100644 arch/c6x/include/asm/signal.h rename arch/sparc/include/{ => uapi}/asm/apc.h (100%) rename arch/sparc/include/{ => uapi}/asm/asi.h (100%) rename arch/sparc/include/{ => uapi}/asm/auxvec.h (100%) rename arch/sparc/include/{ => uapi}/asm/bitsperlong.h (100%) rename arch/sparc/include/{ => uapi}/asm/byteorder.h (100%) rename arch/sparc/include/{ => uapi}/asm/display7seg.h (100%) rename arch/sparc/include/{ => uapi}/asm/envctrl.h (100%) rename arch/sparc/include/{ => uapi}/asm/errno.h (100%) create mode 100644 arch/sparc/include/uapi/asm/fbio.h rename arch/sparc/include/{ => uapi}/asm/fcntl.h (100%) rename arch/sparc/include/{ => uapi}/asm/ioctl.h (100%) create mode 100644 arch/sparc/include/uapi/asm/ioctls.h rename arch/sparc/include/{ => uapi}/asm/ipcbuf.h (100%) rename arch/sparc/include/{ => uapi}/asm/jsflash.h (100%) rename arch/sparc/include/{ => uapi}/asm/kvm_para.h (100%) create mode 100644 arch/sparc/include/uapi/asm/mman.h rename arch/sparc/include/{ => uapi}/asm/msgbuf.h (100%) rename arch/sparc/include/{ => uapi}/asm/openpromio.h (100%) rename arch/sparc/include/{ => uapi}/asm/param.h (100%) rename arch/sparc/include/{ => uapi}/asm/perfctr.h (100%) rename arch/sparc/include/{ => uapi}/asm/poll.h (100%) rename arch/sparc/include/{ => uapi}/asm/posix_types.h (100%) create mode 100644 arch/sparc/include/uapi/asm/psr.h rename arch/sparc/include/{ => uapi}/asm/psrcompat.h (100%) rename arch/sparc/include/{ => uapi}/asm/pstate.h (100%) create mode 100644 arch/sparc/include/uapi/asm/ptrace.h rename arch/sparc/include/{ => uapi}/asm/resource.h (100%) rename arch/sparc/include/{ => uapi}/asm/sembuf.h (100%) create mode 100644 arch/sparc/include/uapi/asm/setup.h rename arch/sparc/include/{ => uapi}/asm/shmbuf.h (100%) create mode 100644 arch/sparc/include/uapi/asm/sigcontext.h create mode 100644 arch/sparc/include/uapi/asm/siginfo.h create mode 100644 arch/sparc/include/uapi/asm/signal.h rename arch/sparc/include/{ => uapi}/asm/socket.h (100%) rename arch/sparc/include/{ => uapi}/asm/sockios.h (100%) rename arch/sparc/include/{ => uapi}/asm/stat.h (100%) rename arch/sparc/include/{ => uapi}/asm/statfs.h (100%) rename arch/sparc/include/{ => uapi}/asm/swab.h (100%) create mode 100644 arch/sparc/include/uapi/asm/termbits.h create mode 100644 arch/sparc/include/uapi/asm/termios.h create mode 100644 arch/sparc/include/uapi/asm/traps.h rename arch/sparc/include/{ => uapi}/asm/types.h (100%) rename arch/sparc/include/{ => uapi}/asm/uctx.h (100%) create mode 100644 arch/sparc/include/uapi/asm/unistd.h rename arch/sparc/include/{ => uapi}/asm/utrap.h (100%) rename arch/sparc/include/{ => uapi}/asm/watchdog.h (100%) 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 . -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html