Re: linux-next: manual merge of the driver-core.current tree withLinus tree
From: Greg KH
Date: Fri Jan 04 2013 - 21:33:00 EST
On Wed, Jan 02, 2013 at 10:37:26AM +1100, Stephen Rothwell wrote:
> Hi Greg,
> Today's linux-next merge of the driver-core.current tree got a conflict
> in drivers/i2c/busses/i2c-au1550.c between commit 0b255e927d47 ("i2c:
> remove __dev* attributes from subsystem") from Linus' tree and commit
> eeb30d064414 ("Drivers: i2c: remove __dev* attributes") from the
> driver-core.current tree.
> I fixed it up (I used the driver-core.current version) and can carry the
> fix as necessary (no action is required).
All of these should no longer be an issue due to the driver-core.current
tree getting merged into Linus's tree.
Hopefully it should not be a merge issue for you anymore as well.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/