From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: Orion Pull request
Date: Thu, 26 Jul 2012 22:05:51 +0000 [thread overview]
Message-ID: <201207262205.52381.arnd@arndb.de> (raw)
In-Reply-To: <20120726183941.GC15626@lunn.ch>
On Thursday 26 July 2012, Andrew Lunn wrote:
> So, here is what i think you mean....
>
> The SPI pull request is here:
>
> https://lkml.org/lkml/2012/7/25/204
>
> and says
>
> git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git tags/spi-3.6
>
> I cannot find a pull request for i2c-embedded for 3.6. For 3.5 it was:
>
> git://git.pengutronix.de/git/wsa/linux.git i2c-embedded/for-next
>
> I've no idea if this is stable or not. I need to ask Wolfram.
Right.
> :~/B3/QNAP/linux$ git checkout v3.5-rc7
> :~/B3/QNAP/linux$ git checkout -b v3.5-rc7-dt
> :~/B3/QNAP/linux$ git remote add spi git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git
> :~/B3/QNAP/linux$ git fetch spi
> :~/B3/QNAP/linux$ git merge spi-3.6
> :~/B3/QNAP/linux$ git remote add i2c-embedded git://git.pengutronix.de/git/wsa/linux.git
> :~/B3/QNAP/linux$ git fetch i2c-embedded
> :~/B3/QNAP/linux$ git merge i2c-embedded/i2c-embedded/for-next
Note that it's also reasonable to base this on v3.5 rather than v3.5-rc7. The important
part is to use a tag from Linus as the base. A shortcut for the 'remote add', 'fetch',
'merge' is to use
'git pull git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git tags/spi-3.6'.
> and then i have
>
> ~/B3/QNAP/linux$ git log --oneline
> afddda0 Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next' into v
> 0a6f855 Merge tag 'spi-3.6' into v3.5-rc7-dt
> 5db20c4 Revert "i2c: tegra: convert normal suspend/resume to *_noirq"
> b61d157 I2C: MV64XYZ: Add Device Tree support
> 8ceffa7 spi/orion: remove uneeded spi_info
> d76ea24 spi/bcm63xx: fix clock configuration selection
> f814f9a spi/orion: add device tree binding
> 24ab3275 spi/omap2: mark omap2_mcspi_master_setup as __devinit
> a3ce9a8 spi: omap2-mcspi: Fix the below warning
> b316590 spi: Add AD-FMCOMMS1-EBZ I2C-SPI bridge driver
> 6f535b9 i2c: stu300: use devm managed resources
> 84a1caf Linux 3.5-rc7
> ...
>
> So if i understand you right, i can now cherry-pick my patches into
> this branch, test them and send you a pull request?
Yes.
Arnd
prev parent reply other threads:[~2012-07-26 22:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-24 8:17 Orion Pull request Andrew Lunn
2012-07-25 14:20 ` Arnd Bergmann
2012-07-25 21:17 ` Andrew Lunn
2012-07-26 7:07 ` Arnd Bergmann
2012-07-26 11:57 ` Mark Brown
2012-07-26 18:39 ` Andrew Lunn
2012-07-26 22:05 ` Arnd Bergmann [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=201207262205.52381.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
/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.