Re: [PATCH v3] xHCI: Fixing xhci_readl definition and function call

[Sarah Sharp <sarah.a.sharp@linux.intel.com>]

On Wed, Aug 28, 2013 at 10:45:48PM +0530, Kumar Gaurav wrote:
> On Wednesday 28 August 2013 10:31 PM, Sarah Sharp wrote:
> >On Wed, Aug 28, 2013 at 08:39:06PM +0530, Kumar Gaurav wrote:
> >>On Wednesday 28 August 2013 12:43 PM, Dan Carpenter wrote:
> >>>On Mon, Aug 26, 2013 at 07:38:57AM +0530, Kumar Gaurav wrote:
> >>I've started cloning linux-next and as it's not applying on
> >>linux-next, I'll try it on linux-next (once i cloned it)  and will
> >>send again.
> >Yeah, this doesn't apply against Greg's usb-next tree, so I can't take
> >it.  If you're sending non-bug fixes in, you need to base your patches
> >against that tree, or linux-next.
> >
> >Sarah Sharp
> I'm trying against linux-git as
>     cat
> 0027-xHCI-Fixing-xhci_readl-definition-and-function-call.patch|
> patch

No, don't do that.  Use `git am` instead, possibly with the 3-way merge
options.

> and then after i enter the required file (drivers/usb/host/xhci-dbg.c).
> it's giving me  message
> 
> File to patch: drivers/usb/host/xhci-dbg.c
> patching file drivers/usb/host/xhci-dbg.c
> can't find file to patch at input line 180
> Perhaps you should have used the -p or --strip option?
> The text leading up to this was:
> 
> but when i saw the file i found changes are applied there.
> 
> I had made the patch using git format-patch. what could be the
> possible reason behind this issue or am i mistaking somewhere?

I would try checking out linux-next on a new branch, and then using `git
cherry-pick` to apply your patch.  That will try to apply the patch, and
give you merge conflicts if they don't apply.  You'll need to clean
those conflicts up and re-submit the resulting patch.  You may have to
re-do the patch if you can't get it to apply against linux-next.

Sarah Sharp