Messages in this thread | | | Subject | Re: linux-next: manual merge of the net tree with the i2c tree | From | Ben Hutchings <> | Date | Tue, 10 Nov 2009 13:22:58 +0000 |
| |
On Tue, 2009-11-10 at 12:42 +0100, Jean Delvare wrote: > 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
Thanks, Jean.
> 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.
I don't think so, since the conflict resulted from joining two files including sfe4001.c in net-next-2.6.
Ben.
-- Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.
| |