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 20100805:

The davinci tree lost its conflict.

The cifs tree still has its build failure.

The hid tree lost its conflict.

The sound tree lost its conflict.

The block tree lost its build failure and a conflict.

The security-testing tree lost its conflicts.

The devicetree tree lost its conflict.

The xen tree lost its conflicts.

The usb tree lost its conflict.

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

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 ...
[ message continues ]

Lots of source files now need <linux/blk_types.h>:

mm/filemap.c:2164: error: 'REQ_WRITE' undeclared
fs/read_write.c:362: error: 'REQ_WRITE' undeclared
fs/splice.c:1108: error: 'REQ_WRITE' undeclared
fs/aio.c:1496: error: 'REQ_WRITE' undeclared
drivers/memstick/core/memstick.c:272: error: 'REQ_WRITE' undeclared
drivers/memstick/host/tifm_ms.c:218: error: 'REQ_WRITE' undeclared
drivers/memstick/host/jmb38x_ms.c:333: error: 'REQ_WRITE' undeclared
drivers/staging/spectra/ffsport.c:277: error: 'REQ_TYPE_LINUX_BLOCK' undeclared
fs/compat.c:1274: error: 'REQ_WRITE' undeclared


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

[ message continues ]

Sorry, I see that this has already been fixed.


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

[ message continues ]

s/fixed/addressed/  but not yet merged into linux-next.
Can we get that fixed, please?


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

[ message continues ]

Which patch are you referencing?

-- 
Jens Axboe

--

[ message continues ]

Hi Jens,

Maybe I misread last week's email about linux/blk_types.h.
(It was about being exported, not about being #included.)

There are still lots of these files that have the errors listed above.
Has there been a patch for those?

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

[ message continues ]

What's the .config?

-- 
Jens Axboe

--

[ message continues ]

I have a bunch of them that fail.  Here are 2 of them,
one with CONFIG_BLOCK=y and one with CONFIG_BLOCK=n.

I can give you more if you want them.


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
[ message continues ]

Looks like the types are badly hidden behind CONFIG_BLOCK.
So this should fix the CONFIG_BLOCK=n part at least. What
was the compile error with CONFIG_BLOCK=y?

diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index 1185237..5369177 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -108,6 +108,8 @@ struct bio {
 #define BIO_POOL_MASK		(1UL << BIO_POOL_OFFSET)
 #define BIO_POOL_IDX(bio)	((bio)->bi_flags >> BIO_POOL_OFFSET)
 
+#endif /* CONFIG_BLOCK */
+
 /*
  * Request flags.  For use in the cmd_flags field of struct request, and in
  * bi_rw of struct bio.  Note that some flags are only valid in either one.
@@ -189,5 +191,4 @@ enum rq_flag_bits {
 #define REQ_IO_STAT		(1 << __REQ_IO_STAT)
 #define REQ_MIXED_MERGE		(1 << __REQ_MIXED_MERGE)
 
-#endif /* CONFIG_BLOCK */
 #endif /* __LINUX_BLK_TYPES_H */

-- 
Jens Axboe

--

[ message continues ]

Ugh, it is a staging driver with lots of other problems.
(spectra)  I wouldn't worry about it for now.



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

[ message continues ]

OK great, I'll push this one out.

-- 
Jens Axboe

--

[ message continues ]

Ack.  Looks good here.  Thanks.

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

[ message continues ]

ERROR: "con_debug_enter" [drivers/serial/kgdboc.ko] undefined!
ERROR: "vc_cons" [drivers/serial/kgdboc.ko] undefined!
ERROR: "fg_console" [drivers/serial/kgdboc.ko] undefined!
ERROR: "con_debug_leave" [drivers/serial/kgdboc.ko] undefined!

.config is attached.

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
[ message continues ]

Any possibility you can try this patch?

I'll push it into kgdb-next in just a few min, and I created another test against this.

Thanks,
Jason.


diff --git a/include/linux/console.h b/include/linux/console.h
index f76fc29..305e9c2 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -79,8 +79,13 @@ int register_con_driver(const struct consw *csw, int first, int last);
 int unregister_con_driver(const struct consw *csw);
 int take_over_console(const struct consw *sw, int first, int last, int deflt);
 void give_up_console(const struct consw *sw);
+#ifdef CONFIG_HW_CONSOLE
 int con_debug_enter(struct vc_data *vc);
 int con_debug_leave(void);
+#else
+#define con_debug_enter()
+#define con_debug_leave()
+#endif
 
 /* scroll */
 #define SM_UP       (1)
--

[ message continues ]

--

[ message continues ]