Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] dcss: fix build bug.
[S390] Fix linker script.

+4 -3
+1 -1
arch/s390/kernel/vmlinux.lds.S
··· 55 55 __start___ex_table = .; 56 56 *(__ex_table) 57 57 __stop___ex_table = .; 58 - } 58 + } :data 59 59 60 60 .data : { /* Data */ 61 61 DATA_DATA
+3 -2
drivers/s390/block/dcssblk.c
··· 384 384 * get minor, add to list 385 385 */ 386 386 down_write(&dcssblk_devices_sem); 387 - if (dcssblk_get_segment_by_name(local_buf)) { 387 + if (dcssblk_get_device_by_name(local_buf)) { 388 + up_write(&dcssblk_devices_sem); 388 389 rc = -EEXIST; 389 - goto release_gd; 390 + goto unload_seg; 390 391 } 391 392 rc = dcssblk_assign_free_minor(dev_info); 392 393 if (rc) {