From: Jean Delvare <khali@linux-fr.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Ben Hutchings <bhutchings@solarflare.com>
Cc: David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Mika Kuoppala <mika.kuoppala@nokia.com>
Subject: Re: linux-next: manual merge of the net tree with the i2c tree
Date: Tue, 10 Nov 2009 12:42:31 +0100 [thread overview]
Message-ID: <20091110124231.66141a0f@hyperion.delvare> (raw)
In-Reply-To: <20091026133757.7cf87e49.sfr@canb.auug.org.au>
Hi Stephen, Ben,
On Mon, 26 Oct 2009 13:37:57 +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/sfc/sfe4001.c between commit
> 3f7c0648f727a6d5baf6117653e4001dc877b90b ("i2c: Prevent priority
> inversion on top of bus lock") from the i2c tree and commit
> c9597d4f89565b6562bd3026adbe6eac6c317f47 ("sfc: Merge sfe4001.c into
> falcon_boards.c") from the net tree.
>
> I have applied the following merge fixup patch (after removing
> drivers/net/sfc/sfe4001.c) and can carry it as necessary.
I've merged the new API to get and release the i2c_adapter mutex:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=afa08974fe80c198b8650f73ed8ab59135ca10d0
Ben, you can adjust your own patches to make use of this API instead of
accessing the i2c_adapter mutex directly. That way, you are no longer
dependent of implementation changes, and this should solve the conflict.
Stephen, you can then drop your fixup patch.
Thanks,
--
Jean Delvare
next prev parent reply other threads:[~2009-11-10 11:42 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-26 2:37 linux-next: manual merge of the net tree with the i2c tree Stephen Rothwell
2009-10-26 13:46 ` Ben Hutchings
2009-10-29 14:43 ` Shared i2c adapter locking (Was: linux-next: manual merge of the net tree with the i2c tree) Jean Delvare
2009-10-29 15:09 ` Ben Hutchings
2009-11-05 13:11 ` Shared i2c adapter locking Jean Delvare
2009-11-05 13:57 ` Ben Hutchings
[not found] ` <1257429444.2793.2.camel-xQnnTUlwzDrdvaEqJLTMTA9jg9n5Vt1AMm0uRHvK7Nw@public.gmane.org>
2009-11-05 14:07 ` Jean Delvare
2009-11-17 8:33 ` Stephen Rothwell
[not found] ` <20091117193313.b750804e.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2009-11-17 9:35 ` Jean Delvare
2009-11-17 11:51 ` David Miller
2009-11-17 13:32 ` Ben Hutchings
2009-11-17 14:13 ` David Miller
[not found] ` <20091117103554.03971b2f-ig7AzVSIIG7kN2dkZ6Wm7A@public.gmane.org>
2009-11-17 20:59 ` Stephen Rothwell
[not found] ` <20091118075917.9ac0248c.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2009-11-19 6:53 ` David Miller
2009-11-19 7:05 ` Stephen Rothwell
2009-11-10 11:42 ` Jean Delvare [this message]
2009-11-10 13:22 ` linux-next: manual merge of the net tree with the i2c tree Ben Hutchings
2009-11-10 15:02 ` Jean Delvare
2009-11-10 15:10 ` Ben Hutchings
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=20091110124231.66141a0f@hyperion.delvare \
--to=khali@linux-fr.org \
--cc=bhutchings@solarflare.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mika.kuoppala@nokia.com \
--cc=netdev@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).