Commit c248b27c authored by Paolo Abeni's avatar Paolo Abeni
Browse files

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



No conflicts.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 28b17f62 50749f2d

Documentation/devicetree/bindings/arm/mediatek/mediatek,mt7622-wed.yaml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ properties: 
    items:

      - enum:

          - mediatek,mt7622-wed

          - mediatek,mt7981-wed

          - mediatek,mt7986-wed

      - const: syscon

Documentation/networking/rxrpc.rst

+12 −5
Original line number Diff line number Diff line
@@ -848,14 +848,21 @@ The kernel interface functions are as follows: 
     returned.  The caller now holds a reference on this and it must be

     properly ended.



 (#) End a client call::

 (#) Shut down a client call::



	void rxrpc_kernel_end_call(struct socket *sock,

	void rxrpc_kernel_shutdown_call(struct socket *sock,

					struct rxrpc_call *call);



     This is used to end a previously begun call.  The user_call_ID is expunged

     from AF_RXRPC's knowledge and will not be seen again in association with

     the specified call.

     This is used to shut down a previously begun call.  The user_call_ID is

     expunged from AF_RXRPC's knowledge and will not be seen again in

     association with the specified call.



 (#) Release the ref on a client call::



	void rxrpc_kernel_put_call(struct socket *sock,

				   struct rxrpc_call *call);



     This is used to release the caller's ref on an rxrpc call.



 (#) Send data through a call::

MAINTAINERS

+2 −3
Original line number Diff line number Diff line
@@ -8706,7 +8706,7 @@ F: drivers/input/touchscreen/goodix* 








GOOGLE ETHERNET DRIVERS









M:	Jeroen de Borst <jeroendb@google.com>









M:	Catherine Sullivan <csully@google.com>









M:	Praveen Kaligineedi <pkaligineedi@google.com>









R:	Shailend Chand <shailend@google.com>









L:	netdev@vger.kernel.org









S:	Supported








@@ -16817,9 +16817,8 @@ F:	include/uapi/linux/if_pppol2tp.h







F:	net/l2tp/l2tp_ppp.c

















PPP PROTOCOL DRIVERS AND COMPRESSORS









M:	Paul Mackerras <paulus@samba.org>









L:	linux-ppp@vger.kernel.org









S:	Maintained









S:	Orphan









F:	drivers/net/ppp/ppp_*

















PPS SUPPORT
































drivers/net/ethernet/amd/nmclan_cs.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -651,7 +651,7 @@ static int nmclan_config(struct pcmcia_device *link)







    } else {









      pr_notice("mace id not found: %x %x should be 0x40 0x?9\n",









		sig[0], sig[1]);









      return -ENODEV;









      goto failed;









    }









  }










































drivers/net/ethernet/freescale/dpaa/dpaa_eth.c



+2
−1






























Original line number
Diff line number
Diff line







@@ -299,7 +299,8 @@ static int dpaa_stop(struct net_device *net_dev)







{









	struct mac_device *mac_dev;









	struct dpaa_priv *priv;









	int i, err, error;









	int i, error;









	int err = 0;



















	priv = netdev_priv(net_dev);









	mac_dev = priv->mac_dev;