On Sun, Feb 24, 2013 at 2:53 PM, James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx> wrote: > On Tue, 2013-02-05 at 22:17 +0530, vinholikatti@xxxxxxxxx wrote: >> From: Vinayak Holikatti <vinholikatti@xxxxxxxxx> >> >> This patch seggregates the PCI specific code in ufshcd.c to make it >> ready for splitting into core ufs driver and PCI glue driver. Also >> copyright header modification to remove extra warranty disclaim. >> >> Reviewed-by: Arnd Bergmann <arnd@xxxxxxxx> >> Reviewed-by: Namjae Jeon <linkinjeon@xxxxxxxxx> >> Reviewed-by: Subhash Jadavani <subhashj@xxxxxxxxxxxxxx> >> Signed-off-by: Vinayak Holikatti <vinholikatti@xxxxxxxxx> >> Signed-off-by: Santosh Yaraganavi <santoshsy@xxxxxxxxx> >> --- >> drivers/scsi/ufs/Kconfig | 50 +++---- >> drivers/scsi/ufs/ufs.h | 44 +++---- >> drivers/scsi/ufs/ufshcd.c | 350 +++++++++++++++++++++++++++------------------ >> drivers/scsi/ufs/ufshci.h | 44 +++---- >> 4 files changed, 268 insertions(+), 220 deletions(-) > > This patch doesn't apply: > > jejb@dabdike> patch -p1 < .git/rebase-apply/patch > patching file drivers/scsi/ufs/Kconfig > patching file drivers/scsi/ufs/ufs.h > patching file drivers/scsi/ufs/ufshcd.c > Hunk #26 FAILED at 1823. > Hunk #27 succeeded at 1898 (offset -1 lines). > Hunk #28 succeeded at 1924 (offset -1 lines). > Hunk #29 FAILED at 2039. > 2 out of 29 hunks FAILED -- saving rejects to file > drivers/scsi/ufs/ufshcd.c.rej > patching file drivers/scsi/ufs/ufshci.h > > The rejects are pretty complex hunks; could you please rebase to the top > of the scsi-misc tree? Thanks, Ok, I will do it. > > James > > -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html