2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 20:53:53 +08:00
linux-next/Documentation/devicetree
David S. Miller e1ea2f9856 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Several conflicts here.

NFP driver bug fix adding nfp_netdev_is_nfp_repr() check to
nfp_fl_output() needed some adjustments because the code block is in
an else block now.

Parallel additions to net/pkt_cls.h and net/sch_generic.h

A bug fix in __tcp_retransmit_skb() conflicted with some of
the rbtree changes in net-next.

The tc action RCU callback fixes in 'net' had some overlap with some
of the recent tcf_block reworking.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-30 21:09:24 +09:00
..
bindings Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-10-30 21:09:24 +09:00
00-INDEX
booting-without-of.txt dt-bindings: update OpenFirmware document links to devicetree.org 2017-08-01 12:24:07 -05:00
changesets.txt
dynamic-resolution-notes.txt
of_unittest.txt
overlay-notes.txt Documentation: remove overlay-notes reference to non-existent file 2017-06-22 11:14:01 -05:00
todo.txt
usage-model.txt of: update ePAPR references to point to Devicetree Specification 2017-06-22 11:22:06 -05:00