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

Commit 5d42f82a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'v3.16' into drm-next 

Linux 3.16

backmerge requested by i915, nouveau and radeon authors

Conflicts:
	drivers/gpu/drm/i915/i915_gem_render_state.c
	drivers/gpu/drm/i915/intel_drv.h
parents c759606c 19583ca5

.mailmap

+5 −0
Original line number Original line Diff line number Diff line
@@ -62,6 +62,11 @@ Jeff Garzik <jgarzik@pretzel.yyz.us> 
Jens Axboe <axboe@suse.de>

Jens Axboe <axboe@suse.de>

Jens Osterkamp <Jens.Osterkamp@de.ibm.com>

Jens Osterkamp <Jens.Osterkamp@de.ibm.com>

John Stultz <johnstul@us.ibm.com>

John Stultz <johnstul@us.ibm.com>

<josh@joshtriplett.org> <josh@freedesktop.org>

<josh@joshtriplett.org> <josh@kernel.org>

<josh@joshtriplett.org> <josht@linux.vnet.ibm.com>

<josh@joshtriplett.org> <josht@us.ibm.com>

<josh@joshtriplett.org> <josht@vnet.ibm.com>

Juha Yrjola <at solidboot.com>

Juha Yrjola <at solidboot.com>

Juha Yrjola <juha.yrjola@nokia.com>

Juha Yrjola <juha.yrjola@nokia.com>

Juha Yrjola <juha.yrjola@solidboot.com>

Juha Yrjola <juha.yrjola@solidboot.com>

CREDITS

+4 −3
Original line number Original line Diff line number Diff line
@@ -3511,10 +3511,11 @@ S: MacGregor A.C.T 2615 
S: Australia

S: Australia





N: Josh Triplett

N: Josh Triplett

E: josh@freedesktop.org

E: josh@joshtriplett.org

P: 1024D/D0FE7AFB B24A 65C9 1D71 2AC2 DE87  CA26 189B 9946 D0FE 7AFB

P: 4096R/8AFF873D 758E 5042 E397 4BA3 3A9C  1E67 0ED9 A3DF 8AFF 873D

D: rcutorture maintainer

D: RCU and rcutorture

D: lock annotations, finding and fixing lock bugs

D: lock annotations, finding and fixing lock bugs

D: kernel tinification





N: Winfried Trümper

N: Winfried Trümper

E: winni@xpilot.org

E: winni@xpilot.org

Documentation/Changes

+3 −6
Original line number Original line Diff line number Diff line
@@ -280,12 +280,9 @@ that is possible. 
mcelog

mcelog

------

------





In Linux 2.6.31+ the i386 kernel needs to run the mcelog utility

On x86 kernels the mcelog utility is needed to process and log machine check

as a regular cronjob similar to the x86-64 kernel to process and log

events when CONFIG_X86_MCE is enabled. Machine check events are errors reported

machine check events when CONFIG_X86_NEW_MCE is enabled. Machine check

by the CPU. Processing them is strongly encouraged.

events are errors reported by the CPU. Processing them is strongly encouraged.

All x86-64 kernels since 2.6.4 require the mcelog utility to

process machine checks.





Getting updated software

Getting updated software

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

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

Documentation/DocBook/gadget.tmpl

+1 −1
Original line number Original line Diff line number Diff line
@@ -708,7 +708,7 @@ hardware level details could be very different. 




<para>Systems need specialized hardware support to implement OTG,

<para>Systems need specialized hardware support to implement OTG,

notably including a special <emphasis>Mini-AB</emphasis> jack

notably including a special <emphasis>Mini-AB</emphasis> jack

and associated transciever to support <emphasis>Dual-Role</emphasis>

and associated transceiver to support <emphasis>Dual-Role</emphasis>

operation:

operation:

they can act either as a host, using the standard

they can act either as a host, using the standard

Linux-USB host side driver stack,

Linux-USB host side driver stack,

Documentation/DocBook/genericirq.tmpl

+2 −2
Original line number Original line Diff line number Diff line
@@ -182,7 +182,7 @@ 
	<para>

	<para>

	Each interrupt is described by an interrupt descriptor structure

	Each interrupt is described by an interrupt descriptor structure

	irq_desc. The interrupt is referenced by an 'unsigned int' numeric

	irq_desc. The interrupt is referenced by an 'unsigned int' numeric

	value which selects the corresponding interrupt decription structure

	value which selects the corresponding interrupt description structure

	in the descriptor structures array.

	in the descriptor structures array.

	The descriptor structure contains status information and pointers

	The descriptor structure contains status information and pointers

	to the interrupt flow method and the interrupt chip structure

	to the interrupt flow method and the interrupt chip structure
@@ -470,7 +470,7 @@ if (desc->irq_data.chip->irq_eoi) 
     <para>

     <para>

       To avoid copies of identical implementations of IRQ chips the

       To avoid copies of identical implementations of IRQ chips the

       core provides a configurable generic interrupt chip

       core provides a configurable generic interrupt chip

       implementation. Developers should check carefuly whether the

       implementation. Developers should check carefully whether the

       generic chip fits their needs before implementing the same

       generic chip fits their needs before implementing the same

       functionality slightly differently themselves.

       functionality slightly differently themselves.

     </para>

     </para>