2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 13:43:55 +08:00
linux-next/arch
Linus Torvalds b3d6524ff7 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 updates from Martin Schwidefsky:

 - The remaining patches for the z13 machine support: kernel build
   option for z13, the cache synonym avoidance, SMT support,
   compare-and-delay for spinloops and the CES5S crypto adapater.

 - The ftrace support for function tracing with the gcc hotpatch option.
   This touches common code Makefiles, Steven is ok with the changes.

 - The hypfs file system gets an extension to access diagnose 0x0c data
   in user space for performance analysis for Linux running under z/VM.

 - The iucv hvc console gets wildcard spport for the user id filtering.

 - The cacheinfo code is converted to use the generic infrastructure.

 - Cleanup and bug fixes.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (42 commits)
  s390/process: free vx save area when releasing tasks
  s390/hypfs: Eliminate hypfs interval
  s390/hypfs: Add diagnose 0c support
  s390/cacheinfo: don't use smp_processor_id() in preemptible context
  s390/zcrypt: fixed domain scanning problem (again)
  s390/smp: increase maximum value of NR_CPUS to 512
  s390/jump label: use different nop instruction
  s390/jump label: add sanity checks
  s390/mm: correct missing space when reporting user process faults
  s390/dasd: cleanup profiling
  s390/dasd: add locking for global_profile access
  s390/ftrace: hotpatch support for function tracing
  ftrace: let notrace function attribute disable hotpatching if necessary
  ftrace: allow architectures to specify ftrace compile options
  s390: reintroduce diag 44 calls for cpu_relax()
  s390/zcrypt: Add support for new crypto express (CEX5S) adapter.
  s390/zcrypt: Number of supported ap domains is not retrievable.
  s390/spinlock: add compare-and-delay to lock wait loops
  s390/tape: remove redundant if statement
  s390/hvc_iucv: add simple wildcard matches to the iucv allow filter
  ...
2015-02-11 17:42:32 -08:00
..
alpha alpha: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:31 -08:00
arc arc: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:31 -08:00
arm MMC core: 2015-02-11 10:56:48 -08:00
arm64 Merge branch 'akpm' (patches from Andrew) 2015-02-10 16:45:56 -08:00
avr32 avr32: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:31 -08:00
blackfin Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2015-02-10 18:57:15 -08:00
c6x c6x: drop pte_file() 2015-02-10 14:30:32 -08:00
cris cris: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:32 -08:00
frv Merge branch 'akpm' (patches from Andrew) 2015-02-10 16:45:56 -08:00
hexagon hexagon: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:32 -08:00
ia64 Merge branch 'akpm' (patches from Andrew) 2015-02-10 16:45:56 -08:00
m32r m32r: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:32 -08:00
m68k Merge branch 'akpm' (patches from Andrew) 2015-02-10 16:45:56 -08:00
metag metag: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:32 -08:00
microblaze Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2015-02-10 20:01:30 -08:00
mips Merge branch 'akpm' (patches from Andrew) 2015-02-10 16:45:56 -08:00
mn10300 Merge branch 'akpm' (patches from Andrew) 2015-02-10 16:45:56 -08:00
nios2 nios2: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:32 -08:00
openrisc openrisc: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:33 -08:00
parisc parisc: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:33 -08:00
powerpc PCI changes for the v3.20 merge window: 2015-02-10 14:31:28 -08:00
s390 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 2015-02-11 17:42:32 -08:00
score score: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:33 -08:00
sh sh: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:33 -08:00
sparc sparc: drop pte_file()-related helpers 2015-02-10 14:30:33 -08:00
tile Merge branch 'akpm' (patches from Andrew) 2015-02-10 16:45:56 -08:00
um um: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:33 -08:00
unicore32 unicore32: drop pte_file()-related helpers 2015-02-10 14:30:33 -08:00
x86 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2015-02-10 18:57:15 -08:00
xtensa xtensa: drop _PAGE_FILE and pte_file()-related helpers 2015-02-10 14:30:33 -08:00
.gitignore
Kconfig