Linus Torvalds 6c09931b3f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux ... Pull s390 updates from Martin Schwidefsky: "The main new feature is machine support for System zEC12 including transactional memory, runtime instrumentation, support for scm block devices via eadm subchannels, and support for CEX4 crypto cards. In addition there are some nice improvements: bpf jit compiler, arch backend for cmpxchg_double, relative exception table entries, dasd partition detection independent from the dasd driver ioctls, and cpu cache information in /proc/cpuinfo and /sys/device/cpu. And last but not least a series of cleanup patches from Heiko." Fix up trivial add-add conflict in arch/s390/Kconfig due to commit b952741c80 ("cputime: Generalize CONFIG_VIRT_CPU_ACCOUNTING") * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (76 commits) s390: update defconfig s390/jump label,nss: let shared kernel support depend on !JUMP_LABEL s390/disassembler: fix decoding of risblg instruction s390/bpf,jit: add support for BPF_S_ANC_ALU_XOR_X instruction s390/traps: move call to print_modules() out of show_regs() s390/mm: mark free_initrd_mem() as __init s390/dasd: check count address during online setting drivers/s390/char/monreader.c: fix error return code s390/cmpxchg,percpu: implement cmpxchg_double() s390/percpu: implement this_cpu_add_return() s390/percpu: implement this_cpu_xchg() s390/kexec: remove CONFIG_KEXEC s390/irq: use designated initializers for irq class array s390: add uninitialized_var() to suppress false positive compiler warnings s390/crashdump: move fill_cpu_elf_notes() prototype to header file s390/process: add missing header include s390/ptrace: add missing ifdef s390/ipl,decrompressor: disable branch profiling s390/perf_events: compile only for CONFIG_64BIT s390/tape: remove even more tape block leftovers ...		2012-10-01 11:49:56 -07:00
..
airq.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
appldata.h	s390/appldata: change return value of appldata_asm	2012-09-26 15:45:15 +02:00
asm-offsets.h
atomic.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
auxvec.h
barrier.h
bitops.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
bitsperlong.h
bug.h
bugs.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
byteorder.h
cache.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
cacheflush.h
ccwdev.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
ccwgroup.h	s390/ccwgroup: remove unused ccwgroup_device member	2012-06-05 13:23:37 +02:00
checksum.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
chpid.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
chsc.h	s390: add eadm facility bits	2012-09-26 15:44:57 +02:00
cio.h	s390: add eadm related structures	2012-09-26 15:44:57 +02:00
cmb.h
cmpxchg.h	s390/cmpxchg,percpu: implement cmpxchg_double()	2012-09-26 15:45:25 +02:00
compat.h
cpcmd.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
cpu_mf.h	s390: add support for runtime instrumentation	2012-09-26 15:45:02 +02:00
cpu.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
cputime.h	vtime: Consolidate system/idle context detection	2012-09-25 15:42:37 +02:00
crw.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
css_chars.h	s390: add eadm facility bits	2012-09-26 15:44:57 +02:00
ctl_reg.h
current.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
dasd.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
debug.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
delay.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
device.h
diag.h
div64.h
dma.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
eadm.h	s390/scm: remove superfluous lock	2012-09-26 15:45:09 +02:00
ebcdic.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
elf.h	s390/crashdump: move fill_cpu_elf_notes() prototype to header file	2012-09-26 15:45:22 +02:00
emergency-restart.h
errno.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
etr.h	s390/etr,stp: use -EOPNOTSUPP instead of -ENOSYS	2012-09-26 15:45:14 +02:00
exec.h
extmem.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
facility.h
fb.h
fcntl.h
fcx.h
ftrace.h
futex.h
hardirq.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
hugetlb.h	s390/hugetlb: use direct TLB flushing for hugetlbfs pages	2012-09-06 10:40:37 +02:00
idals.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
io.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
ioctl.h
ioctls.h
ipcbuf.h
ipl.h
irq_regs.h
irq.h	s390: add support for runtime instrumentation	2012-09-26 15:45:02 +02:00
irqflags.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
isc.h	s390/cio: add eadm subchannel driver	2012-09-26 15:45:00 +02:00
itcw.h
jump_label.h
Kbuild
kdebug.h
kexec.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
kmap_types.h
kprobes.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
kvm_host.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
kvm_para.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
kvm_virtio.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
kvm.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
linkage.h
local64.h
local.h
lowcore.h	s390: add support for transactional memory	2012-09-26 15:45:02 +02:00
mathemu.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
mman.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
mmu_context.h	s390/mm: rename addressing_mode to s390_user_mode	2012-09-26 15:45:05 +02:00
mmu.h
module.h
monwriter.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
msgbuf.h
mutex.h
nmi.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
os_info.h
page.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
param.h
pci.h
percpu.h	s390/cmpxchg,percpu: implement cmpxchg_double()	2012-09-26 15:45:25 +02:00
perf_event.h
pgalloc.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
pgtable.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
poll.h
posix_types.h	s390: Always use "long" for ssize_t to match size_t	2012-08-21 15:23:04 +02:00
processor.h	s390/exceptions: switch to relative exception table entries	2012-09-26 15:45:10 +02:00
ptrace.h	s390: add support for transactional memory	2012-09-26 15:45:02 +02:00
qdio.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
qeth.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
reset.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
resource.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
runtime_instr.h	s390: add support for runtime instrumentation	2012-09-26 15:45:02 +02:00
rwsem.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
scatterlist.h
schid.h
sclp.h	KVM updates for the 3.6 merge window	2012-07-24 12:01:20 -07:00
scsw.h	s390: add eadm related structures	2012-09-26 15:44:57 +02:00
seccomp.h
sections.h
segment.h
sembuf.h
setup.h	s390/mm: rename addressing_mode to s390_user_mode	2012-09-26 15:45:05 +02:00
sfp-machine.h
sfp-util.h
shmbuf.h
shmparam.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
sigcontext.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
siginfo.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
signal.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
sigp.h	KVM: s390: Fix sigp sense handling.	2012-07-03 14:55:37 -03:00
smp.h	s390/smp,topology: add polarization member to pcpu struct	2012-09-26 15:45:09 +02:00
socket.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
sockios.h
sparsemem.h	s390/mm: remove MAX_PHYSADDR_BITS define	2012-08-08 07:32:55 -07:00
spinlock_types.h
spinlock.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
stat.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
statfs.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
string.h	s390/string: provide asm lib functions for memcpy and memcmp	2012-09-26 15:44:50 +02:00
swab.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
switch_to.h	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2012-10-01 11:49:56 -07:00
syscall.h	s390/seccomp: add support for system call filtering using BPF	2012-08-08 07:32:56 -07:00
sysinfo.h	s390/sysinfo,stsi: change return code handling	2012-09-26 15:45:12 +02:00
tape390.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
termbits.h
termios.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
thread_info.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
timex.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
tlb.h
tlbflush.h	s390/mm: fix deadlock in unmap_hugepage_range()	2012-09-03 11:14:06 +02:00
topology.h	s390/smp,topology: add polarization member to pcpu struct	2012-09-26 15:45:09 +02:00
types.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
uaccess.h	s390/exceptions: switch to relative exception table entries	2012-09-26 15:45:10 +02:00
ucontext.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
unaligned.h
unistd.h	s390/syscalls: wire up kcmp system call	2012-09-26 15:45:17 +02:00
user.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
vdso.h
vtimer.h	s390/vtimer: rework virtual timer interface	2012-07-20 11:15:08 +02:00
vtoc.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00
xor.h
zcrypt.h	s390/comments: unify copyright messages and remove file names	2012-07-20 11:15:04 +02:00