From: Tony Lindgren <tony@atomide.com>
To: Russ Dill <russ.dill@gmail.com>
Cc: "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>,
Kevin Hilman <khilman@deeprootsystems.com>
Subject: Re: Latest tmlid/linux-omap-2.6.git changes
Date: Tue, 7 Apr 2009 16:45:08 -0700 [thread overview]
Message-ID: <20090407234508.GF23823@atomide.com> (raw)
In-Reply-To: <f9d2a5e10904071541k3c7c233x82c303e50cafc7a6@mail.gmail.com>
* 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
prev parent reply other threads:[~2009-04-07 23:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-07 22:41 Latest tmlid/linux-omap-2.6.git changes Russ Dill
2009-04-07 23:45 ` Tony Lindgren [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=20090407234508.GF23823@atomide.com \
--to=tony@atomide.com \
--cc=khilman@deeprootsystems.com \
--cc=linux-omap@vger.kernel.org \
--cc=russ.dill@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox