kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-10-09 18:15:49 +00:00
Code Issues Releases Packages Activity
linux/drivers/staging
History
Linus Torvalds 7fdf3e8616 Merge candidates for 4.17-rc 
- bnxt netdev changes merged this cycle caused the bnxt RDMA driver to crash under
   certain situations
 - Arnd found (several, unfortunately) kconfig problems with the patches adding
   INFINIBAND_ADDR_TRANS. Reverting this last part, will fix it more fully
   outside -rc.
 - Subtle change in error code for a uapi function caused breakage in userspace.
   This was bug was subtly introduced cycle
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCgAGBQJbEXg1AAoJEDht9xV+IJsax2YQAJjXnfQ9+QsbtT8sqFzGFLo3
 r5aqqwF6RkGDFsovVDRH/9S62JjeqJRQA+4ykooajD+6mXU06Sf3p4tcoco0Dqhn
 66b/lkdPFzXSytlne7AnUnA3xkKG4u5jYGReSryIQjXu29iwt8scgiiqt8nX9Gzi
 eC9U2UQn5ZF65yRo4V/UGuHjdnUXiPYfg2Ff5YqLUxdL0XE42ftpuiR3Xuzgfj8c
 /rdqDwnvdViQwPeTSNTJoZzeV+49WKp9BP+lzsCeIXvzuzY1aOd94z0i7fq342hB
 jXpz6PtRTSBkZ4xBuvtopnoz0HQXMv7kQFMobkyjaP3qXcKz6Dx9d3QvWkLq8qdQ
 D4MPYjVCONJAJvXppxuNSzyz0lg5EaSICWeZhkr5P68Ja0fptiXAumVCTr/kEifV
 Yz8y0xsEVMIxBy3C9HOCe4khzWKqd9Uoo4/VDM+GdhKHIpUCnnKTte9vIZcYg1JL
 1doCithudNX7KF4K79JJqADwtFhXoPaHt3XF9YRhgouDN9gC+/hB5ZZvD4jjcqhF
 tLfRh1+LeK6QuVTE//ON/OS5xGgEzcZVLUJSUs/NdB+5YAXREz/2+IoK/0+rFiP0
 wlHlgUk9ZQx3j7La5iiPrRdK+h6u0LUYd02XuMevnnswGqv+DWrxDnFy/icovPCt
 AxHZ0KxdLJeo2euOd755
 =Ppe+
 -----END PGP SIGNATURE-----

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

Pull rdma fixes from Jason Gunthorpe:
 "Just three small last minute regressions that were found in the last
  week. The Broadcom fix is a bit big for rc7, but since it is fixing
  driver crash regressions that were merged via netdev into rc1, I am
  sending it.

   - bnxt netdev changes merged this cycle caused the bnxt RDMA driver
     to crash under certain situations

   - Arnd found (several, unfortunately) kconfig problems with the
     patches adding INFINIBAND_ADDR_TRANS. Reverting this last part,
     will fix it more fully outside -rc.

   - Subtle change in error code for a uapi function caused breakage in
     userspace. This was bug was subtly introduced cycle"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  IB/core: Fix error code for invalid GID entry
  IB: Revert "remove redundant INFINIBAND kconfig dependencies"
  RDMA/bnxt_re: Fix broken RoCE driver due to recent L2 driver changes
History 2018-06-02 09:55:44 -07:00
..
android drivers:staging:android:ashmem: Changing return type from int to loff_t 2018-03-19 19:43:24 +01:00
board License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
clocking-wizard staging: clocking-wizard: remove redundant license text 2018-01-15 16:03:45 +01:00
comedi staging: comedi: s626: Use Preferred kernel type 2018-03-29 11:53:27 +02:00
dgnc staging: dgnc: drop unused neo_uart_struct 2018-01-17 15:02:56 +01:00
emxx_udc staging: emxx_udc: Remove unnecessary NULL checks 2018-03-06 04:09:17 -08:00
fbtft staging: fbtft: remove unused FB_TFT_SSD1325 kconfig 2018-01-25 13:10:39 +01:00
fsl-dpaa2 staging: fsl-dpaa2/eth: Use debug level for message 2018-03-23 16:42:27 +01:00
fsl-mc bus: fsl-mc: change mc_command in fsl_mc_command 2018-03-23 15:52:48 +01:00
fwserial vfs: do bulk POLL* -> EPOLL* replacement 2018-02-11 14:34:03 -08:00
gdm724x Staging: gdm724x: LTE: Refactor gdm_lte_pdn_table(). 2018-02-23 09:54:56 +01:00
goldfish mtd: Stop updating erase_info->state and calling mtd_erase_callback() 2018-03-21 09:50:56 +01:00
greybus vfs: do bulk POLL* -> EPOLL* replacement 2018-02-11 14:34:03 -08:00
gs_fpgaboot Staging: gs_fpgaboot: remove FSF's mailing address from io.h 2018-01-08 16:47:23 +01:00
iio Staging/IIO patches for 4.17-rc1 2018-04-04 18:56:27 -07:00
ipx net: make getname() functions return length rather than use int* parameter 2018-02-12 14:15:04 -05:00
ks7010 staging: ks7010: Remove unused member 'reg_net' from 'ks_wlan_private'. 2018-03-29 11:50:40 +02:00
lustre IB: Revert "remove redundant INFINIBAND kconfig dependencies" 2018-05-28 10:40:16 -06:00
media media: imx-media-csi: Fix inconsistent IS_ERR and PTR_ERR 2018-05-04 06:21:06 -04:00
most staging: most: Remove unnecessary usage of BUG_ON(). 2018-03-08 09:56:15 -08:00
mt29f_spinand MTD changes: 2018-04-06 12:15:41 -07:00
mt7621-dma staging: mt7621-dma: Fixing parenthesis alignment 2018-03-23 16:00:18 +01:00
mt7621-dts staging: mt7621-dts: Replace spaces with tabs in indentation 2018-03-29 11:52:25 +02:00
mt7621-eth staging: mt7621-eth: fix spelling mistake: "devictree" -> "devicetree" 2018-03-22 18:31:04 +01:00
mt7621-gpio staging: mt7621-gpio: mt7621: make symbol gc_map static 2018-03-22 18:31:04 +01:00
mt7621-mmc staging: mt7621-mmc: MIPS: ralink: add sdhci for mt7620a SoC 2018-03-19 19:56:02 +01:00
mt7621-pci staging: mt7621-pci: MIPS/ralink: add MT7621 pcie driver 2018-03-19 19:56:01 +01:00
mt7621-pinctrl staging: mt7621-pinctrl: ralink: add pinctrl driver 2018-03-19 19:56:02 +01:00
mt7621-spi staging: mt7621-spi: add mt7621 support 2018-03-19 19:56:02 +01:00
ncpfs staging: ncpfs: memory corruption in ncp_read_kernel() 2018-03-19 16:31:39 +01:00
netlogic staging: net: netlogic: Remove unneeded cast 2018-02-22 14:59:05 +01:00
nvec staging: nvec: remove redundant license text 2018-01-15 16:03:45 +01:00
octeon staging: octeon: remove redundant license text 2018-01-15 16:03:45 +01:00
octeon-usb staging: octeon-usb: use __delay() instead of cvmx_wait() 2017-11-28 14:36:46 +01:00
olpc_dcon staging: olpc_dcon: Line up parentheses in func calls and defs 2017-12-06 10:00:30 +01:00
pi433 staging: pi433: cleanup local variable 2018-03-22 18:27:42 +01:00
rtl8188eu headers: untangle kmemleak.h from mm.h 2018-04-05 21:36:27 -07:00
rtl8192e drivers: staging: rtl8192e: fixed a space coding style issue 2018-03-29 11:54:38 +02:00
rtl8192u staging: rtl8192u: Replace printk() with more standardize output format. 2018-03-08 09:56:15 -08:00
rtl8712 staging: rtl8712: remove unnecessary parentheses 2018-03-06 04:03:44 -08:00
rtl8723bs staging: rtl8723bs: Remove yield call, replace with cond_resched() 2018-03-29 12:00:15 +02:00
rtlwifi headers: untangle kmemleak.h from mm.h 2018-04-05 21:36:27 -07:00
rts5208 staging: rts5208: rename SG_END macro 2018-03-01 08:33:06 -07:00
skein License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
sm750fb staging: sm750fb: Remove typedef 2018-03-19 17:14:40 +01:00
speakup Staging/IIO patches for 4.17-rc1 2018-04-04 18:56:27 -07:00
typec staging: typec: modify parameter of tcpci_irq 2018-03-12 13:02:48 +01:00
unisys staging: unisys: visorinput: use the full 80 characters of the screen 2018-02-16 15:42:22 +01:00
vboxvideo drm/ttm: add bo as parameter to the ttm_tt_create callback 2018-03-14 14:38:27 -05:00
vc04_services staging: bcm2835-audio: Release resources on module_exit() 2018-03-29 11:54:38 +02:00
vme staging: vme: vme_user: Fix some error handling paths in 'vme_user_probe()' 2018-03-23 15:55:21 +01:00
vt6655 staging: vt6655: Delete unused typedef enum _chip_type 2018-03-28 13:57:44 +02:00
vt6656 staging: vt6656: Remove unnecessary 'out of memory' message 2018-02-16 15:41:27 +01:00
wilc1000 staging: wilc1000: fix NULL pointer exception in host_int_parse_assoc_resp_info() 2018-04-23 15:57:38 +02:00
wlan-ng Staging: wlan-ng: fix unnecessary parantheses in prism2mgmt.c 2018-02-16 15:36:16 +01:00
xgifb Staging: xgifb: XGI_main_26.c: Refactored the function 2018-03-22 18:29:50 +01:00
Kconfig staging: mt7621-dts: add dts files 2018-03-19 19:56:02 +01:00
Makefile staging: mt7621-dts: add dts files 2018-03-19 19:56:02 +01:00