From: Andrew Morton Fix git-rejects between git-scsi-misc and git-block. Note that local variable bulkdata goes away - this is more than a simple reject fixup. Cc: Jens Axboe Cc: Matthew Wilcox Signed-off-by: Andrew Morton --- drivers/scsi/megaraid.c | 14 -------------- 1 file changed, 14 deletions(-) diff -puN drivers/scsi/megaraid.c~git-block-fixup-fix drivers/scsi/megaraid.c --- a/drivers/scsi/megaraid.c~git-block-fixup-fix +++ a/drivers/scsi/megaraid.c @@ -1737,12 +1737,9 @@ mega_build_sglist(adapter_t *adapter, sc Scsi_Cmnd *cmd; int sgcnt; int idx; - int bulkdata; cmd = scb->cmd; - bulkdata = (scsi_sg_count(cmd) == 1) ? 1 : 0; - /* * Copy Scatter-Gather list info into controller structure. * @@ -1756,7 +1753,6 @@ mega_build_sglist(adapter_t *adapter, sc *len = 0; -<<<<<<< HEAD/drivers/scsi/megaraid.c if (scsi_sg_count(cmd) == 1 && !adapter->has_64bit_addr) { sg = scsi_sglist(cmd); scb->dma_h_bulkdata = sg_dma_address(sg); @@ -1765,16 +1761,6 @@ mega_build_sglist(adapter_t *adapter, sc return 0; } -======= - if (bulkdata && !adapter->has_64bit_addr) { - sg = scsi_sglist(cmd); - scb->dma_h_bulkdata = sg_dma_address(sg); - *buf = (u32)scb->dma_h_bulkdata; - *len = sg_dma_len(sg); - return 0; - } - ->>>>>>> /drivers/scsi/megaraid.c scsi_for_each_sg(cmd, sg, sgcnt, idx) { if (adapter->has_64bit_addr) { scb->sgl64[idx].address = sg_dma_address(sg); _