kernel.git/arch/s390/include/asm/chpid.h, branch linux-3.7.yHosts the 0x221E linux distro kernel.
https://git.0xinfinity.dev/distro/kernel.git/atom?h=linux-3.7.y2012-10-09T12:18:10ZMerge tag 'disintegrate-s390-20121009' of2012-10-09T12:18:10ZMartin Schwidefsky2012-10-09T12:18:10Zurn:sha1:ab08ff34b44f752b664ebb312d2e110cf37a7f5e
git://git.infradead.org/users/dhowells/linux-headers
Pull UAPI patchset from David Howells:
"Can you merge the following branch into the s390 tree please.
This is to complete part of the UAPI disintegration for which the
preparatory patches were pulled recently."
Conflicts:
arch/s390/include/asm/chpid.h
s390/chsc: make headers usable2012-10-09T12:17:00ZSebastian Ott2012-10-05T08:43:31Zurn:sha1:4dcc2a4d6c37c36155ea6d6305f15e599531b862
Make sure that exported headers are save to be included by userspace
exploiting /dev/chsc.
Reported-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
UAPI: (Scripted) Disintegrate arch/s390/include/asm2012-10-09T08:47:31ZDavid Howells2012-10-09T08:47:31Zurn:sha1:9807f75955ea7f1877981056755284481873115c
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Dave Jones <davej@redhat.com>
s390/comments: unify copyright messages and remove file names2012-07-20T09:15:04ZHeiko Carstens2012-07-20T09:15:04Zurn:sha1:a53c8fab3f87c995c30ac226a03af95361243144
Remove the file name from the comment at top of many files. In most
cases the file name was wrong anyway, so it's rather pointless.
Also unify the IBM copyright statement. We did have a lot of sightly
different statements and wanted to change them one after another
whenever a file gets touched. However that never happened. Instead
people start to take the old/"wrong" statements to use as a template
for new files.
So unify all of them in one go.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
UAPI: Alter the S390 asm include guards to be recognisable by the UAPI splitter2011-12-13T09:26:45ZDavid Howells2011-12-13T09:26:45Zurn:sha1:87d2f5e39835b990d3c78d25144dc05b068f697e
Alter some of the S390 asm include guards to fit a pattern that the UAPI
splitter recognises.
Signed-off-by: David Howells <dhowells@redhat.com>
[S390] types: add/fix types.h include in header files2009-01-09T11:15:06ZHeiko Carstens2009-01-09T11:14:52Zurn:sha1:0680ba0133ffeac4bd3689668b05ea2d16f14ae0
/include/asm/chpid.h:12: include of <linux/types.h> is preferred over <asm/types.h>
/include/asm/chsc.h:15: found __[us]{8,16,32,64} type without #include <linux/types.h>
/include/asm/cmb.h:28: found __[us]{8,16,32,64} type without #include <linux/types.h>
/include/asm/dasd.h:195: found __[us]{8,16,32,64} type without #include <linux/types.h>
/include/asm/kvm.h:16: include of <linux/types.h> is preferred over <asm/types.h>
/include/asm/kvm.h:30: found __[us]{8,16,32,64} type without #include <linux/types.h>
/include/asm/qeth.h:24: found __[us]{8,16,32,64} type without #include <linux/types.h>
/include/asm/schid.h:5: found __[us]{8,16,32,64} type without #include <linux/types.h>
/include/asm/swab.h:12: include of <linux/types.h> is preferred over <asm/types.h>
/include/asm/swab.h:19: found __[us]{8,16,32,64} type without #include <linux/types.h>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
[S390] move include/asm-s390 to arch/s390/include/asm2008-08-01T18:42:05ZMartin Schwidefsky2008-08-01T18:42:05Zurn:sha1:c6557e7f2b6ae76a44653d38f835174074c42e05
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>