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

Commit d5ef8a4d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Conflicts:
	drivers/infiniband/hw/nes/nes_cm.c

Simple whitespace conflict.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d9dd966d 8df54d62

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">

Documentation/input/event-codes.txt

+64 −8
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ reports supported by a device are also provided by sysfs in 
class/input/event*/device/capabilities/, and the properties of a device are

provided in class/input/event*/device/properties.



Types:

==========

Types are groupings of codes under a logical input construct. Each type has a

set of applicable codes to be used in generating events. See the Codes section

for details on valid codes for each type.

Event types:

===========

Event types are groupings of codes under a logical input construct. Each

type has a set of applicable codes to be used in generating events. See the

Codes section for details on valid codes for each type.



* EV_SYN:

  - Used as markers to separate events. Events may be separated in time or in
@@ -63,9 +63,9 @@ for details on valid codes for each type. 
* EV_FF_STATUS:

  - Used to receive force feedback device status.



Codes:

==========

Codes define the precise type of event.

Event codes:

===========

Event codes define the precise type of event.



EV_SYN:

----------
@@ -220,6 +220,56 @@ EV_PWR: 
EV_PWR events are a special type of event used specifically for power

mangement. Its usage is not well defined. To be addressed later.



Device properties:

=================

Normally, userspace sets up an input device based on the data it emits,

i.e., the event types. In the case of two devices emitting the same event

types, additional information can be provided in the form of device

properties.



INPUT_PROP_DIRECT + INPUT_PROP_POINTER:

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

The INPUT_PROP_DIRECT property indicates that device coordinates should be

directly mapped to screen coordinates (not taking into account trivial

transformations, such as scaling, flipping and rotating). Non-direct input

devices require non-trivial transformation, such as absolute to relative

transformation for touchpads. Typical direct input devices: touchscreens,

drawing tablets; non-direct devices: touchpads, mice.



The INPUT_PROP_POINTER property indicates that the device is not transposed

on the screen and thus requires use of an on-screen pointer to trace user's

movements.  Typical pointer devices: touchpads, tablets, mice; non-pointer

device: touchscreen.



If neither INPUT_PROP_DIRECT or INPUT_PROP_POINTER are set, the property is

considered undefined and the device type should be deduced in the

traditional way, using emitted event types.



INPUT_PROP_BUTTONPAD:

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

For touchpads where the button is placed beneath the surface, such that

pressing down on the pad causes a button click, this property should be

set. Common in clickpad notebooks and macbooks from 2009 and onwards.



Originally, the buttonpad property was coded into the bcm5974 driver

version field under the name integrated button. For backwards

compatibility, both methods need to be checked in userspace.



INPUT_PROP_SEMI_MT:

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

Some touchpads, most common between 2008 and 2011, can detect the presence

of multiple contacts without resolving the individual positions; only the

number of contacts and a rectangular shape is known. For such

touchpads, the semi-mt property should be set.



Depending on the device, the rectangle may enclose all touches, like a

bounding box, or just some of them, for instance the two most recent

touches. The diversity makes the rectangle of limited use, but some

gestures can normally be extracted from it.



If INPUT_PROP_SEMI_MT is not set, the device is assumed to be a true MT

device.



Guidelines:

==========

The guidelines below ensure proper single-touch and multi-finger functionality.
@@ -240,6 +290,8 @@ used to report when a touch is active on the screen. 
BTN_{MOUSE,LEFT,MIDDLE,RIGHT} must not be reported as the result of touch

contact. BTN_TOOL_<name> events should be reported where possible.



For new hardware, INPUT_PROP_DIRECT should be set.



Trackpads:

----------

Legacy trackpads that only provide relative position information must report
@@ -250,6 +302,8 @@ location of the touch. BTN_TOUCH should be used to report when a touch is active 
on the trackpad. Where multi-finger support is available, BTN_TOOL_<name> should

be used to report the number of touches active on the trackpad.



For new hardware, INPUT_PROP_POINTER should be set.



Tablets:

----------

BTN_TOOL_<name> events must be reported when a stylus or other tool is active on
@@ -260,3 +314,5 @@ button may be used for buttons on the tablet except BTN_{MOUSE,LEFT}. 
BTN_{0,1,2,etc} are good generic codes for unlabeled buttons. Do not use

meaningful buttons, like BTN_FORWARD, unless the button is labeled for that

purpose on the device.



For new hardware, both INPUT_PROP_DIRECT and INPUT_PROP_POINTER should be set.

Documentation/sysctl/kernel.txt

+2 −0
Original line number Diff line number Diff line
@@ -601,6 +601,8 @@ can be ORed together: 
        instead of using the one provided by the hardware.

 512 - A kernel warning has occurred.

1024 - A module from drivers/staging was loaded.

2048 - The system is working around a severe firmware bug.

4096 - An out-of-tree module has been loaded.



==============================================================

MAINTAINERS

+25 −31
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
@@ -789,12 +789,6 @@ F: arch/arm/mach-mx*/ 
F:	arch/arm/mach-imx/

F:	arch/arm/plat-mxc/



ARM/FREESCALE IMX51

M:	Amit Kucheria <amit.kucheria@canonical.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-mx5/



ARM/FREESCALE IMX6

M:	Shawn Guo <shawn.guo@linaro.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1784,9 +1778,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/*
@@ -2289,7 +2283,7 @@ F: drivers/acpi/dock.c 
DOCUMENTATION

M:	Randy Dunlap <rdunlap@xenotime.net>

L:	linux-doc@vger.kernel.org

T:	quilt http://userweb.kernel.org/~rdunlap/kernel-doc-patches/current/

T:	quilt http://xenotime.net/kernel-doc-patches/current/

S:	Maintained

F:	Documentation/
@@ -2322,7 +2316,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
@@ -3326,6 +3320,12 @@ S: Maintained 
F:	net/ieee802154/

F:	drivers/ieee802154/



IIO SUBSYSTEM AND DRIVERS

M:	Jonathan Cameron <jic23@cam.ac.uk>

L:	linux-iio@vger.kernel.org

S:	Maintained

F:	drivers/staging/iio/



IKANOS/ADI EAGLE ADSL USB DRIVER

M:	Matthieu Castet <castet.matthieu@free.fr>

M:	Stanislaw Gruszka <stf_xl@wp.pl>
@@ -3994,11 +3994,11 @@ M: Rusty Russell <rusty@rustcorp.com.au> 
L:	lguest@lists.ozlabs.org

W:	http://lguest.ozlabs.org/

S:	Odd Fixes

F:	Documentation/virtual/lguest/

F:	arch/x86/include/asm/lguest*.h

F:	arch/x86/lguest/

F:	drivers/lguest/

F:	include/linux/lguest*.h

F:	arch/x86/include/asm/lguest*.h

F:	tools/lguest/



LINUX FOR IBM pSERIES (RS/6000)

M:	Paul Mackerras <paulus@au.ibm.com>
@@ -4138,7 +4138,7 @@ L: linux-ntfs-dev@lists.sourceforge.net 
W:	http://www.linux-ntfs.org/content/view/19/37/

S:	Maintained

F:	Documentation/ldm.txt

F:	fs/partitions/ldm.*

F:	block/partitions/ldm.*



LogFS

M:	Joern Engel <joern@logfs.org>
@@ -5635,7 +5635,7 @@ W: http://www.ibm.com/developerworks/linux/linux390/ 
S:	Supported

F:	arch/s390/

F:	drivers/s390/

F:	fs/partitions/ibm.c

F:	block/partitions/ibm.c

F:	Documentation/s390/

F:	Documentation/DocBook/s390*
@@ -6278,15 +6278,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
@@ -6398,11 +6398,6 @@ M: Omar Ramirez Luna <omar.ramirez@ti.com> 
S:	Odd Fixes

F:	drivers/staging/tidspbridge/



STAGING - TRIDENT TVMASTER TMxxxx USB VIDEO CAPTURE DRIVERS

L:	linux-media@vger.kernel.org

S:	Odd Fixes

F:	drivers/staging/tm6000/



STAGING - USB ENE SM/MS CARD READER DRIVER

M:	Al Cho <acho@novell.com>

S:	Odd Fixes
@@ -6671,8 +6666,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
@@ -6960,7 +6955,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
@@ -6975,9 +6970,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*
@@ -7005,7 +6999,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
@@ -7092,7 +7086,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/

Makefile

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

PATCHLEVEL = 3

SUBLEVEL = 0

EXTRAVERSION = -rc1

EXTRAVERSION = -rc3

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*