On Sat, 2011-02-05 at 10:16 +0100, Fubo Chen wrote: > On Thu, Feb 3, 2011 at 10:19 PM, Nicholas A. Bellinger > <nab@xxxxxxxxxxxxxxx> wrote: > > On Thu, 2011-02-03 at 20:48 +0100, Fubo Chen wrote: > >> On Wed, Feb 2, 2011 at 9:26 AM, Nicholas A. Bellinger > >> [ ... ] > >> > >> How to apply this patch ? This is what I get: > >> > >> # git diff v2.6.38-rc2 | wc > >> 0 0 0 > >> # patch -p1 < ../p2.patch > >> patching file drivers/target/target_core_configfs.c > >> Hunk #1 FAILED at 2004. > >> Hunk #2 FAILED at 2847. > >> Hunk #3 succeeded at 2800 (offset -84 lines). > >> 2 out of 3 hunks FAILED -- saving rejects to file > >> drivers/target/target_core_configfs.c.rej > >> > > > > Hi Fubo, > > > > Note that these are all incremental patches against the LIO upstream > > lio-core-2.6.git/linus-38-rc3 tree, and not against the mainline target > > code. > > > > If you really want to apply these by hand (you should really be using > > git btw ;), then you will need to first apply the series of 24 patches > > against .38-rc2 mainline target code from my > > scsi-post-merge-2.6.git/for-38-rc3-v2 here: > > > > http://marc.info/?l=linux-scsi&m=129632617326015&w=2 > > Hi Nicholas, > > How to use git ? With scsi-post-merge-2.6.git/for-38-rc3-v2, I get this: > If you are using a linux kernel git tree, you want to be 'git pulling' directly from the lio-core-2.6.git/linus-38-rc3 upstream code, and not cherry-picking individual commits. > $ git cherry-pick 31747a72e8d02ac2f9fa1198f2fceb9e565025a3 > target: Fix top-level configfs_subsystem default_group shutdown breakage > Author: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx> > 1 files changed, 11 insertions(+), 9 deletions(-) > > $ git cherry-pick ba20ac32737242678f1fa80efc92750334fe1720 > target: Move core_delete_hba() into ->release() callback > Author: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx> > 1 files changed, 12 insertions(+), 3 deletions(-) > > $ git cherry-pick dae431fdc82508ae37ea9bbaf071713d23224e4a > Automatic cherry-pick failed. After resolving the conflicts, > mark the corrected paths with 'git add <paths>' or 'git rm <paths>' > and commit the result with: > > git commit -c dae431fdc82508ae37ea9bbaf071713d23224e4a > > $ git diff > diff --cc drivers/target/target_core_configfs.c > index 9e74aa1,3715c91..0000000 > --- a/drivers/target/target_core_configfs.c > +++ b/drivers/target/target_core_configfs.c > @@@ -2798,8 -2872,8 +2824,13 @@@ static void target_core_drop_subdev > struct se_hba *hba; > struct se_subsystem_api *t; > struct config_item *df_item; > ++<<<<<<< HEAD > + struct config_group *dev_cg, *tg_pt_gp_cg; > + int i, ret; > ++======= > + struct config_group *dev_cg, *tg_pt_gp_cg, *dev_stat_grp; > + int i; > ++>>>>>>> dae431f... target: Move subdev release logic into ->release() callback > > hba = item_to_hba(&se_dev->se_dev_hba->hba_group.cg_item); > > What does this mean ? > This means you tried to pick one of the 'for-mainline' target patches from scsi-post-merge-2.6.git (these are intended for the SCSI maintainer btw, please don't use them directly) into a local lio-core-2.6.git cloned tree, yes..? Please select the latter/bottom code from the two chunks above and remove the git conflict placeholders. Then make sure it builds as expected w/o warnings, and resolve the conflicted cherry-picked commit with: git commit -c dae431fdc8 Once done, go ahead and pull directly from lio-core-2.6.git/linus-38-rc3 -> rcX branches directly to obtain LIO upstream code. --nab > Fubo. > -- > 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 -- 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
