25 files changed, 136 insertions, 112 deletions

diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
index 6055e1427ba..055bf5d2889 100644
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
@@ -101,6 +101,8 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
                         break;
 
                 case R_ARM_PC24:
+                case R_ARM_CALL:
+                case R_ARM_JUMP24:
                         offset = (*(u32 *)loc & 0x00ffffff) << 2;
                         if (offset & 0x02000000)
                                 offset -= 0x04000000;
diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c
index f74b9af112d..852ea72d8c8 100644
--- a/arch/arm/mach-pxa/pm.c
+++ b/arch/arm/mach-pxa/pm.c
@@ -155,19 +155,20 @@ int pxa_pm_enter(suspend_state_t state)
         PSPR = 0;
 
         /* restore registers */
+        RESTORE_GPLEVEL(0); RESTORE_GPLEVEL(1); RESTORE_GPLEVEL(2);
+        RESTORE(GPDR0); RESTORE(GPDR1); RESTORE(GPDR2);
         RESTORE(GAFR0_L); RESTORE(GAFR0_U);
         RESTORE(GAFR1_L); RESTORE(GAFR1_U);
         RESTORE(GAFR2_L); RESTORE(GAFR2_U);
-        RESTORE_GPLEVEL(0); RESTORE_GPLEVEL(1); RESTORE_GPLEVEL(2);
-        RESTORE(GPDR0); RESTORE(GPDR1); RESTORE(GPDR2);
         RESTORE(GRER0); RESTORE(GRER1); RESTORE(GRER2);
         RESTORE(GFER0); RESTORE(GFER1); RESTORE(GFER2);
         RESTORE(PGSR0); RESTORE(PGSR1); RESTORE(PGSR2);
 
 #ifdef CONFIG_PXA27x
         RESTORE(MDREFR);
-        RESTORE(GAFR3_L); RESTORE(GAFR3_U); RESTORE_GPLEVEL(3);
-        RESTORE(GPDR3); RESTORE(GRER3); RESTORE(GFER3); RESTORE(PGSR3);
+        RESTORE_GPLEVEL(3); RESTORE(GPDR3);
+        RESTORE(GAFR3_L); RESTORE(GAFR3_U);
+        RESTORE(GRER3); RESTORE(GFER3); RESTORE(PGSR3);
         RESTORE(PWER); RESTORE(PCFR); RESTORE(PRER);
         RESTORE(PFER); RESTORE(PKWR);
 #endif
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index a4da715a360..e9904c74d2b 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -721,11 +721,13 @@ flush_thread (void)
         /* drop floating-point and debug-register state if it exists: */
         current->thread.flags &= ~(IA64_THREAD_FPH_VALID | IA64_THREAD_DBG_VALID);
         ia64_drop_fpu(current);
+#ifdef CONFIG_IA32_SUPPORT
         if (IS_IA32_PROCESS(ia64_task_regs(current))) {
                 ia32_drop_partial_page_list(current);
                 current->thread.task_size = IA32_PAGE_OFFSET;
                 set_fs(USER_DS);
         }
+#endif
 }
 
 /*
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 4acc7fd4cd0..4f41ec3e433 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -42,7 +42,7 @@ static struct alps_model_info alps_model_data[] = {
         { { 0x53, 0x02, 0x14 }, 0xf8, 0xf8, 0 },
         { { 0x63, 0x02, 0x0a }, 0xf8, 0xf8, 0 },
         { { 0x63, 0x02, 0x14 }, 0xf8, 0xf8, 0 },
-        { { 0x63, 0x02, 0x28 }, 0xf8, 0xf8, 0 },
+        { { 0x63, 0x02, 0x28 }, 0xf8, 0xf8, ALPS_FW_BK_2 },             /* Fujitsu Siemens S6010 */
         { { 0x63, 0x02, 0x3c }, 0x8f, 0x8f, ALPS_WHEEL },               /* Toshiba Satellite S2400-103 */
         { { 0x63, 0x02, 0x50 }, 0xef, 0xef, ALPS_FW_BK_1 },             /* NEC Versa L320 */
         { { 0x63, 0x02, 0x64 }, 0xf8, 0xf8, 0 },
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index b586a83a9b4..eb41391e06e 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -679,7 +679,15 @@ static void mmc_idle_cards(struct mmc_host *host)
 }
 
 /*
- * Apply power to the MMC stack.
+ * Apply power to the MMC stack.  This is a two-stage process.
+ * First, we enable power to the card without the clock running.
+ * We then wait a bit for the power to stabilise.  Finally,
+ * enable the bus drivers and clock to the card.
+ *
+ * We must _NOT_ enable the clock prior to power stablising.
+ *
+ * If a host does all the power sequencing itself, ignore the
+ * initial MMC_POWER_UP stage.
  */
 static void mmc_power_up(struct mmc_host *host)
 {
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.h b/drivers/scsi/ibmvscsi/ibmvscsi.h
index 8bec0438dc8..5b0edd1f192 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.h
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.h
@@ -100,7 +100,7 @@ int ibmvscsi_init_crq_queue(struct crq_queue *queue,
 void ibmvscsi_release_crq_queue(struct crq_queue *queue,
                                 struct ibmvscsi_host_data *hostdata,
                                 int max_requests);
-void ibmvscsi_reset_crq_queue(struct crq_queue *queue,
+int ibmvscsi_reset_crq_queue(struct crq_queue *queue,
                               struct ibmvscsi_host_data *hostdata);
 
 void ibmvscsi_handle_crq(struct viosrp_crq *crq,
diff --git a/drivers/scsi/ibmvscsi/iseries_vscsi.c b/drivers/scsi/ibmvscsi/iseries_vscsi.c
index 1045872b017..ce15d9e3962 100644
--- a/drivers/scsi/ibmvscsi/iseries_vscsi.c
+++ b/drivers/scsi/ibmvscsi/iseries_vscsi.c
@@ -117,9 +117,10 @@ void ibmvscsi_release_crq_queue(struct crq_queue *queue,
  *
  * no-op for iSeries
  */
-void ibmvscsi_reset_crq_queue(struct crq_queue *queue,
+int ibmvscsi_reset_crq_queue(struct crq_queue *queue,
                               struct ibmvscsi_host_data *hostdata)
 {
+        return 0;
 }
 
 /**
diff --git a/drivers/scsi/ibmvscsi/rpa_vscsi.c b/drivers/scsi/ibmvscsi/rpa_vscsi.c
index 8bf5652f106..75db2f5c545 100644
--- a/drivers/scsi/ibmvscsi/rpa_vscsi.c
+++ b/drivers/scsi/ibmvscsi/rpa_vscsi.c
@@ -230,6 +230,11 @@ int ibmvscsi_init_crq_queue(struct crq_queue *queue,
         rc = plpar_hcall_norets(H_REG_CRQ,
                                 vdev->unit_address,
                                 queue->msg_token, PAGE_SIZE);
+        if (rc == H_Resource) 
+                /* maybe kexecing and resource is busy. try a reset */
+                rc = ibmvscsi_reset_crq_queue(queue,
+                                              hostdata);
+
         if (rc == 2) {
                 /* Adapter is good, but other end is not ready */
                 printk(KERN_WARNING "ibmvscsi: Partner adapter not ready\n");
@@ -281,7 +286,7 @@ int ibmvscsi_init_crq_queue(struct crq_queue *queue,
  * @hostdata:   ibmvscsi_host_data of host
  *
  */
-void ibmvscsi_reset_crq_queue(struct crq_queue *queue,
+int ibmvscsi_reset_crq_queue(struct crq_queue *queue,
                               struct ibmvscsi_host_data *hostdata)
 {
         int rc;
@@ -309,4 +314,5 @@ void ibmvscsi_reset_crq_queue(struct crq_queue *queue,
                 printk(KERN_WARNING
                        "ibmvscsi: couldn't register crq--rc 0x%x\n", rc);
         }
+        return rc;
 }
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index f9792528e33..578143e93a6 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -664,7 +664,7 @@ mega_build_cmd(adapter_t *adapter, Scsi_Cmnd *cmd, int *busy)
                                         sg->offset;
                         } else
                                 buf = cmd->request_buffer;
-                        memset(cmd->request_buffer, 0, cmd->cmnd[4]);
+                        memset(buf, 0, cmd->cmnd[4]);
                         if (cmd->use_sg) {
                                 struct scatterlist *sg;
 
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 7096945ea23..7b3efd53129 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -2476,17 +2476,9 @@ typedef struct scsi_qla_host {
  */
 #define LOOP_TRANSITION(ha) \
         (test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) || \
-         test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags))
-
-#define LOOP_NOT_READY(ha) \
-        ((test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) || \
-          test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags) || \
-          test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags) || \
-          test_bit(LOOP_RESYNC_ACTIVE, &ha->dpc_flags)) || \
+         test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags) || \
          atomic_read(&ha->loop_state) == LOOP_DOWN)
 
-#define LOOP_RDY(ha)    (!LOOP_NOT_READY(ha))
-
 #define TGT_Q(ha, t) (ha->otgt[t])
 
 #define to_qla_host(x)          ((scsi_qla_host_t *) (x)->hostdata)
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 2d720121a0d..c46d2469b85 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1259,7 +1259,7 @@ qla2x00_configure_hba(scsi_qla_host_t *ha)
         rval = qla2x00_get_adapter_id(ha,
             &loop_id, &al_pa, &area, &domain, &topo);
         if (rval != QLA_SUCCESS) {
-                if (LOOP_NOT_READY(ha) || atomic_read(&ha->loop_down_timer) ||
+                if (LOOP_TRANSITION(ha) || atomic_read(&ha->loop_down_timer) ||
                     (rval == QLA_COMMAND_ERROR && loop_id == 0x7)) {
                         DEBUG2(printk("%s(%ld) Loop is in a transition state\n",
                             __func__, ha->host_no));
@@ -1796,7 +1796,7 @@ qla2x00_configure_loop(scsi_qla_host_t *ha)
         }
 
         if (rval == QLA_SUCCESS && test_bit(RSCN_UPDATE, &flags)) {
-                if (LOOP_NOT_READY(ha)) {
+                if (LOOP_TRANSITION(ha)) {
                         rval = QLA_FUNCTION_FAILED;
                 } else {
                         rval = qla2x00_configure_fabric(ha);
@@ -2369,7 +2369,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *ha, struct list_head *new_fcports)
                 if (qla2x00_is_reserved_id(ha, loop_id))
                         continue;
 
-                if (atomic_read(&ha->loop_down_timer) || LOOP_NOT_READY(ha))
+                if (atomic_read(&ha->loop_down_timer) || LOOP_TRANSITION(ha))
                         break;
 
                 if (swl != NULL) {
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 09afc0f06bd..5181d966fec 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -909,6 +909,21 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt)
                         resid = resid_len;
                         cp->resid = resid;
                         CMD_RESID_LEN(cp) = resid;
+
+                        if (!lscsi_status &&
+                            ((unsigned)(cp->request_bufflen - resid) <
+                             cp->underflow)) {
+                                qla_printk(KERN_INFO, ha,
+                                    "scsi(%ld:%d:%d:%d): Mid-layer underflow "
+                                    "detected (%x of %x bytes)...returning "
+                                    "error status.\n", ha->host_no,
+                                    cp->device->channel, cp->device->id,
+                                    cp->device->lun, resid,
+                                    cp->request_bufflen);
+
+                                cp->result = DID_ERROR << 16;
+                                break;
+                        }
                 }
                 cp->result = DID_OK << 16 | lscsi_status;
 
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 18c5d252301..c0ae9e965f6 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -422,10 +422,15 @@ static int scsi_eh_completed_normally(struct scsi_cmnd *scmd)
  **/
 static void scsi_eh_done(struct scsi_cmnd *scmd)
 {
+        struct completion     *eh_action;
+
         SCSI_LOG_ERROR_RECOVERY(3,
                 printk("%s scmd: %p result: %x\n",
                         __FUNCTION__, scmd, scmd->result));
-        complete(scmd->device->host->eh_action);
+
+        eh_action = scmd->device->host->eh_action;
+        if (eh_action)
+                complete(eh_action);
 }
 
 /**
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index ce9d73a292e..dc249cb970e 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1085,6 +1085,26 @@ static void scsi_generic_done(struct scsi_cmnd *cmd)
         scsi_io_completion(cmd, cmd->result == 0 ? cmd->bufflen : 0, 0);
 }
 
+void scsi_setup_blk_pc_cmnd(struct scsi_cmnd *cmd, int retries)
+{
+        struct request *req = cmd->request;
+
+        BUG_ON(sizeof(req->cmd) > sizeof(cmd->cmnd));
+        memcpy(cmd->cmnd, req->cmd, sizeof(cmd->cmnd));
+        cmd->cmd_len = req->cmd_len;
+        if (!req->data_len)
+                cmd->sc_data_direction = DMA_NONE;
+        else if (rq_data_dir(req) == WRITE)
+                cmd->sc_data_direction = DMA_TO_DEVICE;
+        else
+                cmd->sc_data_direction = DMA_FROM_DEVICE;
+        
+        cmd->transfersize = req->data_len;
+        cmd->allowed = retries;
+        cmd->timeout_per_command = req->timeout;
+}
+EXPORT_SYMBOL_GPL(scsi_setup_blk_pc_cmnd);
+
 static int scsi_prep_fn(struct request_queue *q, struct request *req)
 {
         struct scsi_device *sdev = q->queuedata;
@@ -1220,18 +1240,7 @@ static int scsi_prep_fn(struct request_queue *q, struct request *req)
                                 goto kill;
                         }
                 } else {
-                        memcpy(cmd->cmnd, req->cmd, sizeof(cmd->cmnd));
-                        cmd->cmd_len = req->cmd_len;
-                        if (rq_data_dir(req) == WRITE)
-                                cmd->sc_data_direction = DMA_TO_DEVICE;
-                        else if (req->data_len)
-                                cmd->sc_data_direction = DMA_FROM_DEVICE;
-                        else
-                                cmd->sc_data_direction = DMA_NONE;
-                        
-                        cmd->transfersize = req->data_len;
-                        cmd->allowed = 3;
-                        cmd->timeout_per_command = req->timeout;
+                        scsi_setup_blk_pc_cmnd(cmd, 3);
                         cmd->done = scsi_generic_done;
                 }
         }
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 8613a131771..03fcbab3003 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -245,24 +245,10 @@ static int sd_init_command(struct scsi_cmnd * SCpnt)
          * SG_IO from block layer already setup, just copy cdb basically
          */
         if (blk_pc_request(rq)) {
-                if (sizeof(rq->cmd) > sizeof(SCpnt->cmnd))
-                        return 0;
-
-                memcpy(SCpnt->cmnd, rq->cmd, sizeof(SCpnt->cmnd));
-                SCpnt->cmd_len = rq->cmd_len;
-                if (rq_data_dir(rq) == WRITE)
-                        SCpnt->sc_data_direction = DMA_TO_DEVICE;
-                else if (rq->data_len)
-                        SCpnt->sc_data_direction = DMA_FROM_DEVICE;
-                else
-                        SCpnt->sc_data_direction = DMA_NONE;
-
-                this_count = rq->data_len;
+                scsi_setup_blk_pc_cmnd(SCpnt, SD_PASSTHROUGH_RETRIES);
                 if (rq->timeout)
                         timeout = rq->timeout;
 
-                SCpnt->transfersize = rq->data_len;
-                SCpnt->allowed = SD_PASSTHROUGH_RETRIES;
                 goto queue;
         }
 
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index d68cea753bb..fb4012b5c18 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -320,25 +320,11 @@ static int sr_init_command(struct scsi_cmnd * SCpnt)
          * these are already setup, just copy cdb basically
          */
         if (SCpnt->request->flags & REQ_BLOCK_PC) {
-                struct request *rq = SCpnt->request;
+                scsi_setup_blk_pc_cmnd(SCpnt, MAX_RETRIES);
 
-                if (sizeof(rq->cmd) > sizeof(SCpnt->cmnd))
-                        return 0;
-
-                memcpy(SCpnt->cmnd, rq->cmd, sizeof(SCpnt->cmnd));
-                SCpnt->cmd_len = rq->cmd_len;
-                if (!rq->data_len)
-                        SCpnt->sc_data_direction = DMA_NONE;
-                else if (rq_data_dir(rq) == WRITE)
-                        SCpnt->sc_data_direction = DMA_TO_DEVICE;
-                else
-                        SCpnt->sc_data_direction = DMA_FROM_DEVICE;
-
-                this_count = rq->data_len;
-                if (rq->timeout)
-                        timeout = rq->timeout;
+                if (SCpnt->timeout_per_command)
+                        timeout = SCpnt->timeout_per_command;
 
-                SCpnt->transfersize = rq->data_len;
                 goto queue;
         }
 
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 7ac6ea141ff..dd592f6a252 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -4194,27 +4194,10 @@ static void st_intr(struct scsi_cmnd *SCpnt)
  */
 static int st_init_command(struct scsi_cmnd *SCpnt)
 {
-        struct request *rq;
-
         if (!(SCpnt->request->flags & REQ_BLOCK_PC))
                 return 0;
 
-        rq = SCpnt->request;
-        if (sizeof(rq->cmd) > sizeof(SCpnt->cmnd))
-                return 0;
-
-        memcpy(SCpnt->cmnd, rq->cmd, sizeof(SCpnt->cmnd));
-        SCpnt->cmd_len = rq->cmd_len;
-
-        if (rq_data_dir(rq) == WRITE)
-                SCpnt->sc_data_direction = DMA_TO_DEVICE;
-        else if (rq->data_len)
-                SCpnt->sc_data_direction = DMA_FROM_DEVICE;
-        else
-                SCpnt->sc_data_direction = DMA_NONE;
-
-        SCpnt->timeout_per_command = rq->timeout;
-        SCpnt->transfersize = rq->data_len;
+        scsi_setup_blk_pc_cmnd(SCpnt, 0);
         SCpnt->done = st_intr;
         return 1;
 }
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c
index a7420cad454..1564ca203a3 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c
@@ -1405,7 +1405,6 @@ static void sym_check_goals(struct sym_hcb *np, struct scsi_target *starget,
                 goal->iu = 0;
                 goal->dt = 0;
                 goal->qas = 0;
-                goal->period = 0;
                 goal->offset = 0;
                 return;
         }
@@ -1465,7 +1464,8 @@ static int sym_prepare_nego(struct sym_hcb *np, struct sym_ccb *cp, u_char *msgp
          * Many devices implement PPR in a buggy way, so only use it if we
          * really want to.
          */
-        if (goal->iu || goal->dt || goal->qas || (goal->period < 0xa)) {
+        if (goal->offset &&
+            (goal->iu || goal->dt || goal->qas || (goal->period < 0xa))) {
                 nego = NS_PPR;
         } else if (spi_width(starget) != goal->width) {
                 nego = NS_WIDE;
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index 0a044ad9888..a5e3a0ddbe5 100644
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -32,6 +32,7 @@ void reiserfs_delete_inode(struct inode *inode)
             JOURNAL_PER_BALANCE_CNT * 2 +
             2 * REISERFS_QUOTA_INIT_BLOCKS(inode->i_sb);
         struct reiserfs_transaction_handle th;
+        int err;
 
         truncate_inode_pages(&inode->i_data, 0);
 
@@ -49,15 +50,13 @@ void reiserfs_delete_inode(struct inode *inode)
                 }
                 reiserfs_update_inode_transaction(inode);
 
-                if (reiserfs_delete_object(&th, inode)) {
-                        up(&inode->i_sem);
-                        goto out;
-                }
+                err = reiserfs_delete_object(&th, inode);
 
                 /* Do quota update inside a transaction for journaled quotas. We must do that
                  * after delete_object so that quota updates go into the same transaction as
                  * stat data deletion */
-                DQUOT_FREE_INODE(inode);
+                if (!err) 
+                        DQUOT_FREE_INODE(inode);
 
                 if (journal_end(&th, inode->i_sb, jbegin_count)) {
                         up(&inode->i_sem);
@@ -66,6 +65,12 @@ void reiserfs_delete_inode(struct inode *inode)
 
                 up(&inode->i_sem);
 
+                /* check return value from reiserfs_delete_object after
+                 * ending the transaction
+                 */
+                if (err)
+                    goto out;
+
                 /* all items of file are deleted, so we can remove "save" link */
                 remove_save_link(inode, 0 /* not truncate */ ); /* we can't do anything
                                                                  * about an error here */
@@ -2099,6 +2104,7 @@ int reiserfs_truncate_file(struct inode *p_s_inode, int update_timestamps)
         struct page *page = NULL;
         int error;
         struct buffer_head *bh = NULL;
+        int err2;
 
         reiserfs_write_lock(p_s_inode->i_sb);
 
@@ -2136,14 +2142,18 @@ int reiserfs_truncate_file(struct inode *p_s_inode, int update_timestamps)
                    transaction of truncating gets committed - on reboot the file
                    either appears truncated properly or not truncated at all */
                 add_save_link(&th, p_s_inode, 1);
-        error = reiserfs_do_truncate(&th, p_s_inode, page, update_timestamps);
-        if (error)
-                goto out;
+        err2 = reiserfs_do_truncate(&th, p_s_inode, page, update_timestamps);
         error =
             journal_end(&th, p_s_inode->i_sb, JOURNAL_PER_BALANCE_CNT * 2 + 1);
         if (error)
                 goto out;
 
+        /* check reiserfs_do_truncate after ending the transaction */
+        if (err2) {
+                error = err2;
+                goto out;
+        }
+        
         if (update_timestamps) {
                 error = remove_save_link(p_s_inode, 1 /* truncate */ );
                 if (error)
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index 68b7b78638f..3f17ef844fb 100644
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -1039,6 +1039,10 @@ static int flush_commit_list(struct super_block *s,
         }
         atomic_dec(&journal->j_async_throttle);
 
+        /* We're skipping the commit if there's an error */
+        if (retval || reiserfs_is_journal_aborted(journal))
+                barrier = 0;
+
         /* wait on everything written so far before writing the commit
          * if we are in barrier mode, send the commit down now
          */
@@ -1077,10 +1081,16 @@ static int flush_commit_list(struct super_block *s,
         BUG_ON(atomic_read(&(jl->j_commit_left)) != 1);
 
         if (!barrier) {
-                if (buffer_dirty(jl->j_commit_bh))
-                        BUG();
-                mark_buffer_dirty(jl->j_commit_bh);
-                sync_dirty_buffer(jl->j_commit_bh);
+                /* If there was a write error in the journal - we can't commit
+                 * this transaction - it will be invalid and, if successful,
+                 * will just end up propogating the write error out to
+                 * the file system. */
+                if (likely(!retval && !reiserfs_is_journal_aborted (journal))) {
+                        if (buffer_dirty(jl->j_commit_bh))
+                                BUG();
+                        mark_buffer_dirty(jl->j_commit_bh) ;
+                        sync_dirty_buffer(jl->j_commit_bh) ;
+                }
         } else
                 wait_on_buffer(jl->j_commit_bh);
 
diff --git a/include/asm-arm/elf.h b/include/asm-arm/elf.h
index 7da97a93754..2d44b42d184 100644
--- a/include/asm-arm/elf.h
+++ b/include/asm-arm/elf.h
@@ -22,6 +22,8 @@ typedef unsigned long elf_freg_t[3];
 #define R_ARM_NONE      0
 #define R_ARM_PC24      1
 #define R_ARM_ABS32     2
+#define R_ARM_CALL      28
+#define R_ARM_JUMP24    29
 
 #define ELF_NGREG (sizeof (struct pt_regs) / sizeof(elf_greg_t))
 typedef elf_greg_t elf_gregset_t[ELF_NGREG];
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index 7529f4388bb..20da282d4ab 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -151,5 +151,6 @@ extern struct scsi_cmnd *scsi_get_command(struct scsi_device *, gfp_t);
 extern void scsi_put_command(struct scsi_cmnd *);
 extern void scsi_io_completion(struct scsi_cmnd *, unsigned int, unsigned int);
 extern void scsi_finish_command(struct scsi_cmnd *cmd);
+extern void scsi_setup_blk_pc_cmnd(struct scsi_cmnd *cmd, int retries);
 
 #endif /* _SCSI_SCSI_CMND_H */
diff --git a/init/Kconfig b/init/Kconfig
index be74adb389e..6c5dbedc6e9 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -256,6 +256,20 @@ config CPUSETS
 
 source "usr/Kconfig"
 
+config CC_OPTIMIZE_FOR_SIZE
+        bool "Optimize for size (Look out for broken compilers!)"
+        default y
+        depends on ARM || H8300 || EXPERIMENTAL
+        depends on !SPARC64
+        help
+          Enabling this option will pass "-Os" instead of "-O2" to gcc
+          resulting in a smaller kernel.
+
+          WARNING: some versions of gcc may generate incorrect code with this
+          option.  If problems are observed, a gcc upgrade may be needed.
+
+          If unsure, say N.
+
 menuconfig EMBEDDED
         bool "Configure standard kernel features (for small systems)"
         help
@@ -338,18 +352,6 @@ config EPOLL
           Disabling this option will cause the kernel to be built without
           support for epoll family of system calls.
 
-config CC_OPTIMIZE_FOR_SIZE
-        bool "Optimize for size"
-        default y if ARM || H8300
-        help
-          Enabling this option will pass "-Os" instead of "-O2" to gcc
-          resulting in a smaller kernel.
-
-          WARNING: some versions of gcc may generate incorrect code with this
-          option.  If problems are observed, a gcc upgrade may be needed.
-
-          If unsure, say N.
-
 config SHMEM
         bool "Use full shmem filesystem" if EMBEDDED
         default y
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index b7486488967..f2a8750bbf1 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -165,6 +165,9 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
 
         skb_pull(skb, VLAN_HLEN); /* take off the VLAN header (4 bytes currently) */
 
+        /* Need to correct hardware checksum */
+        skb_postpull_rcsum(skb, vhdr, VLAN_HLEN);
+
         /* Ok, lets check to make sure the device (dev) we
          * came in on is what this VLAN is attached to.
          */
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index a4c347c3b8e..46f9d9cf7a5 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -618,7 +618,7 @@ static int ipgre_rcv(struct sk_buff *skb)
 
                 skb->mac.raw = skb->nh.raw;
                 skb->nh.raw = __pskb_pull(skb, offset);
-                skb_postpull_rcsum(skb, skb->mac.raw, offset);
+                skb_postpull_rcsum(skb, skb->h.raw, offset);
                 memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));
                 skb->pkt_type = PACKET_HOST;
 #ifdef CONFIG_NET_IPGRE_BROADCAST