Re: 5088/3: the SPI dependency

[Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>]

On Mon, 21 Jul 2008 10:58:50 +0100
Russell King - ARM Linux <linux@xxxxxxxxxxxxxxxx> wrote:

> Since we are over a week into the merge window, and I see no sign of
> the SPI tree merging, it's time to make a decision on what to do about
> the outstanding changes in my tree which depend on the SPI tree having
> been merged first (iow, the presence of linux/spi/max7301.h.)

gpio-gpio-driver-for-max7301-spi-gpio-expander.patch is in -mm, and -mm
merges after the subsystem trees, usually in the second week of the
merge window.  It has been this way for many years.

> One solution is to continue twiddling my thumbs waiting for the SPI
> tree to merge, which frankly is utterly boring and is just a waste of
> my time.

Poor you.  Find a good book to read?

> Another solution is to back out the change, but that's extremely
> painful to do because soo much other stuff relies on that commit.
> 
> Or we could commit a change on top of everything backing out the changes
> to pcm027.c which require the SPI tree to merge first, and have the bits
> which rely on max7301.h submitted later (which is, imho, what should've
> happened.)
> 
> Or we could ignore the issue entirely and just merge the remaining
> changes.
> 
> Unless I hear otherwise, I shall be intending to back out the troublesome
> changes to pcm027.c and merge that.

Well you could have just asked me to merge that patch early, as I
regularly do when people ask me to.  I knew nothing about any of this,
so of course that patch has been following the usual procedure.

I'll merge

gpio-gpio-driver-for-max7301-spi-gpio-expander.patch
gpio-gpio-driver-for-max7301-spi-gpio-expander-checkpatch-fixes.patch
gpio-gpio-driver-for-max7301-spi-gpio-expander-check-spi_setup-return-code-cleanup.patch

within the hour.

-------------------------------------------------------------------
List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
FAQ:        http://www.arm.linux.org.uk/mailinglists/faq.php
Etiquette:  http://www.arm.linux.org.uk/mailinglists/etiquette.php