From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
To: Kumar Gaurav <kumargauravgupta3@gmail.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>,
gregkh@linuxfoundation.org, linux-usb@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH v3] xHCI: Fixing xhci_readl definition and function call
Date: Wed, 28 Aug 2013 10:35:26 -0700 [thread overview]
Message-ID: <20130828173526.GD26483@xanatos> (raw)
In-Reply-To: <521E3044.80109@gmail.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
next prev parent reply other threads:[~2013-08-28 17:35 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-26 2:08 [PATCH v3] xHCI: Fixing xhci_readl definition and function call Kumar Gaurav
2013-08-28 7:13 ` Dan Carpenter
2013-08-28 15:09 ` Kumar Gaurav
2013-08-28 17:01 ` Sarah Sharp
2013-08-28 17:15 ` Kumar Gaurav
2013-08-28 17:35 ` Sarah Sharp [this message]
2013-08-28 19:15 ` Dan Carpenter
-- strict thread matches above, loose matches on Subject: below --
2013-08-22 3:04 Kumar Gaurav
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130828173526.GD26483@xanatos \
--to=sarah.a.sharp@linux.intel.com \
--cc=dan.carpenter@oracle.com \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=kumargauravgupta3@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox