linux_dsm_epyc7002/arch
Ingo Molnar f407a82586 Merge branch 'linus' into sched/core, to resolve conflict
Conflicts:
	arch/sparc/include/asm/topology_64.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2015-06-02 08:05:42 +02:00
..
alpha Merge branch 'linus' into sched/core, to resolve conflict 2015-06-02 08:05:42 +02:00
arc sched/preempt, futex: Update comments to clarify that preemption doesn't have to be disabled 2015-05-19 08:39:17 +02:00
arm Merge branch 'linus' into sched/core, to resolve conflict 2015-06-02 08:05:42 +02:00
arm64 sched/topology: Rename topology_thread_cpumask() to topology_sibling_cpumask() 2015-05-27 15:22:15 +02:00
avr32 mm/fault, arch: Use pagefault_disable() to check for disabled pagefaults in the handler 2015-05-19 08:39:15 +02:00
blackfin blackfin updates for Linux 4.1 2015-04-24 07:58:07 -07:00
c6x C6X Fixes for v4.1 2015-04-16 18:48:55 -04:00
cris mm/fault, arch: Use pagefault_disable() to check for disabled pagefaults in the handler 2015-05-19 08:39:15 +02:00
frv mm/fault, arch: Use pagefault_disable() to check for disabled pagefaults in the handler 2015-05-19 08:39:15 +02:00
hexagon mm/uaccess, mm/fault: Clarify that uaccess may only sleep if pagefaults are enabled 2015-05-19 08:39:14 +02:00
ia64 Merge branch 'linus' into sched/core, to resolve conflict 2015-06-02 08:05:42 +02:00
m32r mm/fault, arch: Use pagefault_disable() to check for disabled pagefaults in the handler 2015-05-19 08:39:15 +02:00
m68k mm/fault, arch: Use pagefault_disable() to check for disabled pagefaults in the handler 2015-05-19 08:39:15 +02:00
metag mm/fault, arch: Use pagefault_disable() to check for disabled pagefaults in the handler 2015-05-19 08:39:15 +02:00
microblaze mm/fault, arch: Use pagefault_disable() to check for disabled pagefaults in the handler 2015-05-19 08:39:15 +02:00
mips Merge branch 'linus' into sched/core, to resolve conflict 2015-06-02 08:05:42 +02:00
mn10300 mm/fault, arch: Use pagefault_disable() to check for disabled pagefaults in the handler 2015-05-19 08:39:15 +02:00
nios2 mm/fault, arch: Use pagefault_disable() to check for disabled pagefaults in the handler 2015-05-19 08:39:15 +02:00
openrisc Merge branch 'akpm' (patches from Andrew) 2015-04-15 16:39:15 -07:00
parisc mm/fault, arch: Use pagefault_disable() to check for disabled pagefaults in the handler 2015-05-19 08:39:15 +02:00
powerpc Merge branch 'linus' into sched/core, to resolve conflict 2015-06-02 08:05:42 +02:00
s390 Merge branch 'linus' into sched/core, to resolve conflict 2015-06-02 08:05:42 +02:00
score mm/fault, arch: Use pagefault_disable() to check for disabled pagefaults in the handler 2015-05-19 08:39:15 +02:00
sh mm/fault, arch: Use pagefault_disable() to check for disabled pagefaults in the handler 2015-05-19 08:39:15 +02:00
sparc Merge branch 'linus' into sched/core, to resolve conflict 2015-06-02 08:05:42 +02:00
tile sched/topology: Rename topology_thread_cpumask() to topology_sibling_cpumask() 2015-05-27 15:22:15 +02:00
um mm/fault, um: Fix compile error 2015-05-19 15:42:25 +02:00
unicore32 mm/fault, arch: Use pagefault_disable() to check for disabled pagefaults in the handler 2015-05-19 08:39:15 +02:00
x86 Merge branch 'linus' into sched/core, to resolve conflict 2015-06-02 08:05:42 +02:00
xtensa Merge branch 'linus' into sched/core, to resolve conflict 2015-06-02 08:05:42 +02:00
.gitignore
Kconfig powerpc updates for 4.1 2015-04-16 13:53:32 -05:00