* [GIT PULL] Disintegrate UAPI for m68k
@ 2012-10-04 19:51 David Howells
2012-10-05 5:05 ` Geert Uytterhoeven
0 siblings, 1 reply; 3+ messages in thread
From: David Howells @ 2012-10-04 19:51 UTC (permalink / raw)
To: geert; +Cc: dhowells, linux-m68k, linux-kernel
Can you merge the following branch into the m68k 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-m68k
for you to fetch changes up to b039235da939b28c539b3e1b4566107a9bdbdef8:
UAPI: (Scripted) Disintegrate arch/m68k/include/asm (2012-10-04 18:20:56 +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/m68k/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/m68k/include/asm/Kbuild | 2 -
arch/m68k/include/asm/ptrace.h | 72 +-
arch/m68k/include/asm/setup.h | 82 +--
arch/m68k/include/asm/signal.h | 118 +---
arch/m68k/include/asm/termios.h | 44 +-
arch/m68k/include/asm/unistd.h | 354 +---------
arch/m68k/include/uapi/asm/Kbuild | 23 +
arch/m68k/include/{ => uapi}/asm/a.out.h | 0
arch/m68k/include/{ => uapi}/asm/auxvec.h | 0
arch/m68k/include/{ => uapi}/asm/byteorder.h | 0
arch/m68k/include/{ => uapi}/asm/cachectl.h | 0
arch/m68k/include/{ => uapi}/asm/fcntl.h | 0
arch/m68k/include/{ => uapi}/asm/ioctls.h | 0
arch/m68k/include/{ => uapi}/asm/msgbuf.h | 0
arch/m68k/include/{ => uapi}/asm/param.h | 0
arch/m68k/include/{ => uapi}/asm/poll.h | 0
arch/m68k/include/{ => uapi}/asm/posix_types.h | 0
arch/m68k/include/uapi/asm/ptrace.h | 79 +++
arch/m68k/include/{ => uapi}/asm/sembuf.h | 0
arch/m68k/include/uapi/asm/setup.h | 103 +++
arch/m68k/include/{ => uapi}/asm/shmbuf.h | 0
arch/m68k/include/{ => uapi}/asm/sigcontext.h | 0
arch/m68k/include/uapi/asm/signal.h | 118 ++++
arch/m68k/include/{ => uapi}/asm/socket.h | 0
arch/m68k/include/{ => uapi}/asm/sockios.h | 0
arch/m68k/include/{ => uapi}/asm/stat.h | 0
arch/m68k/include/{ => uapi}/asm/swab.h | 0
arch/m68k/include/{ => uapi}/asm/termbits.h | 0
arch/m68k/include/uapi/asm/termios.h | 44 ++
arch/m68k/include/uapi/asm/unistd.h | 356 ++++++++++
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 +-
93 files changed, 2521 insertions(+), 2460 deletions(-)
delete mode 100644 arch/c6x/include/asm/signal.h
rename arch/m68k/include/{ => uapi}/asm/a.out.h (100%)
rename arch/m68k/include/{ => uapi}/asm/auxvec.h (100%)
rename arch/m68k/include/{ => uapi}/asm/byteorder.h (100%)
rename arch/m68k/include/{ => uapi}/asm/cachectl.h (100%)
rename arch/m68k/include/{ => uapi}/asm/fcntl.h (100%)
rename arch/m68k/include/{ => uapi}/asm/ioctls.h (100%)
rename arch/m68k/include/{ => uapi}/asm/msgbuf.h (100%)
rename arch/m68k/include/{ => uapi}/asm/param.h (100%)
rename arch/m68k/include/{ => uapi}/asm/poll.h (100%)
rename arch/m68k/include/{ => uapi}/asm/posix_types.h (100%)
create mode 100644 arch/m68k/include/uapi/asm/ptrace.h
rename arch/m68k/include/{ => uapi}/asm/sembuf.h (100%)
create mode 100644 arch/m68k/include/uapi/asm/setup.h
rename arch/m68k/include/{ => uapi}/asm/shmbuf.h (100%)
rename arch/m68k/include/{ => uapi}/asm/sigcontext.h (100%)
create mode 100644 arch/m68k/include/uapi/asm/signal.h
rename arch/m68k/include/{ => uapi}/asm/socket.h (100%)
rename arch/m68k/include/{ => uapi}/asm/sockios.h (100%)
rename arch/m68k/include/{ => uapi}/asm/stat.h (100%)
rename arch/m68k/include/{ => uapi}/asm/swab.h (100%)
rename arch/m68k/include/{ => uapi}/asm/termbits.h (100%)
create mode 100644 arch/m68k/include/uapi/asm/termios.h
create mode 100644 arch/m68k/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
.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [GIT PULL] Disintegrate UAPI for m68k
2012-10-04 19:51 [GIT PULL] Disintegrate UAPI for m68k David Howells
@ 2012-10-05 5:05 ` Geert Uytterhoeven
2012-10-05 12:50 ` David Howells
0 siblings, 1 reply; 3+ messages in thread
From: Geert Uytterhoeven @ 2012-10-05 5:05 UTC (permalink / raw)
To: David Howells; +Cc: linux-m68k, linux-kernel, Linux-Arch
On Thu, Oct 4, 2012 at 9:51 PM, David Howells <dhowells@redhat.com> wrote:
> git://git.infradead.org/users/dhowells/linux-headers.git disintegrate-m68k
>
> for you to fetch changes up to b039235da939b28c539b3e1b4566107a9bdbdef8:
>
> UAPI: (Scripted) Disintegrate arch/m68k/include/asm (2012-10-04 18:20:56 +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/m68k/include/asm
>
> Mark Salter (2):
> c6x: make dsk6455 the default config
> c6x: remove c6x signal.h
I assume these c6x and asm-generic changes are the ones you just asked Linus
to pull? Doesn't it make more sense to ask us (the individual arch maintainers)
to pull our parts after Linus has pulled the generic part?
Do you want this ("our parts") to go in 3.7 or 3.8?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [GIT PULL] Disintegrate UAPI for m68k
2012-10-05 5:05 ` Geert Uytterhoeven
@ 2012-10-05 12:50 ` David Howells
0 siblings, 0 replies; 3+ messages in thread
From: David Howells @ 2012-10-05 12:50 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: dhowells, linux-m68k, linux-kernel, Linux-Arch
Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> I assume these c6x and asm-generic changes are the ones you just asked Linus
> to pull?
Yes.
> Doesn't it make more sense to ask us (the individual arch maintainers) to
> pull our parts after Linus has pulled the generic part?
I suppose so.
> Do you want this ("our parts") to go in 3.7 or 3.8?
3.7 would be nice, but I know not everyone is willing to pull in this merge
window. It might also make sense to wait for (a) Linus to pull those and (b)
Arnd to pass the asm-generic changes along too.
The main reason I'd like to get things moved along asap is that the
preparatory patches get things into a known state upon which these commits can
be pulled. However, the state is going to degrade over time as people make
changes which requires more preparatory patches:-/
David
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-10-05 12:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-04 19:51 [GIT PULL] Disintegrate UAPI for m68k David Howells
2012-10-05 5:05 ` Geert Uytterhoeven
2012-10-05 12:50 ` David Howells
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox