From: Tony Lindgren <tony@atomide.com>
To: "Aguirre, Sergio" <saaguirre@ti.com>
Cc: "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>,
Kevin Hilman <khilman@deeprootsystems.com>,
"Pandita, Vikram" <vikram.pandita@ti.com>,
Paul Walmsley <paul@pwsan.com>, Felipe Balbi <me@felipebalbi.com>
Subject: Re: [PATCH 0/7] omap3: serial code for 3630 and zoom2/3 fixes
Date: Mon, 15 Mar 2010 15:48:43 -0700 [thread overview]
Message-ID: <20100315224842.GH2900@atomide.com> (raw)
In-Reply-To: <A24693684029E5489D1D202277BE894454054155@dlee02.ent.ti.com>
* Aguirre, Sergio <saaguirre@ti.com> [100315 14:47]:
>
>
> From: Tony Lindgren [mailto:tony@atomide.com]
> Sent: Monday, March 15, 2010 4:15 PM
> > * Aguirre, Sergio <saaguirre@ti.com> [100315 13:33]:
> > > Tony,
> > >
> > > Please find attached pull request for your convenience.
> >
> > <snip>
> >
> > > The following changes since commit
> > a842b5f9ce70e1b738eabb4d719860070180ed1c:
> > > Tony Lindgren (1):
> > > Revert "omap: Add DSI regulator supply to OMAP3EVM board file"
> > >
> > > are available in the git repository at:
> > >
> > > git://dev.omapzoom.org/pub/scm/saaguirre/linux-omap-camera.git omap-
> > fixes
> >
> > Please base all the branches against the recent tag in Linus' tree,
> > in this case against v2.6.34-rc1. What we have in the linux-omap master
> > branch is a merge of various development branches, and we don't want
> > to merge that history to the mainline tree.
> >
> > If the recent mainline tag won't work as the base, then please
> > rebase it on omap-fixes-for-linus or omap-for-linus. In this case,
> > omap-fixes-for-linus at commit 29b2ee5af5f3a02846bd38a1e2121d62ee5f6aca.
> > The omap-for-linus branch will contain things going into the next
> > merge window, currently it's empty.
> >
> > In general, the commits ins omap-fixes-for-linus and omap-for-linus
> > should stay around unless something goes wrong. But please use
> > the recent mainline tag where possible, that's the most flexible
> > option for merging.
>
> Understood,
>
> Please find updated pull request, rebased on omap-fixes-for-linux.
>
> I tried it on master, but they don't apply clean, since "OMAP2: serial.c: Fix number of uarts in early_init" is not upstream, and there's a small cleanup change in it, which makes patch 0002 don't apply (printk to dev_* patch).
OK, thanks. One more thing: Please repost your fixes one more
time with LAKML Cc'd for review. Then assuming no more comments, I'll
merge them into omap-fixes-for-linus.
Meanwhile, I'll merge it into l-o master branch for testing.
Tony
next prev parent reply other threads:[~2010-03-15 22:47 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-12 20:00 [PATCH 0/7] omap3: serial code for 3630 and zoom2/3 fixes Sergio Aguirre
2010-03-12 20:00 ` [PATCH 1/7] OMAP3: serial: Check for zero-based physical addr Sergio Aguirre
2010-03-12 20:00 ` [PATCH 2/7] OMAP3: serial: Use dev_* macros instead of printk Sergio Aguirre
2010-03-12 20:00 ` [PATCH 3/7] omap2/3/4: serial: Remove condition for getting uart4_phys Sergio Aguirre
2010-03-12 20:00 ` [PATCH 4/7] omap3: zoom2/3 / 3630sdp: Don't init always all uarts Sergio Aguirre
2010-03-12 20:00 ` [PATCH 5/7] omap3: 3630sdp: Explicitly enable all UARTs Sergio Aguirre
2010-03-12 20:00 ` [PATCH 6/7] omap3: zoom 2/3: Change debugboard serial port id Sergio Aguirre
2010-03-12 20:00 ` [PATCH 7/7] omap3: zoom2/3: Register only 1 8250 port Sergio Aguirre
2010-03-15 20:36 ` [PATCH 0/7] omap3: serial code for 3630 and zoom2/3 fixes Aguirre, Sergio
2010-03-15 21:15 ` Tony Lindgren
2010-03-15 21:50 ` Aguirre, Sergio
2010-03-15 22:48 ` Tony Lindgren [this message]
2010-03-15 23:03 ` Aguirre, Sergio
-- strict thread matches above, loose matches on Subject: below --
2010-03-15 23:04 Sergio Aguirre
2010-03-15 23:04 ` Sergio Aguirre
2010-03-22 21:16 ` Tony Lindgren
2010-03-22 21:16 ` Tony Lindgren
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=20100315224842.GH2900@atomide.com \
--to=tony@atomide.com \
--cc=khilman@deeprootsystems.com \
--cc=linux-omap@vger.kernel.org \
--cc=me@felipebalbi.com \
--cc=paul@pwsan.com \
--cc=saaguirre@ti.com \
--cc=vikram.pandita@ti.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 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.