Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (22 commits) [S390] Update default configuration. [S390] hibernate: Do real CPU swap at resume time [S390] dasd: tolerate devices that have no feature codes [S390] zcrypt: Do not add/remove devices in s/r callbacks [S390] hibernate: make sure pfn_is_nosave handles lowcore pages [S390] smp: introduce LC_ORDER and simplify lowcore handling [S390] ptrace: use common code for simple peek/poke operations [S390] fix disabled_wait inline assembly clobber list [S390] Change kernel_page_present coding style. [S390] hibernation: reset system after resume [S390] hibernation: fix guest page hinting related crash [S390] Get rid of init_module/delete_module compat functions. [S390] Convert sys_execve to function with parameters. [S390] Convert sys_clone to function with parameters. [S390] qdio: change state of all primed input buffers [S390] qdio: reduce per device debug messages [S390] cio: introduce consistent subchannel scanning [S390] cio: idset use actual number of ssids [S390] cio: dont kfree vmalloced memory [S390] cio: introduce css_settle ...
Showing
- arch/s390/defconfig 25 additions, 12 deletionsarch/s390/defconfig
- arch/s390/include/asm/lowcore.h 9 additions, 0 deletionsarch/s390/include/asm/lowcore.h
- arch/s390/include/asm/processor.h 1 addition, 1 deletionarch/s390/include/asm/processor.h
- arch/s390/kernel/asm-offsets.c 6 additions, 1 deletionarch/s390/kernel/asm-offsets.c
- arch/s390/kernel/compat_linux.c 14 additions, 69 deletionsarch/s390/kernel/compat_linux.c
- arch/s390/kernel/compat_linux.h 2 additions, 2 deletionsarch/s390/kernel/compat_linux.h
- arch/s390/kernel/compat_wrapper.S 21 additions, 6 deletionsarch/s390/kernel/compat_wrapper.S
- arch/s390/kernel/entry.h 4 additions, 2 deletionsarch/s390/kernel/entry.h
- arch/s390/kernel/process.c 15 additions, 25 deletionsarch/s390/kernel/process.c
- arch/s390/kernel/ptrace.c 4 additions, 15 deletionsarch/s390/kernel/ptrace.c
- arch/s390/kernel/sclp.S 1 addition, 4 deletionsarch/s390/kernel/sclp.S
- arch/s390/kernel/smp.c 4 additions, 46 deletionsarch/s390/kernel/smp.c
- arch/s390/kernel/suspend.c 7 additions, 17 deletionsarch/s390/kernel/suspend.c
- arch/s390/kernel/swsusp_asm64.S 91 additions, 11 deletionsarch/s390/kernel/swsusp_asm64.S
- arch/s390/kernel/syscalls.S 4 additions, 4 deletionsarch/s390/kernel/syscalls.S
- arch/s390/mm/page-states.c 44 additions, 8 deletionsarch/s390/mm/page-states.c
- arch/s390/mm/pgtable.c 7 additions, 10 deletionsarch/s390/mm/pgtable.c
- drivers/s390/block/dasd_eckd.c 6 additions, 7 deletionsdrivers/s390/block/dasd_eckd.c
- drivers/s390/cio/css.c 128 additions, 124 deletionsdrivers/s390/cio/css.c
- drivers/s390/cio/css.h 3 additions, 0 deletionsdrivers/s390/cio/css.h
Loading
Please register or sign in to comment