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

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

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



S390 bpf_jit.S is removed in net-next and had changes in 'net',
since that code isn't used any more take the removal.

TLS data structures split the TX and RX components in 'net-next',
put the new struct members from the bug fix in 'net' into the RX
part.

The 'net-next' tree had some reworking of how the ERSPAN code works in
the GRE tunneling code, overlapping with a one-line headroom
calculation fix in 'net'.

Overlapping changes in __sock_map_ctx_update_elem(), keep the bits
that read the prog members via READ_ONCE() into local variables
before using them.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 44c752fe 6741c4bb

Documentation/ABI/testing/sysfs-class-cxl

+8 −0
Original line number Diff line number Diff line
@@ -244,3 +244,11 @@ Description: read only 
                Returns 1 if the psl timebase register is synchronized

                with the core timebase register, 0 otherwise.

Users:          https://github.com/ibm-capi/libcxl



What:           /sys/class/cxl/<card>/tunneled_ops_supported

Date:           May 2018

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read only

                Returns 1 if tunneled operations are supported in capi mode,

                0 otherwise.

Users:          https://github.com/ibm-capi/libcxl

Documentation/devicetree/bindings/net/marvell-pp2.txt

+5 −4
Original line number Diff line number Diff line
@@ -21,9 +21,10 @@ Required properties: 
	- main controller clock (for both armada-375-pp2 and armada-7k-pp2)

	- GOP clock (for both armada-375-pp2 and armada-7k-pp2)

	- MG clock (only for armada-7k-pp2)

	- MG Core clock (only for armada-7k-pp2)

	- AXI clock (only for armada-7k-pp2)

- clock-names: names of used clocks, must be "pp_clk", "gop_clk", "mg_clk"

  and "axi_clk" (the 2 latter only for armada-7k-pp2).

- clock-names: names of used clocks, must be "pp_clk", "gop_clk", "mg_clk",

  "mg_core_clk" and "axi_clk" (the 3 latter only for armada-7k-pp2).



The ethernet ports are represented by subnodes. At least one port is

required.
@@ -80,8 +81,8 @@ cpm_ethernet: ethernet@0 { 
	compatible = "marvell,armada-7k-pp22";

	reg = <0x0 0x100000>, <0x129000 0xb000>;

	clocks = <&cpm_syscon0 1 3>, <&cpm_syscon0 1 9>,

		 <&cpm_syscon0 1 5>, <&cpm_syscon0 1 18>;

	clock-names = "pp_clk", "gop_clk", "gp_clk", "axi_clk";

		 <&cpm_syscon0 1 5>, <&cpm_syscon0 1 6>, <&cpm_syscon0 1 18>;

	clock-names = "pp_clk", "gop_clk", "mg_clk", "mg_core_clk", "axi_clk";



	eth0: eth0 {

		interrupts = <ICU_GRP_NSR 39 IRQ_TYPE_LEVEL_HIGH>,

Documentation/devicetree/bindings/net/micrel-ksz90x1.txt

+7 −0
Original line number Diff line number Diff line
@@ -57,6 +57,13 @@ KSZ9031: 
      - txd2-skew-ps : Skew control of TX data 2 pad

      - txd3-skew-ps : Skew control of TX data 3 pad



    - micrel,force-master:

        Boolean, force phy to master mode. Only set this option if the phy

        reference clock provided at CLK125_NDO pin is used as MAC reference

        clock because the clock jitter in slave mode is to high (errata#2).

        Attention: The link partner must be configurable as slave otherwise

        no link will be established.



Examples:



	mdio {

Documentation/virtual/kvm/cpuid.txt

+3 −3
Original line number Diff line number Diff line
@@ -72,8 +72,8 @@ KVM_FEATURE_CLOCKSOURCE_STABLE_BIT || 24 || host will warn if no guest-side 


flag                               || value || meaning

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

KVM_HINTS_DEDICATED                ||     0 || guest checks this feature bit to

                                   ||       || determine if there is vCPU pinning

                                   ||       || and there is no vCPU over-commitment,

KVM_HINTS_REALTIME                 ||     0 || guest checks this feature bit to

                                   ||       || determine that vCPUs are never

                                   ||       || preempted for an unlimited time,

                                   ||       || allowing optimizations

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

MAINTAINERS

+9 −5
Original line number Diff line number Diff line
@@ -3690,7 +3690,6 @@ F: drivers/cpufreq/arm_big_little_dt.c 


CPU POWER MONITORING SUBSYSTEM

M:	Thomas Renninger <trenn@suse.com>

M:	Shuah Khan <shuahkh@osg.samsung.com>

M:	Shuah Khan <shuah@kernel.org>

L:	linux-pm@vger.kernel.org

S:	Maintained
@@ -4309,7 +4308,7 @@ F: Documentation/driver-api/dma-buf.rst 
T:	git git://anongit.freedesktop.org/drm/drm-misc



DMA GENERIC OFFLOAD ENGINE SUBSYSTEM

M:	Vinod Koul <vinod.koul@intel.com>

M:	Vinod Koul <vkoul@kernel.org>

L:	dmaengine@vger.kernel.org

Q:	https://patchwork.kernel.org/project/linux-dmaengine/list/

S:	Maintained
@@ -7694,10 +7693,10 @@ F: include/linux/sunrpc/ 
F:	include/uapi/linux/sunrpc/



KERNEL SELFTEST FRAMEWORK

M:	Shuah Khan <shuahkh@osg.samsung.com>

M:	Shuah Khan <shuah@kernel.org>

L:	linux-kselftest@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git

Q:	https://patchwork.kernel.org/project/linux-kselftest/list/

S:	Maintained

F:	tools/testing/selftests/

F:	Documentation/dev-tools/kselftest*
@@ -12218,7 +12217,7 @@ F: Documentation/s390/vfio-ccw.txt 
F:	include/uapi/linux/vfio_ccw.h



S390 ZCRYPT DRIVER

M:	Harald Freudenberger <freude@de.ibm.com>

M:	Harald Freudenberger <freude@linux.ibm.com>

L:	linux-s390@vger.kernel.org

W:	http://www.ibm.com/developerworks/linux/linux390/

S:	Supported
@@ -13262,6 +13261,12 @@ M: Jan-Benedict Glaw <jbglaw@lug-owl.de> 
S:	Maintained

F:	arch/alpha/kernel/srm_env.c



ST STM32 I2C/SMBUS DRIVER

M:	Pierre-Yves MORDRET <pierre-yves.mordret@st.com>

L:	linux-i2c@vger.kernel.org

S:	Maintained

F:	drivers/i2c/busses/i2c-stm32*



STABLE BRANCH

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

L:	stable@vger.kernel.org
@@ -14649,7 +14654,6 @@ F: drivers/usb/common/usb-otg-fsm.c 


USB OVER IP DRIVER

M:	Valentina Manea <valentina.manea.m@gmail.com>

M:	Shuah Khan <shuahkh@osg.samsung.com>

M:	Shuah Khan <shuah@kernel.org>

L:	linux-usb@vger.kernel.org

S:	Maintained