* linux-next: omap tree misaplied patch
@ 2009-11-20 2:02 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2009-11-20 2:02 UTC (permalink / raw)
To: Tony Lindgren, linux-omap; +Cc: linux-next, LKML
[-- Attachment #1: Type: text/plain, Size: 472 bytes --]
Hi Tony,
I think commit 8552f084d80cfc191ea5affacbeffe44e8629496 ("ARM OMAP3:
RX-51 board - add initialization of gpio keys") has been misapplied. It
has this line:
+#endif /* CONFIG_KEYBOARD_GPIO || CONFIG_KEYBOARD_GPIO_MODULE */
with the leading '+'. I noticed this when merging with the input tree
as this made for a strange looking conflict.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* linux-next: omap tree misaplied patch
@ 2009-11-20 2:02 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2009-11-20 2:02 UTC (permalink / raw)
To: Tony Lindgren, linux-omap; +Cc: linux-next, LKML
[-- Attachment #1: Type: text/plain, Size: 472 bytes --]
Hi Tony,
I think commit 8552f084d80cfc191ea5affacbeffe44e8629496 ("ARM OMAP3:
RX-51 board - add initialization of gpio keys") has been misapplied. It
has this line:
+#endif /* CONFIG_KEYBOARD_GPIO || CONFIG_KEYBOARD_GPIO_MODULE */
with the leading '+'. I noticed this when merging with the input tree
as this made for a strange looking conflict.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: omap tree misaplied patch
2009-11-20 2:02 ` Stephen Rothwell
(?)
@ 2009-11-20 20:57 ` Tony Lindgren
-1 siblings, 0 replies; 3+ messages in thread
From: Tony Lindgren @ 2009-11-20 20:57 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-omap, linux-next, LKML
* Stephen Rothwell <sfr@canb.auug.org.au> [091119 18:01]:
> Hi Tony,
>
> I think commit 8552f084d80cfc191ea5affacbeffe44e8629496 ("ARM OMAP3:
> RX-51 board - add initialization of gpio keys") has been misapplied. It
> has this line:
>
> +#endif /* CONFIG_KEYBOARD_GPIO || CONFIG_KEYBOARD_GPIO_MODULE */
>
> with the leading '+'. I noticed this when merging with the input tree
> as this made for a strange looking conflict.
Oops, my fault. Will fix ASAP.
Regards,
Tony
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-11-20 20:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-20 2:02 linux-next: omap tree misaplied patch Stephen Rothwell
2009-11-20 2:02 ` Stephen Rothwell
2009-11-20 20:57 ` Tony Lindgren
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.