On Mon, 03 Jul 2006 13:47:28 +1000 Benjamin Herrenschmidt <benh at kernel.crashing.org> wrote: > On Sun, 2006-07-02 at 20:14 -0700, Andrew Morton wrote: > > On Mon, 3 Jul 2006 00:26:49 +0200 > > Michael Hanselmann <linux-kernel at hansmi.ch> wrote: > > > > > Below you find the latest revision of my AMS driver. > > > > I was about to merge the below, then this comes along. Now what? > > Michael's driver is a new version that adds support for non-i2c (PMU > based) chips found on new machines. It would be nice to have it, though > it definitely needs a bit of review from Stelian, the original author. > > What I would suggest at this point is to merge Stelian's original > driver, as you were about todo, then have Michael produce a patch > against it to be reviewed that could then be merged later on. I'm fine > having that "later on" still be in the 2.6.18 timeframe since we aren't > talking about anything critical here, just a fairly minor driver update > that is nice to have, but we can decide that later based on the reviews > of Michael's changes). Yes, but it wouldn't be a "patch against it" - Michael's patch adds multiple files with different names. So it would be a revert-and-redo.
