Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3568b71d authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'v2.6.30-rc3' into x86/urgent 



Merge reason: hpet.c changed upstream, make sure we test against that

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 2a3313f4 09106974

Documentation/filesystems/vfs.txt

+1 −2
Original line number Diff line number Diff line
@@ -277,8 +277,7 @@ or bottom half). 
  unfreeze_fs: called when VFS is unlocking a filesystem and making it writable

  	again.



  statfs: called when the VFS needs to get filesystem statistics. This

	is called with the kernel lock held

  statfs: called when the VFS needs to get filesystem statistics.



  remount_fs: called when the filesystem is remounted. This is called

	with the kernel lock held

Documentation/spi/spi-summary

+6 −0
Original line number Diff line number Diff line
@@ -511,10 +511,16 @@ SPI MASTER METHODS 
	This sets up the device clock rate, SPI mode, and word sizes.

	Drivers may change the defaults provided by board_info, and then

	call spi_setup(spi) to invoke this routine.  It may sleep.



	Unless each SPI slave has its own configuration registers, don't

	change them right away ... otherwise drivers could corrupt I/O

	that's in progress for other SPI devices.



		** BUG ALERT:  for some reason the first version of

		** many spi_master drivers seems to get this wrong.

		** When you code setup(), ASSUME that the controller

		** is actively processing transfers for another device.



    master->transfer(struct spi_device *spi, struct spi_message *message)

    	This must not sleep.  Its responsibility is arrange that the

	transfer happens and its complete() callback is issued.  The two

MAINTAINERS

+21 −4
Original line number Diff line number Diff line
@@ -1287,6 +1287,14 @@ S: Maintained 
F:	Documentation/video4linux/bttv/

F:	drivers/media/video/bt8xx/bttv*



CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS

P:	David Howells

M:	dhowells@redhat.com

L:	linux-cachefs@redhat.com

S:	Supported

F:	Documentation/filesystems/caching/cachefiles.txt

F:	fs/cachefiles/



CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER

P:	Jonathan Corbet

M:	corbet@lwn.net
@@ -2057,6 +2065,8 @@ F: drivers/infiniband/hw/ehca/ 
EMBEDDED LINUX

P:	Paul Gortmaker

M:	paul.gortmaker@windriver.com

P:	Matt Mackall

M:	mpm@selenic.com

P:	David Woodhouse

M:	dwmw2@infradead.org

L:	linux-embedded@vger.kernel.org
@@ -2325,6 +2335,15 @@ F: Documentation/power/freezing-of-tasks.txt 
F:	include/linux/freezer.h

F:	kernel/freezer.c



FS-CACHE: LOCAL CACHING FOR NETWORK FILESYSTEMS

P:	David Howells

M:	dhowells@redhat.com

L:	linux-cachefs@redhat.com

S:	Supported

F:	Documentation/filesystems/caching/

F:	fs/fscache/

F:	include/linux/fscache*.h



FTRACE

P:	Steven Rostedt

M:	rostedt@goodmis.org
@@ -2545,7 +2564,6 @@ F: kernel/power/ 
F:	include/linux/suspend.h

F:	include/linux/freezer.h

F:	include/linux/pm.h

F:	include/asm-*/suspend*.h

F:	arch/*/include/asm/suspend*.h



HID CORE LAYER
@@ -3323,7 +3341,7 @@ P: Eduard - Gabriel Munteanu 
M:	eduard.munteanu@linux360.ro

L:	linux-kernel@vger.kernel.org

S:	Maintained

F:	Documentation/vm/kmemtrace.txt

F:	Documentation/trace/kmemtrace.txt

F:	include/trace/kmemtrace.h

F:	kernel/trace/kmemtrace.c
@@ -5387,7 +5405,6 @@ F: kernel/power/ 
F:	include/linux/suspend.h

F:	include/linux/freezer.h

F:	include/linux/pm.h

F:	include/asm-*/suspend.h



SVGA HANDLING

P:	Martin Mares
@@ -5621,7 +5638,7 @@ L: uclinux-dev@uclinux.org (subscribers-only) 
S:	Maintained

F:	arch/m68knommu/



UCLINUX FOR RENESAS H8/300

UCLINUX FOR RENESAS H8/300 (H8300)

P:	Yoshinori Sato

M:	ysato@users.sourceforge.jp

W:	http://uclinux-h8.sourceforge.jp/

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 30

EXTRAVERSION = -rc2

EXTRAVERSION = -rc3

NAME = Temporary Tasmanian Devil



# *DOCUMENTATION*

arch/alpha/include/asm/percpu.h

+1 −1
Original line number Diff line number Diff line
@@ -73,6 +73,6 @@ extern unsigned long __per_cpu_offset[NR_CPUS]; 


#endif /* SMP */



#define DECLARE_PER_CPU(type, name) extern __typeof__(type) per_cpu_var(name)

#include <asm-generic/percpu.h>



#endif /* __ALPHA_PERCPU_H */