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

Commit 8aa0a410 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

Merge commit 'nfs-for-3.3-4' into nfs-for-next 

Conflicts:
	fs/nfs/nfs4proc.c

Back-merge of the upstream kernel in order to fix a conflict with the
slotid type conversion and implementation id patches...
parents 54b50af0 abe9a6d5

Documentation/DocBook/device-drivers.tmpl

+10 −2
Original line number Diff line number Diff line
@@ -102,9 +102,12 @@ X!Iinclude/linux/kobject.h 
!Iinclude/linux/device.h

     </sect1>

     <sect1><title>Device Drivers Base</title>

!Idrivers/base/init.c

!Edrivers/base/driver.c

!Edrivers/base/core.c

!Edrivers/base/syscore.c

!Edrivers/base/class.c

!Idrivers/base/node.c

!Edrivers/base/firmware_class.c

!Edrivers/base/transport_class.c

<!-- Cannot be included, because
@@ -113,13 +116,18 @@ X!Iinclude/linux/kobject.h 
     exceed allowed 44 characters maximum

X!Edrivers/base/attribute_container.c

-->

!Edrivers/base/sys.c

!Edrivers/base/dd.c

<!--

X!Edrivers/base/interface.c

-->

!Iinclude/linux/platform_device.h

!Edrivers/base/platform.c

!Edrivers/base/bus.c

     </sect1>

     <sect1><title>Device Drivers DMA Management</title>

!Edrivers/base/dma-buf.c

!Edrivers/base/dma-coherent.c

!Edrivers/base/dma-mapping.c

     </sect1>

     <sect1><title>Device Drivers Power Management</title>

!Edrivers/base/power/main.c
@@ -219,7 +227,7 @@ X!Isound/sound_firmware.c 
  <chapter id="uart16x50">

     <title>16x50 UART Driver</title>

!Edrivers/tty/serial/serial_core.c

!Edrivers/tty/serial/8250.c

!Edrivers/tty/serial/8250/8250.c

  </chapter>



  <chapter id="fbdev">

MAINTAINERS

+14 −15
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ S: Maintained 
F:	drivers/net/ethernet/realtek/r8169.c



8250/16?50 (AND CLONE UARTS) SERIAL DRIVER

M:	Greg Kroah-Hartman <gregkh@suse.de>

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

L:	linux-serial@vger.kernel.org

W:	http://serial.sourceforge.net

S:	Maintained
@@ -1783,9 +1783,9 @@ X: net/wireless/wext* 


CHAR and MISC DRIVERS

M:	Arnd Bergmann <arnd@arndb.de>

M:	Greg Kroah-Hartman <greg@kroah.com>

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git

S:	Maintained

S:	Supported

F:	drivers/char/*

F:	drivers/misc/*
@@ -2320,7 +2320,7 @@ F: lib/lru_cache.c 
F:	Documentation/blockdev/drbd/



DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS

M:	Greg Kroah-Hartman <gregkh@suse.de>

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git

S:	Supported

F:	Documentation/kobject.txt
@@ -6276,15 +6276,15 @@ S: Maintained 
F:	arch/alpha/kernel/srm_env.c



STABLE BRANCH

M:	Greg Kroah-Hartman <greg@kroah.com>

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

L:	stable@vger.kernel.org

S:	Maintained

S:	Supported



STAGING SUBSYSTEM

M:	Greg Kroah-Hartman <gregkh@suse.de>

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git

L:	devel@driverdev.osuosl.org

S:	Maintained

S:	Supported

F:	drivers/staging/



STAGING - AGERE HERMES II and II.5 WIRELESS DRIVERS
@@ -6669,8 +6669,8 @@ S: Maintained 
K:	^Subject:.*(?i)trivial



TTY LAYER

M:	Greg Kroah-Hartman <gregkh@suse.de>

S:	Maintained

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

S:	Supported

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git

F:	drivers/tty/

F:	drivers/tty/serial/serial_core.c
@@ -6958,7 +6958,7 @@ S: Maintained 
F:	drivers/usb/serial/digi_acceleport.c



USB SERIAL DRIVER

M:	Greg Kroah-Hartman <gregkh@suse.de>

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

L:	linux-usb@vger.kernel.org

S:	Supported

F:	Documentation/usb/usb-serial.txt
@@ -6973,9 +6973,8 @@ S: Maintained 
F:	drivers/usb/serial/empeg.c



USB SERIAL KEYSPAN DRIVER

M:	Greg Kroah-Hartman <greg@kroah.com>

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

L:	linux-usb@vger.kernel.org

W:	http://www.kroah.com/linux/

S:	Maintained

F:	drivers/usb/serial/*keyspan*
@@ -7003,7 +7002,7 @@ F: Documentation/video4linux/sn9c102.txt 
F:	drivers/media/video/sn9c102/



USB SUBSYSTEM

M:	Greg Kroah-Hartman <gregkh@suse.de>

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

L:	linux-usb@vger.kernel.org

W:	http://www.linux-usb.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git
@@ -7090,7 +7089,7 @@ F: fs/hppfs/ 


USERSPACE I/O (UIO)

M:	"Hans J. Koch" <hjk@hansjkoch.de>

M:	Greg Kroah-Hartman <gregkh@suse.de>

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

S:	Maintained

F:	Documentation/DocBook/uio-howto.tmpl

F:	drivers/uio/

arch/microblaze/kernel/setup.c

+1 −20
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/cache.h>

#include <linux/of_platform.h>

#include <linux/dma-mapping.h>

#include <linux/cpu.h>

#include <asm/cacheflush.h>

#include <asm/entry.h>

#include <asm/cpuinfo.h>
@@ -227,23 +226,5 @@ static int __init setup_bus_notifier(void) 


	return 0;

}

arch_initcall(setup_bus_notifier);



static DEFINE_PER_CPU(struct cpu, cpu_devices);



static int __init topology_init(void)

{

	int i, ret;



	for_each_present_cpu(i) {

		struct cpu *c = &per_cpu(cpu_devices, i);



		ret = register_cpu(c, i);

		if (ret)

			printk(KERN_WARNING "topology_init: register_cpu %d "

						"failed (%d)\n", i, ret);

	}



	return 0;

}

subsys_initcall(topology_init);
 
arch_initcall(setup_bus_notifier);

arch/sparc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ config SPARC 
config SPARC32

	def_bool !64BIT

	select GENERIC_ATOMIC64

	select CLZ_TAB



config SPARC64

	def_bool 64BIT

arch/sparc/lib/divdi3.S

+1 −15
Original line number Diff line number Diff line
@@ -17,23 +17,9 @@ along with GNU CC; see the file COPYING. If not, write to 
the Free Software Foundation, 59 Temple Place - Suite 330,

Boston, MA 02111-1307, USA.  */



	.data

	.align 8

	.globl	__clz_tab

__clz_tab:

	.byte	0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5

	.byte	6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6

	.byte	7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7

	.byte	7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7

	.byte	8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8

	.byte	8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8

	.byte	8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8

	.byte	8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8

	.size	 __clz_tab,256

	.global .udiv



	.text

	.align 4

	.global .udiv

	.globl __divdi3

__divdi3:

	save %sp,-104,%sp