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
dt-bindings: ti-sysc: Update binding for timers and capabilities
2017-12-15 09:39:11 -08:00
clk
clock
Merge branch 'clk-stm32mp1' into clk-fixes
2018-04-16 08:58:39 -07:00
display
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
dma
gpio
ARM: SoC device tree updates for 4.17
2018-04-05 21:18:09 -07:00
i2c
iio
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
input
Input: gpio-keys - add support for wakeup event action
2018-03-14 10:13:22 -07:00
interrupt-controller
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
leds
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mailbox
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
media
media: dt-bindings: Add bindings for TDA1997X
2018-02-22 12:45:42 -05:00
memory
dt-bindings: memory: Add Tegra186 support
2017-12-13 12:53:43 +01:00
mfd
dt-bindings: mfd: Add STM32F7 SDMMC2 rcc entry
2018-03-05 09:04:25 +01:00
mips
mux
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net
lan78xx: Read LED states from Device Tree
2018-04-20 11:39:09 -04:00
phy
pinctrl
dt-bindings: pinctrl: mediatek: add bindings for I2C2 and SPI2 on MT7623
2018-03-02 08:44:24 +01:00
power
ARM: SoC driver updates for 4.17
2018-04-05 21:29:35 -07:00
pwm
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
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
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
sound
ASoC: rt5651: move definitions of dt-binding constants to include/dt-bindings
2018-03-12 14:15:51 -07:00
spmi
thermal
ARM: Device-tree updates for 4.15
2017-11-16 15:48:26 -08:00