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

Commit 7a7368a5 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' into perf/core, to pick up fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 1ccb8fed 1289e0e2

Documentation/networking/index.rst

+1 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Contents: 
   batman-adv

   kapi

   z8530book

   msg_zerocopy



.. only::  subproject
@@ -16,4 +17,3 @@ Contents: 
   =======



   * :ref:`genindex`

Documentation/networking/msg_zerocopy.rst

+4 −0
Original line number Diff line number Diff line
@@ -72,6 +72,10 @@ this flag, a process must first signal intent by setting a socket option: 
	if (setsockopt(fd, SOL_SOCKET, SO_ZEROCOPY, &one, sizeof(one)))

		error(1, errno, "setsockopt zerocopy");



Setting the socket option only works when the socket is in its initial

(TCP_CLOSED) state.  Trying to set the option for a socket returned by accept(),

for example, will lead to an EBUSY error. In this case, the option should be set

to the listening socket and it will be inherited by the accepted sockets.



Transmission

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

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -10134,7 +10134,7 @@ F: drivers/irqchip/irq-ompic.c 
F:	drivers/irqchip/irq-or1k-*



OPENVSWITCH

M:	Pravin Shelar <pshelar@nicira.com>

M:	Pravin B Shelar <pshelar@ovn.org>

L:	netdev@vger.kernel.org

L:	dev@openvswitch.org

W:	http://openvswitch.org

Makefile

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

PATCHLEVEL = 15

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Fearless Coyote



# *DOCUMENTATION*

arch/arc/boot/dts/axc003.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -35,6 +35,14 @@ 
			reg = <0x80 0x10>, <0x100 0x10>;

			#clock-cells = <0>;

			clocks = <&input_clk>;



			/*

			 * Set initial core pll output frequency to 90MHz.

			 * It will be applied at the core pll driver probing

			 * on early boot.

			 */

			assigned-clocks = <&core_clk>;

			assigned-clock-rates = <90000000>;

		};



		core_intc: archs-intc@cpu {