On Tue, 2009-11-17 at 03:51 -0800, David Miller wrote:
> From: Jean Delvare <khali@xxxxxxxxxxxx>
> Date: Tue, 17 Nov 2009 10:35:54 +0100
>
> > If you did and something is still not clear, please let me know. My
> > understanding is that the action token is in David's hands now.
>
> So what exactly do I need to do?
>
> All I see that needs to happen is to pull from Linus's tree into
> net-2.6
>
> But frankly I don't see how that helps resolve anything in linux-next
> since Stephen starts with Linus's tree then pulls in everyone's work.
>
> Or is that pull necessary so that some other patch can be applied
> to net-2.6 or similar?
There is now a conflict between this in Linus's tree:
commit afa08974fe80c198b8650f73ed8ab59135ca10d0
Author: Jean Delvare <khali@xxxxxxxxxxxx>
Date: Sat Nov 7 13:10:46 2009 +0100
i2c: Add an interface to lock/unlock an I2C bus segment
and this in net-next-2.6:
commit c9597d4f89565b6562bd3026adbe6eac6c317f47
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Oct 23 08:29:33 2009 +0000
sfc: Merge sfe4001.c into falcon_boards.c
You will need to merge Linus's tree into net-next-2.6 and resolve the
conflict by applying Jean's changes to drivers/net/sfc/falcon_boards.c.
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.
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
