From: Greg KH <gregkh@linuxfoundation.org>
To: Felipe Balbi <balbi@ti.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux USB Mailing List <linux-usb@vger.kernel.org>
Subject: Re: [GIT PULL] USB fixes for v3.19-rc5
Date: Mon, 12 Jan 2015 10:52:17 -0800 [thread overview]
Message-ID: <20150112185217.GA11506@kroah.com> (raw)
In-Reply-To: <1421086040-28464-1-git-send-email-balbi@ti.com>
On Mon, Jan 12, 2015 at 12:07:20PM -0600, Felipe Balbi wrote:
> Hi Greg,
>
> Looks like this will be my last pull request for v3.19. Please consider merging
> on top of your usb-linus branch.
>
> Note that there will be a conflict when merging on that branch, the solution is
> to use the version from my tree as that's more correct. Here's how the related
> code should look like:
>
> devm_usb_ge_phy_by_phandle():
>
> [ ... ]
>
> 195 phy = __of_usb_find_phy(node);
> 196 if (IS_ERR(phy)) {
> 197 devres_free(ptr);
> 198 goto err1;
> 199 }
> 200
> 201 if (!try_module_get(phy->dev->driver->owner)) {
> 202 phy = ERR_PTR(-ENODEV);
> 203 devres_free(ptr);
> 204 goto err1;
> 205 }
>
> [ ... ]
>
> cheers
>
> The following changes since commit 6785a1034461c2d2c205215f63a50a740896e55b:
>
> usb: gadget: udc: atmel: fix possible IN hang issue (2014-12-22 10:41:15 -0600)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git tags/fixes-for-v3.19-rc5
Pulled and pushed out.
thanks,
greg k-h
prev parent reply other threads:[~2015-01-12 18:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-12 18:07 [GIT PULL] USB fixes for v3.19-rc5 Felipe Balbi
2015-01-12 18:52 ` Greg KH [this message]
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=20150112185217.GA11506@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=balbi@ti.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.