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

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



The netfilter conflicts were rather simple overlapping
changes.

However, the cls_tcindex.c stuff was a bit more complex.

On the 'net' side, Cong is fixing several races and memory
leaks.  Whilst on the 'net-next' side we have Vlad adding
the rtnl-ness support.

What I've decided to do, in order to resolve this, is revert the
conversion over to using a workqueue that Cong did, bringing us back
to pure RCU.  I did it this way because I believe that either Cong's
races don't apply with have Vlad did things, or Cong will have to
implement the race fix slightly differently.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 50f444aa 24f0a487

Documentation/admin-guide/kernel-parameters.txt

+3 −4
Original line number Diff line number Diff line
@@ -1701,12 +1701,11 @@ 
			By default, super page will be supported if Intel IOMMU

			has the capability. With this option, super page will

			not be supported.

		sm_off [Default Off]

			By default, scalable mode will be supported if the

		sm_on [Default Off]

			By default, scalable mode will be disabled even if the

			hardware advertises that it has support for the scalable

			mode translation. With this option set, scalable mode

			will not be used even on hardware which claims to support

			it.

			will be used on hardware which claims to support it.

		tboot_noforce [Default Off]

			Do not force the Intel IOMMU enabled under tboot.

			By default, tboot will force Intel IOMMU on, which

Documentation/networking/operstates.txt

+8 −6
Original line number Diff line number Diff line
@@ -22,8 +22,9 @@ and changeable from userspace under certain rules. 
2. Querying from userspace



Both admin and operational state can be queried via the netlink

operation RTM_GETLINK. It is also possible to subscribe to RTMGRP_LINK

to be notified of updates. This is important for setting from userspace.

operation RTM_GETLINK. It is also possible to subscribe to RTNLGRP_LINK

to be notified of updates while the interface is admin up. This is

important for setting from userspace.



These values contain interface state:
@@ -101,8 +102,9 @@ because some driver controlled protocol establishment has to 
complete. Corresponding functions are netif_dormant_on() to set the

flag, netif_dormant_off() to clear it and netif_dormant() to query.



On device allocation, networking core sets the flags equivalent to

netif_carrier_ok() and !netif_dormant().

On device allocation, both flags __LINK_STATE_NOCARRIER and

__LINK_STATE_DORMANT are cleared, so the effective state is equivalent

to netif_carrier_ok() and !netif_dormant().





Whenever the driver CHANGES one of these flags, a workqueue event is
@@ -133,11 +135,11 @@ netif_carrier_ok() && !netif_dormant() is set by the 
driver. Afterwards, the userspace application can set IFLA_OPERSTATE

to IF_OPER_DORMANT or IF_OPER_UP as long as the driver does not set

netif_carrier_off() or netif_dormant_on(). Changes made by userspace

are multicasted on the netlink group RTMGRP_LINK.

are multicasted on the netlink group RTNLGRP_LINK.



So basically a 802.1X supplicant interacts with the kernel like this:



-subscribe to RTMGRP_LINK

-subscribe to RTNLGRP_LINK

-set IFLA_LINKMODE to 1 via RTM_SETLINK

-query RTM_GETLINK once to get initial state

-if initial flags are not (IFF_LOWER_UP && !IFF_DORMANT), wait until

Documentation/sysctl/fs.txt

+3 −1
Original line number Diff line number Diff line
@@ -80,7 +80,9 @@ nonzero when shrink_dcache_pages() has been called and the 
dcache isn't pruned yet.



nr_negative shows the number of unused dentries that are also

negative dentries which do not mapped to actual files.

negative dentries which do not map to any files. Instead,

they help speeding up rejection of non-existing files provided

by the users.



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

MAINTAINERS

+5 −3
Original line number Diff line number Diff line
@@ -5192,7 +5192,7 @@ DRM DRIVERS FOR XEN 
M:	Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>

T:	git git://anongit.freedesktop.org/drm/drm-misc

L:	dri-devel@lists.freedesktop.org

L:	xen-devel@lists.xen.org

L:	xen-devel@lists.xenproject.org (moderated for non-subscribers)

S:	Supported

F:	drivers/gpu/drm/xen/

F:	Documentation/gpu/xen-front.rst
@@ -6165,7 +6165,7 @@ FREESCALE SOC SOUND DRIVERS 
M:	Timur Tabi <timur@kernel.org>

M:	Nicolin Chen <nicoleotsuka@gmail.com>

M:	Xiubo Li <Xiubo.Lee@gmail.com>

R:	Fabio Estevam <fabio.estevam@nxp.com>

R:	Fabio Estevam <festevam@gmail.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

L:	linuxppc-dev@lists.ozlabs.org

S:	Maintained
@@ -10913,7 +10913,7 @@ F: include/linux/nvmem-consumer.h 
F:	include/linux/nvmem-provider.h



NXP SGTL5000 DRIVER

M:	Fabio Estevam <fabio.estevam@nxp.com>

M:	Fabio Estevam <festevam@gmail.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Maintained

F:	Documentation/devicetree/bindings/sound/sgtl5000.txt
@@ -11327,10 +11327,12 @@ F: include/dt-bindings/ 


OPENCORES I2C BUS DRIVER

M:	Peter Korsgaard <peter@korsgaard.com>

M:	Andrew Lunn <andrew@lunn.ch>

L:	linux-i2c@vger.kernel.org

S:	Maintained

F:	Documentation/i2c/busses/i2c-ocores

F:	drivers/i2c/busses/i2c-ocores.c

F:	include/linux/platform_data/i2c-ocores.h



OPENRISC ARCHITECTURE

M:	Jonas Bonn <jonas@southpole.se>

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
VERSION = 5

PATCHLEVEL = 0

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Shy Crocodile



# *DOCUMENTATION*

CRA Git | Maintained and supported by SUSTech CRA and CCSE