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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



Just minor overlapping changes in the conflicts here.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 05bb5203 33920f1e

.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -142,3 +142,6 @@ x509.genkey 


# Kdevelop4

*.kdev4



# Clang's compilation database file

/compile_commands.json

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com> 
Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>

<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>

Jean Tourrilhes <jt@hpl.hp.com>

<jean-philippe@linaro.org> <jean-philippe.brucker@arm.com>

Jeff Garzik <jgarzik@pretzel.yyz.us>

Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>

Jeff Layton <jlayton@kernel.org> <jlayton@poochiereds.net>
@@ -116,6 +117,7 @@ John Stultz <johnstul@us.ibm.com> 
Juha Yrjola <at solidboot.com>

Juha Yrjola <juha.yrjola@nokia.com>

Juha Yrjola <juha.yrjola@solidboot.com>

Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>

Kay Sievers <kay.sievers@vrfy.org>

Kenneth W Chen <kenneth.w.chen@intel.com>

Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
@@ -132,6 +134,7 @@ Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch> 
Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>

Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>

Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>

Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>

Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>

Mark Brown <broonie@sirena.org.uk>

Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>

Documentation/PCI/pci-error-recovery.rst

+4 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ That is, the recovery API only requires that: 
.. note::



   Implementation details for the powerpc platform are discussed in

   the file Documentation/powerpc/eeh-pci-error-recovery.txt

   the file Documentation/powerpc/eeh-pci-error-recovery.rst



   As of this writing, there is a growing list of device drivers with

   patches implementing error recovery. Not all of these patches are in
@@ -421,3 +421,6 @@ That is, the recovery API only requires that: 
   - drivers/net/ixgbe

   - drivers/net/cxgb3

   - drivers/net/s2io.c



The End

-------

Documentation/RCU/rculist_nulls.txt

+1 −1
Original line number Diff line number Diff line 
Using hlist_nulls to protect read-mostly linked lists and

objects using SLAB_TYPESAFE_BY_RCU allocations.



Please read the basics in Documentation/RCU/listRCU.txt

Please read the basics in Documentation/RCU/listRCU.rst



Using special makers (called 'nulls') is a convenient way

to solve following problem :

Documentation/admin-guide/conf.py

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
# -*- coding: utf-8; mode: python -*-



project = 'Linux Kernel User Documentation'



tags.add("subproject")



latex_documents = [

    ('index', 'linux-user.tex', 'Linux Kernel User Documentation',

     'The kernel development community', 'manual'),

]