* Latest tmlid/linux-omap-2.6.git changes
@ 2009-04-07 22:41 Russ Dill
2009-04-07 23:45 ` Tony Lindgren
0 siblings, 1 reply; 2+ messages in thread
From: Russ Dill @ 2009-04-07 22:41 UTC (permalink / raw)
To: linux-omap@vger.kernel.org; +Cc: Kevin Hilman, Tony Lindgren
f64f3007, "omap_hsmmc: Flush posted write to IRQ" doesn't change any files.
It appears that the patch in question is here:
http://patchwork.kernel.org/patch/16515/
But it looks like it would have created a conflict with b420f201,
"MMC: OMAP: flush posted write to IRQ". The f64f3007 patch adds a read
in two places, but the b420f201 patch only adds a read in one place.
It also apears that e6cb736 "Initial import of extra code in
arch/arm/*omap* into omap-pool branch", sets arch/arm/plat-omap/dma.c
to mode 755, and the merge a01c39f, "Merge branch 'omap-fixes'" keeps
that mode.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Latest tmlid/linux-omap-2.6.git changes
2009-04-07 22:41 Latest tmlid/linux-omap-2.6.git changes Russ Dill
@ 2009-04-07 23:45 ` Tony Lindgren
0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2009-04-07 23:45 UTC (permalink / raw)
To: Russ Dill; +Cc: linux-omap@vger.kernel.org, Kevin Hilman
* Russ Dill <russ.dill@gmail.com> [090407 15:41]:
> f64f3007, "omap_hsmmc: Flush posted write to IRQ" doesn't change any files.
>
> It appears that the patch in question is here:
>
> http://patchwork.kernel.org/patch/16515/
>
> But it looks like it would have created a conflict with b420f201,
> "MMC: OMAP: flush posted write to IRQ". The f64f3007 patch adds a read
> in two places, but the b420f201 patch only adds a read in one place.
Thanks, looks like I need to fix that in omap-pool, otherwise git merge
will automerge that one.
> It also apears that e6cb736 "Initial import of extra code in
> arch/arm/*omap* into omap-pool branch", sets arch/arm/plat-omap/dma.c
> to mode 755, and the merge a01c39f, "Merge branch 'omap-fixes'" keeps
> that mode.
Hmm, I wonder how that got set.. Should be fixed now.
Once I have the omap-pool patches broken down into individual patches,
this constant merging should calm down a bit.
Regards,
Tony
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-04-07 23:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-07 22:41 Latest tmlid/linux-omap-2.6.git changes Russ Dill
2009-04-07 23:45 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox