Hi all,

As the merge window is open, please do not add 2.6.37 material to your
linux-next included trees until after 2.6.36-rc1.

Changes since 20100809:

The block tree lost its build failure.

The mfd tree lost its build failure.

The trivial tree gained conflicts against the vfs tree and Linus's tree.

The catalin 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 169 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 will be at
http://kisskb.ellerman.id.au/linux-next .  If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.

Thanks to Jan Dittmer for adding the linux-next tree to his ...
[ message continues ]

On Tue, 10 Aug 2010 13:56:01 +1000

Breaks on x86-32 with

ERROR: "st_get_plat_device" [drivers/staging/ti-st/st_drv.ko] undefined!
ERROR: "__get_user_X" [drivers/acpi/apei/erst-dbg.ko] undefined!
WARNING: modpost: Found 17 section mismatch(es).
To see full details build your kernel with:
'make CONFIG_DEBUG_SECTION_MISMATCH=y'
make[1]: *** [__modpost] Error 1
make: *** [modules] Error 2



Alan
--

[ message continues ]

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

tps6586x uses gpio interfaces, so it should depend on GPIOLIB.

Fixes these build errors:

drivers/mfd/tps6586x.c:41: error: field 'gpio' has incomplete type
drivers/mfd/tps6586x.c:195: warning: type defaults to 'int' in declaration of '__mptr'
drivers/mfd/tps6586x.c:195: warning: initialization from incompatible pointer type
drivers/mfd/tps6586x.c:210: warning: type defaults to 'int' in declaration of '__mptr'
drivers/mfd/tps6586x.c:210: warning: initialization from incompatible pointer type
drivers/mfd/tps6586x.c:219: warning: type defaults to 'int' in declaration of '__mptr'
drivers/mfd/tps6586x.c:219: warning: initialization from incompatible pointer type
drivers/mfd/tps6586x.c:249: error: implicit declaration of function 'gpiochip_add'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
---
 drivers/mfd/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-next-20100810.orig/drivers/mfd/Kconfig
+++ linux-next-20100810/drivers/mfd/Kconfig
@@ -543,7 +543,7 @@ config MFD_JZ4740_ADC
 
 config MFD_TPS6586X
 	tristate "TPS6586x Power Management chips"
-	depends on I2C
+	depends on I2C && GPIOLIB
 	select MFD_CORE
 	help
 	  If you say yes here you get support for the TPS6586X series of
--

[ message continues ]

Thanks Randy, I merged this one into the yet to be pulled tps6586x driver.

Cheers,

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

[ message continues ]

on 32-bit i386:

drivers/acpi/apei/erst-dbg.c:106: warning: format '%lx' expects type 'long unsigned int', but argument 3 has type 'ssize_t'
erst-dbg.c:(.text+0xede6d): undefined reference to `__get_user_X'

For the __get_user_X() call, in erst-dbg.c::erst_dbg_ioctl():

	case APEI_ERST_CLEAR_RECORD:
		rc = get_user(record_id, (u64 __user *)arg);

-> arch/x86/include/asm/uaccess.h:

#ifdef CONFIG_X86_32
#define __get_user_8(__ret_gu, __val_gu, ptr)				\
		__get_user_x(X, __ret_gu, __val_gu, ptr)
#else
#define __get_user_8(__ret_gu, __val_gu, ptr)				\
		__get_user_x(8, __ret_gu, __val_gu, ptr)
#endif


so is __get_user_8() not supported on X86_32?
or is this something else?


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
--

[ message continues ]

Will fix that via replacing get_user with copy_from_user for u64.

Best Regards,
Huang Ying


--

[ message continues ]