Re: [GIT PULL] TWL6040 MFD and followups

Felipe Balbi
2011-07-07T19:36:10Z

[-- Attachment #1: Type: text/plain, Size: 1891 bytes --]

Hi,

On Thu, Jul 07, 2011 at 11:29:47AM -0700, Tony Lindgren wrote:
> * Péter Ujfalusi <peter.ujfalusi@ti.com> [110707 04:43]:
> > Hello Tony,
> >
> > As it has been discussed I'm sending this pull request, which includes the
> > following series (all patch acked-by the corresponding maintainer):
> > 1. v6 of MFD/ASoC/Input: TWL4030/TWL60X0 changes (18 patch)
> > 2. v3 of MFD/input/ASoC: twl6040: irq registration changes (5 patch)
> > 3. v1 of ASoC/MFD: twl6040: PLL handling changes (6 patch)
> > 4. ASoC: twl6040: Add back support for legacy mode (single patch)
> >
> > The first series starts with a cleanup in the mach-omap2 directory
> > (twl-common.c file created), and that is the reason we agreed that you
> > are going to take this pull request.
> > The rest of the changes are well contained, and should not cause merge
> > conflict for 3.1. We have not sent patches for these components, so the
> > changes to these are coming from one source.
> >
> > As you have requested I have created the series on top of your
> > devel-cleanup branch.
>
> Thanks. Can you please add one more branch for cleanup only for me to
> pull at your commit b252b0efb605b92a2f5d118e294d088d89cfd286
> (OMAP3: Move common regulator configuration to twl-common)?
>
> That way I can first pull that into cleanup and send that to Arnd.
> Then we can do a separate twl-asoc branch so the cleanup stays
> separate from new code.
>
> I don't think there's a way for me to do a pull that ends at certain
> commit with git.. Or at least I don't know how to do that short of
> git reset --hard of some branch at that commit.

after a git fetch <url>, you already have the objects locally, so git
merge <commit-id> should work just fine.

If you look at what git pull does, it basically does a fetch followed by
a merge of FETCH_HEAD (by default).

--
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]