From: Jean Delvare <khali@linux-fr.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Samuel Ortiz" <sameo@linux.intel.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Márton Németh" <nm127@freemail.hu>
Subject: Re: linux-next: manual merge of the mfd tree with the i2c tree
Date: Wed, 3 Mar 2010 10:16:35 +0100 [thread overview]
Message-ID: <20100303101635.18443234@hyperion.delvare> (raw)
In-Reply-To: <20100303144715.2b607ac1.sfr@canb.auug.org.au>
Hi Stephen, Samuel,
On Wed, 3 Mar 2010 14:47:15 +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the mfd tree got a conflict in
> drivers/i2c/busses/i2c-isch.c between commit
> 482b522a6ced62506aba1c139cb9d4b73e7312f5 ("i2c: Make PCI device ids
> constant") from the i2c tree and commit
> 1fc8fe094a8ebcc09817246277250898a8d2fc5a ("i2c: convert i2c-isch to
> platform_device") from the mfd tree.
>
> The latter removes the code modified by the former, so I used the latter.
I have sent a pull request to Linus yesterday for my i2c tree, which
includes the first patch mentioned above. As soon as Linus pulls from
it, Samuel will have to adjust the second patch to make it apply again.
--
Jean Delvare
next prev parent reply other threads:[~2010-03-03 9:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-03 3:47 linux-next: manual merge of the mfd tree with the i2c tree Stephen Rothwell
2010-03-03 9:16 ` Jean Delvare [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-08-17 1:08 Stephen Rothwell
2022-08-17 4:48 ` Uwe Kleine-König
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=20100303101635.18443234@hyperion.delvare \
--to=khali@linux-fr.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nm127@freemail.hu \
--cc=sameo@linux.intel.com \
--cc=sfr@canb.auug.org.au \
/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