WSL2-Linux-Kernel/arch/s390
Linus Torvalds b32fc0a062 Merge branch 'upstream/jump-label-noearly' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
* 'upstream/jump-label-noearly' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
  jump-label: initialize jump-label subsystem much earlier
  x86/jump_label: add arch_jump_label_transform_static()
  s390/jump-label: add arch_jump_label_transform_static()
  jump_label: add arch_jump_label_transform_static() to optimise non-live code updates
  sparc/jump_label: drop arch_jump_label_text_poke_early()
  x86/jump_label: drop arch_jump_label_text_poke_early()
  jump_label: if a key has already been initialized, don't nop it out
  stop_machine: make stop_machine safe and efficient to call early
  jump_label: use proper atomic_t initializer

Conflicts:
 - arch/x86/kernel/jump_label.c
	Added __init_or_module to arch_jump_label_text_poke_early vs
	removal of that function entirely
 - kernel/stop_machine.c
	same patch ("stop_machine: make stop_machine safe and efficient
	to call early") merged twice, with whitespace fix in one version
2011-11-06 20:20:46 -08:00
..
appldata [S390] mm: add ZONE_DMA to 31-bit config again 2011-05-26 09:48:25 +02:00
boot [S390] sparse: fix sparse static warnings 2011-10-30 15:16:46 +01:00
crypto s390: add missing module.h/export.h includes 2011-10-31 19:30:58 -04:00
hypfs filesystems: add set_nlink() 2011-11-02 12:53:43 +01:00
include/asm Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 2011-10-31 16:14:20 -07:00
kernel Merge branch 'upstream/jump-label-noearly' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen 2011-11-06 20:20:46 -08:00
kvm Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 2011-10-31 16:14:20 -07:00
lib [S390] sparse: fix sparse warnings with __user pointers 2011-10-30 15:16:46 +01:00
math-emu s390: change to new flag variable 2011-03-17 14:02:57 +01:00
mm Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
oprofile [S390] sparse: fix sparse ANSI-C warnings 2011-10-30 15:16:46 +01:00
Kbuild [S390] standardize Kbuild rules 2010-10-25 16:10:14 +02:00
Kconfig [S390] kdump backend code 2011-10-30 15:16:42 +01:00
Kconfig.debug [S390] Write protect module text and RO data 2011-03-15 17:08:23 +01:00
Makefile [S390] remove redundant stack check option 2011-03-15 17:08:22 +01:00
defconfig [S390] defconfig: switch on CONFIG_DEVTMPFS 2011-10-30 15:16:42 +01:00