tjh.dev / kernel
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 master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SCSI]: Fix scsi_send_eh_cmnd scatterlist handling
[SPARC]: Add unsigned to unused bit field in a.out.h

Linus Torvalds 59117d3f 856fc004

+3 -3
+1 -1
drivers/scsi/scsi_error.c
··· 716 716 */ 717 717 if (copy_sense) { 718 718 if (!SCSI_SENSE_VALID(scmd)) { 719 - memcpy(scmd->sense_buffer, scmd->request_buffer, 719 + memcpy(scmd->sense_buffer, page_address(sgl.page), 720 720 sizeof(scmd->sense_buffer)); 721 721 } 722 722 __free_page(sgl.page);
+1 -1
include/asm-sparc/a.out.h
··· 80 80 unsigned long r_address; /* relocation addr */ 81 81 unsigned int r_index:24; /* segment index or symbol index */ 82 82 unsigned int r_extern:1; /* if F, r_index==SEG#; if T, SYM idx */ 83 - int r_pad:2; /* <unused> */ 83 + unsigned int r_pad:2; /* <unused> */ 84 84 enum reloc_type r_type:5; /* type of relocation to perform */ 85 85 long r_addend; /* addend for relocation value */ 86 86 };
+1 -1
include/asm-sparc64/a.out.h
··· 86 86 unsigned int r_address; /* relocation addr */ 87 87 unsigned int r_index:24; /* segment index or symbol index */ 88 88 unsigned int r_extern:1; /* if F, r_index==SEG#; if T, SYM idx */ 89 - int r_pad:2; /* <unused> */ 89 + unsigned int r_pad:2; /* <unused> */ 90 90 enum reloc_type r_type:5; /* type of relocation to perform */ 91 91 int r_addend; /* addend for relocation value */ 92 92 };