Commit f83f7151 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 comment merge conflict in mlx5.

Staging driver has a fixup due to the skb->xmit_more changes
in 'net-next', but was removed in 'net'.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8f4043f1 7f46774c

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -156,6 +156,8 @@ Morten Welinder <welinder@darter.rentec.com> 
Morten Welinder <welinder@troll.com>

Mythri P K <mythripk@ti.com>

Nguyen Anh Quynh <aquynh@gmail.com>

Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>

Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

Patrick Mochel <mochel@digitalimplant.org>

Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
@@ -224,3 +226,5 @@ Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com> 
Yusuke Goda <goda.yusuke@renesas.com>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

Gustavo Padovan <padovan@profusion.mobi>

Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>

Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>

Documentation/bpf/btf.rst

+4 −4
Original line number Diff line number Diff line
@@ -148,16 +148,16 @@ The ``btf_type.size * 8`` must be equal to or greater than ``BTF_INT_BITS()`` 
for the type. The maximum value of ``BTF_INT_BITS()`` is 128.



The ``BTF_INT_OFFSET()`` specifies the starting bit offset to calculate values

for this int. For example, a bitfield struct member has: * btf member bit

offset 100 from the start of the structure, * btf member pointing to an int

type, * the int type has ``BTF_INT_OFFSET() = 2`` and ``BTF_INT_BITS() = 4``

for this int. For example, a bitfield struct member has:

 * btf member bit offset 100 from the start of the structure,

 * btf member pointing to an int type,

 * the int type has ``BTF_INT_OFFSET() = 2`` and ``BTF_INT_BITS() = 4``



Then in the struct memory layout, this member will occupy ``4`` bits starting

from bits ``100 + 2 = 102``.



Alternatively, the bitfield struct member can be the following to access the

same bits as the above:



 * btf member bit offset 102,

 * btf member pointing to an int type,

 * the int type has ``BTF_INT_OFFSET() = 0`` and ``BTF_INT_BITS() = 4``

Documentation/devicetree/bindings/hwmon/adc128d818.txt

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ Required node properties: 


Optional node properties:



 - ti,mode:     Operation mode (see above).

 - ti,mode:     Operation mode (u8) (see above).





Example (operation mode 2):
@@ -34,5 +34,5 @@ Example (operation mode 2): 
	adc128d818@1d {

		compatible = "ti,adc128d818";

		reg = <0x1d>;

		ti,mode = <2>;

		ti,mode = /bits/ 8 <2>;

	};