From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ben Dooks <ben-linux@fluff•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Dirk Brandewie <dirk.brandewie@gmail•com>,
Lucas De Marchi <lucas.demarchi@profusion•mobi>
Subject: linux-next: manual merge of the bjdooks-i2c tree with Linus' tree
Date: Fri, 8 Apr 2011 13:20:15 +1000 [thread overview]
Message-ID: <20110408132015.ef5da5aa.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 439 bytes --]
Hi Ben,
Today's linux-next merge of the bjdooks-i2c tree got a conflict in
drivers/i2c/busses/i2c-intel-mid.c between commit 25985edcedea ("Fix
common misspellings") from Linus' tree and commit 5c7d3e377ddd
("i2c-intel-mid.c: Remove i2c-intel-mid.c") from the bjdooks-i2c tree.
The latter removes the file, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2011-04-08 3:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-08 3:20 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-07-31 2:48 linux-next: manual merge of the bjdooks-i2c tree with Linus' tree Stephen Rothwell
2011-11-02 1:22 Stephen Rothwell
2011-11-02 2:28 ` Yong Zhang
2011-11-02 17:46 ` Ben Dooks
2011-01-17 0:17 Stephen Rothwell
2011-01-17 0:49 ` Ben Dooks
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=20110408132015.ef5da5aa.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ben-linux@fluff$(echo .)org \
--cc=dirk.brandewie@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lucas.demarchi@profusion$(echo .)mobi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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