1
0
Fork 0
alistair23-linux/drivers/staging
David S. Miller 89b1698c93 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
The BTF conflicts were simple overlapping changes.

The virtio_net conflict was an overlap of a fix of statistics counter,
happening alongisde a move over to a bonafide statistics structure
rather than counting value on the stack.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-08-02 10:55:32 -07:00
..
android staging: ashmem: Fix SIGBUS crash when traversing mmaped ashmem pages 2018-08-01 10:08:57 -07:00
board staging: board: Replace license boilerplate with SPDX identifiers 2018-05-06 19:11:23 -07:00
clocking-wizard
comedi staging: comedi: quatech_daqp_cs: fix no-op loop daqp_ao_insn_write() 2018-06-25 22:54:04 +08:00
dgnc
emxx_udc staging: emxx_udc: Add GPIO descriptor work to TODO 2018-04-23 14:36:10 +02:00
fbtft - Core Frameworks 2018-06-11 07:23:19 -07:00
fsl-dpaa2 Staging/IIO patches for 4.18-rc1 2018-06-09 10:32:39 -07:00
fsl-mc docs: fix broken references with multiple hints 2018-06-15 18:10:01 -03:00
fwserial tty: replace ->proc_fops with ->proc_show 2018-05-16 07:24:30 +02:00
gdm724x staging: gdm724x: remove redundant license information 2018-04-26 09:17:34 +02:00
goldfish Staging: goldfish: Kconfig: fixed code style issue 2018-05-20 14:31:28 +02:00
greybus treewide: Use array_size() in vmalloc() 2018-06-12 16:19:22 -07:00
gs_fpgaboot
iio staging:iio:meter: Drop ADE7759 driver 2018-05-20 12:21:54 +01:00
ks7010 staging: ks7010: call 'hostif_mib_set_request_int' instead of 'hostif_mib_set_request_bool' 2018-07-16 10:04:11 +02:00
media media: staging: omap4iss: Include asm/cacheflush.h after generic includes 2018-07-24 10:43:34 -07:00
most staging: most: video: fix build warnings 2018-05-14 11:42:28 +02:00
mt29f_spinand MTD changes: 2018-04-06 12:15:41 -07:00
mt7621-dma
mt7621-dts staging: mt7621-gpio: update #interrupt-cells for the gpio node 2018-06-01 13:16:23 +02:00
mt7621-eth staging: mt7621-eth: Remove unused variable 2018-05-15 09:31:38 +02:00
mt7621-gpio staging: mt7621-gpio: reorder includes alphabetically 2018-06-01 13:16:24 +02:00
mt7621-mmc staging: mt7621-mmc: Fix line size exceeding 80 columns 2018-06-01 10:52:48 +02:00
mt7621-pci staging: mt7621-pci: Fix line size exceeding 80 columns. 2018-05-31 19:00:53 +02:00
mt7621-pinctrl treewide: devm_kzalloc() -> devm_kcalloc() 2018-06-12 16:19:22 -07:00
mt7621-spi staging: mt7621-spi: remove unused lock. 2018-05-06 19:09:23 -07:00
netlogic net: Add generic ndo_select_queue functions 2018-07-09 13:15:34 -07:00
nvec Revert "staging: nvec: Augment TODO file with GPIO work item" 2018-04-23 18:49:51 +02:00
octeon
octeon-usb
olpc_dcon staging: olpc_dcon: Augment TODO file with GPIO work item 2018-04-23 14:36:10 +02:00
pi433 staging: pi433: break long lines in pi433_if.c 2018-04-25 15:58:04 +02:00
rtl8188eu Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net 2018-08-02 10:55:32 -07:00
rtl8192e staging: rtl8192e: rtllib_tx: fix spelling issue. 2018-05-25 18:44:14 +02:00
rtl8192u treewide: kmalloc() -> kmalloc_array() 2018-06-12 16:19:22 -07:00
rtl8712 ieee80211: bump IEEE80211_MAX_AMPDU_BUF to support HE 2018-06-18 22:39:39 +02:00
rtl8723bs Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux 2018-07-20 21:17:12 -07:00
rtlwifi Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux 2018-07-20 21:17:12 -07:00
rts5208 treewide: Use array_size() in vzalloc() 2018-06-12 16:19:22 -07:00
skein
sm750fb staging: sm750fb: add drm development branch details 2018-05-06 18:51:38 -07:00
speakup staging: speakup: fix wraparound in uaccess length check 2018-07-16 10:04:11 +02:00
typec staging/typec: fix tcpci_rt1711h build errors 2018-06-25 21:36:45 +08:00
unisys treewide: kzalloc() -> kcalloc() 2018-06-12 16:19:22 -07:00
vboxvideo Staging/IIO patches for 4.18-rc1 2018-06-09 10:32:39 -07:00
vc04_services staging: vc04_services: no need to save the log debufs dentries 2018-06-01 20:15:56 +02:00
vme
vt6655 staging: vt6655: remove unnecessary line breaks in function definition. 2018-04-23 15:23:36 +02:00
vt6656
wilc1000 staging: wilc1000: Avoid overriding rates_no while parsing ies element. 2018-05-25 18:45:47 +02:00
wlan-ng staging: wlan-ng: remove unused declarations from p80211types.h 2018-05-31 19:00:53 +02:00
xgifb
Kconfig staging: ipx: delete it from the tree 2018-06-05 19:23:26 +02:00
Makefile staging: ipx: delete it from the tree 2018-06-05 19:23:26 +02:00