Hi all,

Changes since 20100304:

My fixes tree contains:
	a patch for a pktcdvd build error from Arnd Bergmann
	
We are seeing conflicts migrate from being between 2 trees in linux-next
to be between a tree and Linus' tree as things start to get merged.

The arm tree lost its conflicts.

The vfs tree lost a conflict.

The mtd tree still has its 2 build failures for which I applied patches.

The drm tree lost its conflict.

The driver-core tree lost its conflicts and one of its merge fix patches.

The usb tree lost its conflicts.

The staging tree lost its conflicts.

----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ).  If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one.  You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log files
in the Next directory.  Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.

Below is a summary of the state of the merge.

We are up to 159 trees (counting Linus' and 22 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

Status of my local build tests ...
[ message continues ]

From: Randy Dunlap <randy.dunlap@oracle.com>

LPC_SCH is selected by GPI_SCH and I2C_ISCH, even when PCI is not
enabled, but LPC_SCH depends on PCI, so make GPI_SCH and I2C_ISCH
also depend on PCI.

Those 2 selects also need to select what LPC_SCH selects,
since kconfig does not follow selects.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Denis Turischev <denis@compulab.co.il>
---
 drivers/gpio/Kconfig       |    3 ++-
 drivers/i2c/busses/Kconfig |    2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

--- linux-next-20100305.orig/drivers/gpio/Kconfig
+++ linux-next-20100305/drivers/gpio/Kconfig
@@ -87,7 +87,8 @@ config GPIO_VR41XX
 
 config GPIO_SCH
 	tristate "Intel SCH GPIO"
-	depends on GPIOLIB
+	depends on GPIOLIB && PCI
+	select MFD_CORE
 	select LPC_SCH
 	help
 	  Say yes here to support GPIO interface on Intel Poulsbo SCH.
--- linux-next-20100305.orig/drivers/i2c/busses/Kconfig
+++ linux-next-20100305/drivers/i2c/busses/Kconfig
@@ -105,6 +105,8 @@ config I2C_I801
 
 config I2C_ISCH
 	tristate "Intel SCH SMBus 1.0"
+	depends on PCI
+	select MFD_CORE
 	select LPC_SCH
 	help
 	  Say Y here if you want to use SMBus controller on the Intel SCH

-- 
~Randy
--

[ message continues ]

Hi Randy,

Thanks, patch applied.

Cheers,

-- 
Intel Open Source Technology Centre
http://oss.intel.com/
--

[ message continues ]