Messages in this thread | | | Date | Tue, 10 Nov 2009 16:02:46 +0100 | From | Jean Delvare <> | Subject | Re: linux-next: manual merge of the net tree with the i2c tree |
| |
On Tue, 10 Nov 2009 13:22:58 +0000, Ben Hutchings wrote: > On Tue, 2009-11-10 at 12:42 +0100, Jean Delvare wrote: > > 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.
My patch series no longer touches sfe4001.c, so how would the conflict remain?
-- Jean Delvare
| |