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

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

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



Minor conflicts in drivers/net/ethernet/mellanox/mlx5/core/en_rep.c,
we had some overlapping changes:

1) In 'net' MLX5E_PARAMS_LOG_{SQ,RQ}_SIZE -->
   MLX5E_REP_PARAMS_LOG_{SQ,RQ}_SIZE

2) In 'net-next' params->log_rq_size is renamed to be
   params->log_rq_mtu_frames.

3) In 'net-next' params->hard_mtu is added.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 859a5935 b5dbc287

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ Frank Zago <fzago@systemfabricworks.com> 
Greg Kroah-Hartman <greg@echidna.(none)>

Greg Kroah-Hartman <gregkh@suse.de>

Greg Kroah-Hartman <greg@kroah.com>

Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>

Henk Vergonet <Henk.Vergonet@gmail.com>

Henrik Kretzschmar <henne@nachtwindheim.de>

Henrik Rydberg <rydberg@bitmath.org>

Documentation/devicetree/bindings/iio/adc/sigma-delta-modulator.txt

+2 −2
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ Device-Tree bindings for sigma delta modulator 
Required properties:

- compatible: should be "ads1201", "sd-modulator". "sd-modulator" can be use

	as a generic SD modulator if modulator not specified in compatible list.

- #io-channel-cells = <1>: See the IIO bindings section "IIO consumers".

- #io-channel-cells = <0>: See the IIO bindings section "IIO consumers".



Example node:



	ads1202: adc@0 {

		compatible = "sd-modulator";

		#io-channel-cells = <1>;

		#io-channel-cells = <0>;

	};

Documentation/isdn/INTERFACE.CAPI

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ corresponding hardware driver. Kernel CAPI then forwards CAPI messages in both 
directions between the application and the hardware driver.



Format and semantics of CAPI messages are specified in the CAPI 2.0 standard.

This standard is freely available from http://www.capi.org.

This standard is freely available from https://www.capi.org.





2. Driver and Device Registration

Documentation/isdn/README

+2 −2
Original line number Diff line number Diff line
@@ -33,10 +33,10 @@ README for the ISDN-subsystem 
     de.alt.comm.isdn4linux



  There is also a well maintained FAQ in English available at

     http://www.mhessler.de/i4lfaq/

     https://www.mhessler.de/i4lfaq/

  It can be viewed online, or downloaded in sgml/text/html format.

  The FAQ can also be viewed online at

     http://www.isdn4linux.de/faq/

     https://www.isdn4linux.de/faq/i4lfaq.html

  or downloaded from

     ftp://ftp.isdn4linux.de/pub/isdn4linux/FAQ/

Documentation/isdn/README.FAQ

+2 −2
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ You find it in: 


In case you just want to see the FAQ online, or download the newest version,

you can have a look at my website:

http://www.mhessler.de/i4lfaq/ (view + download)

https://www.mhessler.de/i4lfaq/ (view + download)

or:

http://www.isdn4linux.de/faq/ (view)

https://www.isdn4linux.de/faq/4lfaq.html (view)



As the extension tells, the FAQ is in SGML format, and you can convert it

into text/html/... format by using the sgml2txt/sgml2html/... tools.