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

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



The UDP reuseport conflict was a little bit tricky.

The net-next code, via bpf-next, extracted the reuseport handling
into a helper so that the BPF sk lookup code could invoke it.

At the same time, the logic for reuseport handling of unconnected
sockets changed via commit efc6b6f6
which changed the logic to carry on the reuseport result into the
rest of the lookup loop if we do not return immediately.

This requires moving the reuseport_has_conns() logic into the callers.

While we are here, get rid of inline directives as they do not belong
in foo.c files.

The other changes were cases of more straightforward overlapping
modifications.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents dfecd3e0 04300d66

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -198,6 +198,9 @@ Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com> 
Mayuresh Janorkar <mayur@ti.com>

Michael Buesch <m@bues.ch>

Michel Dänzer <michel@tungstengraphics.com>

Mike Rapoport <rppt@kernel.org> <mike@compulab.co.il>

Mike Rapoport <rppt@kernel.org> <mike.rapoport@gmail.com>

Mike Rapoport <rppt@kernel.org> <rppt@linux.ibm.com>

Miodrag Dinic <miodrag.dinic@mips.com> <miodrag.dinic@imgtec.com>

Miquel Raynal <miquel.raynal@bootlin.com> <miquel.raynal@free-electrons.com>

Mitesh shah <mshah@teja.com>

Documentation/devicetree/bindings/sound/simple-card.yaml

+13 −4
Original line number Diff line number Diff line
@@ -378,6 +378,8 @@ examples: 
  - |

    sound {

        compatible = "simple-audio-card";

        #address-cells = <1>;

        #size-cells = <0>;



        simple-audio-card,name = "rsnd-ak4643";

        simple-audio-card,format = "left_j";
@@ -391,10 +393,12 @@ examples: 
                                    "ak4642 Playback", "DAI1 Playback";



        dpcmcpu: simple-audio-card,cpu@0 {

            reg = <0>;

            sound-dai = <&rcar_sound 0>;

        };



        simple-audio-card,cpu@1 {

            reg = <1>;

            sound-dai = <&rcar_sound 1>;

        };
@@ -418,6 +422,8 @@ examples: 
  - |

    sound {

        compatible = "simple-audio-card";

        #address-cells = <1>;

        #size-cells = <0>;



        simple-audio-card,routing =

            "pcm3168a Playback", "DAI1 Playback",
@@ -426,6 +432,7 @@ examples: 
            "pcm3168a Playback", "DAI4 Playback";



        simple-audio-card,dai-link@0 {

            reg = <0>;

            format = "left_j";

            bitclock-master = <&sndcpu0>;

            frame-master = <&sndcpu0>;
@@ -439,22 +446,23 @@ examples: 
        };



        simple-audio-card,dai-link@1 {

            reg = <1>;

            format = "i2s";

            bitclock-master = <&sndcpu1>;

            frame-master = <&sndcpu1>;



            convert-channels = <8>; /* TDM Split */



            sndcpu1: cpu@0 {

            sndcpu1: cpu0 {

                sound-dai = <&rcar_sound 1>;

            };

            cpu@1 {

            cpu1 {

                sound-dai = <&rcar_sound 2>;

            };

            cpu@2 {

            cpu2 {

                sound-dai = <&rcar_sound 3>;

            };

            cpu@3 {

            cpu3 {

                sound-dai = <&rcar_sound 4>;

            };

            codec {
@@ -466,6 +474,7 @@ examples: 
        };



        simple-audio-card,dai-link@2 {

            reg = <2>;

            format = "i2s";

            bitclock-master = <&sndcpu2>;

            frame-master = <&sndcpu2>;

Documentation/driver-api/ptp.rst

+12 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ PTP hardware clock infrastructure for Linux 
  + Ancillary clock features

    - Time stamp external events

    - Period output signals configurable from user space

    - Low Pass Filter (LPF) access from user space

    - Synchronization of the Linux system time via the PPS subsystem



PTP hardware clock kernel API
@@ -94,3 +95,14 @@ Supported hardware 


     - Auxiliary Slave/Master Mode Snapshot (optional interrupt)

     - Target Time (optional interrupt)



   * Renesas (IDT) ClockMatrix™



     - Up to 4 independent PHC channels

     - Integrated low pass filter (LPF), access via .adjPhase (compliant to ITU-T G.8273.2)

     - Programmable output periodic signals

     - Programmable inputs can time stamp external triggers

     - Driver and/or hardware configuration through firmware (idtcm.bin)

          - LPF settings (bandwidth, phase limiting, automatic holdover, physical layer assist (per ITU-T G.8273.2))

          - Programmable output PTP clocks, any frequency up to 1GHz (to other PHY/MAC time stampers, refclk to ASSPs/SoCs/FPGAs)

          - Lock to GNSS input, automatic switching between GNSS and user-space PHC control (optional)

Documentation/filesystems/overlayfs.rst

+2 −2
Original line number Diff line number Diff line
@@ -560,8 +560,8 @@ When the NFS export feature is enabled, all directory index entries are 
verified on mount time to check that upper file handles are not stale.

This verification may cause significant overhead in some cases.



Note: the mount options index=off,nfs_export=on are conflicting and will

result in an error.

Note: the mount options index=off,nfs_export=on are conflicting for a

read-write mount and will result in an error.





Testsuite

Documentation/networking/bareudp.rst

+13 −6
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ Usage 


1) Device creation & deletion



    a) ip link add dev bareudp0 type bareudp dstport 6635 ethertype 0x8847.

    a) ip link add dev bareudp0 type bareudp dstport 6635 ethertype mpls_uc



       This creates a bareudp tunnel device which tunnels L3 traffic with ethertype

       0x8847 (MPLS traffic). The destination port of the UDP header will be set to
@@ -34,14 +34,21 @@ Usage 


    b) ip link delete bareudp0



2) Device creation with multiple proto mode enabled

2) Device creation with multiproto mode enabled



There are two ways to create a bareudp device for MPLS & IP with multiproto mode

enabled.

The multiproto mode allows bareudp tunnels to handle several protocols of the

same family. It is currently only available for IP and MPLS. This mode has to

be enabled explicitly with the "multiproto" flag.



    a) ip link add dev  bareudp0 type bareudp dstport 6635 ethertype 0x8847 multiproto

    a) ip link add dev bareudp0 type bareudp dstport 6635 ethertype ipv4 multiproto



    b) ip link add dev  bareudp0 type bareudp dstport 6635 ethertype mpls

       For an IPv4 tunnel the multiproto mode allows the tunnel to also handle

       IPv6.



    b) ip link add dev bareudp0 type bareudp dstport 6635 ethertype mpls_uc multiproto



       For MPLS, the multiproto mode allows the tunnel to handle both unicast

       and multicast MPLS packets.



3) Device Usage

CRA Git | Maintained and supported by SUSTech CRA and CCSE