original_kernel/include/dt-bindings
David S. Miller b2d6cee117 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The bpf syscall and selftests conflicts were trivial
overlapping changes.

The r8169 change involved moving the added mdelay from 'net' into a
different function.

A TLS close bug fix overlapped with the splitting of the TLS state
into separate TX and RX parts.  I just expanded the tests in the bug
fix from "ctx->conf == X" into "ctx->tx_conf == X && ctx->rx_conf
== X".

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-05-11 20:53:22 -04:00
..
arm
bus
clk
clock Merge branch 'clk-stm32mp1' into clk-fixes 2018-04-16 08:58:39 -07:00
display
dma
gpio ARM: SoC device tree updates for 4.17 2018-04-05 21:18:09 -07:00
i2c
iio
input
interrupt-controller
leds
mailbox
media
memory
mfd
mips
mux
net lan78xx: Read LED states from Device Tree 2018-04-20 11:39:09 -04:00
phy
pinctrl
power ARM: SoC driver updates for 4.17 2018-04-05 21:29:35 -07:00
pwm
regulator
reset The large diff this time around is from the addition of a new clk driver 2018-04-13 15:51:06 -07:00
soc
sound
spmi
thermal