On Mon, 2010-10-11 at 15:08 -0700, Robert Love wrote:
> On Fri, 2010-10-08 at 22:57 +0800, Hillf Danton wrote:
>
> Hi Hillf,
>
> Can you please prefix the libfc patches with "libfc: <title>"? Also, for
> your other patches that have a "SCSI" prefix, I think James' system adds
> the "[SCSI]" prefix when he applies patches so you don't need to add it.
>
> > Fibre Channel exchange pool is setup in a per cpu way that
> > entire exchange id range is divided equally across all cpus.
> >
> > When cpu goes offline, the corresponding range of exchg id
> > becomes unavailable until it is online again.
> >
> > This work tries to fix the unavailability based on notifier_block.
> >
> > Signed-off-by: Hillf Danton <dhillf@xxxxxxxxx>
> > ---
> >
> > --- o/linux-2.6.36-rc4/drivers/scsi/libfc/fc_exch.c 2010-09-13
> > 07:07:38.000000000 +0800
> > +++ m/linux-2.6.36-rc4/drivers/scsi/libfc/fc_exch.c 2010-10-08
> > 22:24:48.000000000 +0800
>
> Most patches I've seen on the various mailing lists are created by
> diffing the files within the kernel directory, so that you don't have
> the "/linux-2.6.36-rc/" in each hunk. It's the difference between using
> 'patch -p1' or 'patch -p2' when applying the patch.
>
> I think this is preventing git-am from applying the patches. To import
> them I ended up having git-am fail and then manually using the 'patch
> -p2' command, so that I could get both the commit message from git-am
> and then the patch itself from 'patch'. I don't know about anyone else,
> but if you post patches without the kernel directory in the diff line it
> would help me out. Thanks.
>
Hmmm, I am not sure about how to do this with git-am, but when I do this
between lio-core-2.6.git/lio-4.0 -> lio-core-backports.git patches, I
use:
'git-apply --index --verbose --directory=$DIR_PREFIX'
which is described in the git-apply manual here:
--directory=<root>
Prepend <root> to all filenames. If a "-p" argument was also
passed, it is applied before prepending the new root.
For example, a patch that talks about updating a/git-gui.sh to
b/git-gui.sh can be applied to the file in the working tree
modules/git-gui/git-gui.sh by running git apply
--directory=modules/git-gui.
Best,
--nab
--
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
