diff mbox

[GIT,PULL] USB driver patches for 4.5-rc1

Message ID 87pox6ay7p.fsf@ti.com
State New
Headers show

Commit Message

Felipe Balbi Jan. 13, 2016, 4:40 a.m. UTC 
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>




$ git describe 54011103fb45

v4.4-rc3-6-g54011103fb45

Looks like a script failure to me ;-)

cheers

-- 
balbi
diff mbox

Patch

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"