It's been two weeks since -rc1, largely because one of those weeks was
the kernel summit and plumbers conference, and as a result very quiet
indeed.

And in fact, despite being two weeks, the amount of changes between
-rc1 and -rc2 is pretty normal, both by number of commits (it tends to
be around 500+ commits, although we've had outliers: 2.6.34 was 1700,
2.6.36-rc2 was just 237, and 2.6.32-rc2 was the same as -rc1 because I
screwed up the tagging ;) and by actual size of the diff. In fact,
doing the stats, the diff looks a bit smaller than normal. Which is
all good.

And it all looks the way I like to see my -rc2's: nothing really
interesting there. We had a SCSI calling convention change patch that
got punted due to some discussion about details (and which I'll
probably accept for -rc3 with the fixed model).

In fact, the biggest change in the diffstat is just due to some
staging driver reverts. So hopefully this whole 2.6.37 release cycle
will be as painless as it looks so far.

Or maybe people are still just not very active after the KS. So go out and test,

                                           Linus

---
Aaro Koskinen (1):
      sisfb: limit POST memory test according to PCI resource length

Alan Cox (2):
      tty: Fix formatting in tty.h
      nozomi: Fix warning from the previous TIOCGCOUNT changes

Alex Deucher (5):
      drm/radeon/kms/evergreen: add missing pm.vblank_sync update in vbl handler
      drm/radeon/kms: make the connector code less verbose
      drm/radeon/kms: don't disable shared encoders on pre-DCE3 display blocks
      drm/radeon/kms: add support for clock/data path routers
      drm/radeon/kms: fix thermal sensor reporting on rv6xx

Alexey Khoroshilov (1):
      kernel/range.c: fix clean_sort_range() for the case of full array

Amerigo Wang (1):
      netxen: remove unused firmware exports

Anand Gadiyar (1):
      usb: musb: fail unaligned DMA transfers on v1.8 and above

Andi Kleen (1):
      x86: Address gcc4.6 "set but ...
[ message continues ]

Ave

  LD      vmlinux.o
  MODPOST vmlinux.o
WARNING: modpost: Found 7 section mismatch(es).
To see full details build your kernel with:
'make CONFIG_DEBUG_SECTION_MISMATCH=y'
  GEN     .version
  CHK     include/generated/compile.h
  UPD     include/generated/compile.h
  CC      init/version.o
  LD      init/built-in.o
  LD      .tmp_vmlinux1
drivers/built-in.o: In function `nouveau_pm_fini':
(.text+0xe1857): undefined reference to `hwmon_device_unregister'
drivers/built-in.o: In function `nouveau_pm_init':
(.text+0xe1b4d): undefined reference to `hwmon_device_register'
drivers/built-in.o: In function `nouveau_pm_init':
(.text+0xe1bef): undefined reference to `hwmon_device_unregister'
make[1]: *** [.tmp_vmlinux1] Error 1
make: *** [sub-make] Error 2


-- 
Slawa!
N.P.S.

Les fleurs du mal unfold
Comme les fleurs du mal
Dark demons of my soul
Un amour fatal
[ message continues ]

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

When CONFIG_PM is not enabled, acpi/video.h causes a build error.
Also fix a longstanding warning.

include/acpi/video.h:22: warning: 'struct acpi_device' declared inside parameter list
include/acpi/video.h:22: warning: its scope is only this definition or declaration, which is probably not what you want
include/acpi/video.h: In function 'acpi_video_get_edid':
include/acpi/video.h:24: error: 'ENODEV' undeclared (first use in this function)

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 include/acpi/video.h |    4 ++++
 1 file changed, 4 insertions(+)

--- lnx-2637-rc2.orig/include/acpi/video.h
+++ lnx-2637-rc2/include/acpi/video.h
@@ -1,6 +1,10 @@
 #ifndef __ACPI_VIDEO_H
 #define __ACPI_VIDEO_H
 
+#include <linux/errno.h>
+
+struct acpi_device;
+
 #define ACPI_VIDEO_DISPLAY_CRT  1
 #define ACPI_VIDEO_DISPLAY_TV   2
 #define ACPI_VIDEO_DISPLAY_DVI  3
--

[ message continues ]

we already have a patch at
http://marc.info/?l=linux-kernel&m=128369371631933&w=2
Not sure if Len has applied it or not.
Anyway, thanks for the patch. :)



--

[ message continues ]

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

[ message continues ]

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

Fix cciss driver for CONFIG_PROC_FS not enabled:

drivers/block/cciss.c:4929: error: 'proc_cciss' undeclared (first use in this function)

The recent patch (which I acked) did not handle this configuration.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 drivers/block/cciss.c |    2 ++
 1 file changed, 2 insertions(+)

--- lnx-2637-rc2.orig/drivers/block/cciss.c
+++ lnx-2637-rc2/drivers/block/cciss.c
@@ -4926,8 +4926,10 @@ static void __exit cciss_cleanup(void)
 		}
 	}
 	kthread_stop(cciss_scan_thread);
+#ifdef CONFIG_PROC_FS
 	if (proc_cciss)
 		remove_proc_entry("driver/cciss", NULL);
+#endif
 	bus_unregister(&cciss_bus_type);
 }
 
--

[ message continues ]

Hmm. I would almost prefer to not have this #ifdef inside code, and
solve it by simply moving the definition of "proc_cciss" to outside
the other #ifdef CONFIG_PROC_FS.

That way it allways stays NULL, and without CONFIG_PROC_FS the code in
question will all be empty inline function calls anyway, so the
compiler will compile it all away (at the cost of just keeping that
one unnecessary variable around).

I'd rather waste one useless pointer than have ugly source code.

Comments?

                Linus
--

[ message continues ]

Agree, I merged this:

http://git.kernel.dk/?p=linux-2.6-block.git;a=commit;h=bbe425cd9ae83eacd0c9f09df2bf56d...

-- 
Jens Axboe

--

[ message continues ]