From: Greg KH <gregkh@linuxfoundation.org>
To: Felipe Balbi <balbi@ti.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org
Subject: Re: [GIT PULL] USB driver patches for 4.5-rc1
Date: Tue, 12 Jan 2016 21:01:48 -0800 [thread overview]
Message-ID: <20160113050148.GA32374@kroah.com> (raw)
In-Reply-To: <87pox6ay7p.fsf@ti.com>
On Tue, Jan 12, 2016 at 10:40:42PM -0600, Felipe Balbi wrote:
>
> Hi Greg,
>
> Greg KH <gregkh@linuxfoundation.org> writes:
> > Felipe Balbi (14):
> > usb: dwc3: gadget: simplify dwc3_gadget_ep_queue()
> > usb: dwc3: gadget: purge dev_dbg() calls
> > usb: dwc3: core: purge dev_dbg() calls
> > usb: dwc3: ep0: purge dev_dbg() calls
> > usb: dwc3: gadget: simplify next_request() return check
> > usb: dwc3: ep0: fix setup_packet_pending initialization
> > usb: dwc3: add generic OF glue layer
> > usb: dwc3: remove dwc3-qcom in favor of dwc3-of-simple
> > usb: dwc3: gadget: handle request->zero
> > usb: dwc3: trace: show request flags
> > usb: dwc3: gadget: pass a condition to dev_WARN_ONCE()
> > usb: of: fix build breakage on !OF
> > ARM: OMAP2+: AM43xx: select ARM TWD timer
>
> wondering how this ended up here ? It's not on my usb-for-v4.5 tag :-s
>
> $ git log --oneline --author="Felipe Balbi" \
> 9f9499ae8e6415cefc4fe0a96ad0e27864353c89..usb-for-v4.5
>
> 5072cfc40a80 usb: dwc3: of-simple: fix build warning on !PM
> be99c8430095 usb: of: fix build breakage on !OF
> 95ca961c758c usb: dwc3: gadget: pass a condition to dev_WARN_ONCE()
> 46a01427e969 usb: dwc3: trace: show request flags
> 04c03d10e507 usb: dwc3: gadget: handle request->zero
> b084662776be usb: dwc3: remove dwc3-qcom in favor of dwc3-of-simple
> 16adc674d0d6 usb: dwc3: add generic OF glue layer
> b5d335e5ea6a usb: dwc3: ep0: fix setup_packet_pending initialization
> ac7bdcc1b3ad usb: dwc3: gadget: simplify next_request() return check
> acc38c4970ca usb: dwc3: ep0: purge dev_dbg() calls
> 1407bf13e3bf usb: dwc3: core: purge dev_dbg() calls
> ec5e795cdefb usb: dwc3: gadget: purge dev_dbg() calls
> bb423984c28e usb: dwc3: gadget: simplify dwc3_gadget_ep_queue()
>
> In fact, that commit is already in mainline:
>
> $ git show 54011103fb45
>
> commit 54011103fb457ba8b23aed6699609c0ad65b05fb
> Author: Felipe Balbi <balbi@ti.com>
> Date: Mon Dec 14 22:34:06 2015 +0200
>
> ARM: OMAP2+: AM43xx: select ARM TWD timer
>
> Make sure to tell the kernel that AM437x devices have ARM TWD timer.
>
> Signed-off-by: Felipe Balbi <balbi@ti.com>
> [grygorii.strashko@ti.com: drop ARM Global timer selection, because
> it's incompatible with PM (cpuidle/cpufreq). So, it's unsafe to enable
> it unconditionally]
> Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
>
> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> index 32a0086f967d..0517f0c1581a 100644
> --- a/arch/arm/mach-omap2/Kconfig
> +++ b/arch/arm/mach-omap2/Kconfig
> @@ -66,6 +66,7 @@ config SOC_AM43XX
> select MIGHT_HAVE_CACHE_L2X0
> select HAVE_ARM_SCU
> select GENERIC_CLOCKEVENTS_BROADCAST
> + select HAVE_ARM_TWD
>
> config SOC_DRA7XX
> bool "TI DRA7XX"
>
>
> $ git describe 54011103fb45
>
> v4.4-rc3-6-g54011103fb45
>
> Looks like a script failure to me ;-)
Ah, no, I didn't update my local master branch to a newer version, and
as I already had 4.4-rc7 in this branch, when I diff against master, it
looks like I just merged 4.4-rc7 in there as well. Look at the patch
from Al Viro in there as an example.
My fault, sorry about that, will send a new pull request in a few
minutes, thanks for noticing this.
greg k-h
next prev parent reply other threads:[~2016-01-13 5:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-13 4:32 [GIT PULL] USB driver patches for 4.5-rc1 Greg KH
2016-01-13 4:40 ` Felipe Balbi
2016-01-13 5:01 ` Greg KH [this message]
2016-01-13 5:05 ` [GIT PULL v2] " Greg KH
2016-01-16 0:12 ` [GIT PULL] " Timur Tabi
2016-01-16 1:47 ` Greg KH
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=20160113050148.GA32374@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=akpm@linux-foundation.org \
--cc=balbi@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=torvalds@linux-foundation.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.