UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/drivers/staging
History
Jakub Kicinski f4083a752a Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
Conflicts:

drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h
  9e26680733 ("bnxt_en: Update firmware call to retrieve TX PTP timestamp")
  9e518f2580 ("bnxt_en: 1PPS functions to configure TSIO pins")
  099fdeda65 ("bnxt_en: Event handler for PPS events")

kernel/bpf/helpers.c
include/linux/bpf-cgroup.h
  a2baf4e8bb ("bpf: Fix potentially incorrect results with bpf_get_local_storage()")
  c7603cfa04 ("bpf: Add ambient BPF runtime context stored in current")

drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
  5957cc557d ("net/mlx5: Set all field of mlx5_irq before inserting it to the xarray")
  2d0b41a376 ("net/mlx5: Refcount mlx5_irq with integer")

MAINTAINERS
  7b637cd52f ("MAINTAINERS: fix Microchip CAN BUS Analyzer Tool entry typo")
  7d901a1e87 ("net: phy: add Maxlinear GPY115/21x/24x driver")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 		2021-08-13 06:41:22 -07:00
..
android staging: android: ashmem: add size field in procfs fdinfo 2021-06-18 13:02:40 +02:00
axis-fifo staging: axis-fifo: axis-fifo: Fix function naming in the documentation 2021-05-10 11:19:27 +02:00
board clkdev: remove CONFIG_CLKDEV_LOOKUP 2021-06-08 17:00:09 +02:00
clocking-wizard staging: clocking-wizard: Remove the hardcoding of the clock outputs 2021-03-10 09:25:30 +01:00
emxx_udc staging: emxx_udc: fix alignment issues 2021-05-25 18:25:52 +02:00
fbtft staging: fbtft: Update TODO 2021-05-10 11:19:39 +02:00
fieldbus staging: fieldbus: anybus: Refuse registering drivers without .probe() 2021-05-10 11:19:41 +02:00
fwserial TTY / Serial patches for 5.14-rc1 2021-07-05 14:08:24 -07:00
gdm724x TTY / Serial patches for 5.14-rc1 2021-07-05 14:08:24 -07:00
greybus TTY / Serial patches for 5.14-rc1 2021-07-05 14:08:24 -07:00
gs_fpgaboot staging: fpgaboot: change FPGA indirect article to an 2021-06-09 14:26:54 +02:00
hikey9xx staging: hi6421-spmi-pmic: cleanup some macros 2021-06-25 10:02:57 +02:00
iio 1st set of new IIO/counter device support, features and cleanup for 5.14 2021-06-09 12:11:49 +02:00
ks7010 staging: ks7010: Wrap macro definitions in parenthesis 2021-06-18 13:02:54 +02:00
media media: hantro: add support for Rockchip RK3036 2021-06-17 11:00:43 +02:00
most staging: most: dim2: hal: Demote non-conformant kernel-doc headers 2021-05-10 11:19:26 +02:00
mt7621-dma staging/mt7621-dma: mtk-hsdma.c->hsdma-mt7621.c 2021-01-31 13:39:53 +01:00
mt7621-dts Staging / IIO driver patches for 5.14-rc1 2021-07-05 14:01:53 -07:00
mt7621-pci staging: mt7621-pci: avoid to re-disable clock for those pcies not in use 2021-07-27 15:48:43 +02:00
netlogic drivers: staging: netlogic: fix unmet dependency for PHYLIB 2021-03-26 15:06:15 +01:00
nvec staging: nvec: Fix a bunch of kernel-doc issues 2021-05-10 11:19:24 +02:00
octeon dev_ioctl: split out ndo_eth_ioctl 2021-07-27 20:11:45 +01:00
octeon-usb staging: octeon-hcd: Directly include linux/of.h 2021-06-10 13:09:15 +01:00
olpc_dcon kernel.h: split out panic and oops helpers 2021-07-01 11:06:04 -07:00
pi433
…
qlge devlink: Set device as early as possible 2021-08-09 10:21:40 +01:00
ralink-gdma staging: ralink-gdma: Remove incorrect author information 2021-06-09 12:07:52 +02:00
rtl8188eu staging: rtlwifi: use siocdevprivate 2021-07-27 20:11:43 +01:00
rtl8192e staging: rtl8192e: Fix shadowed variable name 2021-05-25 18:23:32 +02:00
rtl8192u staging: rtl8192u: fix spaces in r8192U_hw.h 2021-06-03 15:59:18 +02:00
rtl8712 staging: rtl8712: error handling refactoring 2021-07-27 15:15:24 +02:00
rtl8723bs Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-08-13 06:41:22 -07:00
rts5208 staging: rts5208: remove redundant continue statement 2021-06-18 13:02:47 +02:00
sm750fb staging: sm750fb: sm750_accel: Provide description for 'accel' and fix function naming 2021-05-10 11:19:25 +02:00
unisys staging: unisys: visorhba: Convert module from IDR to XArray 2021-06-15 13:55:11 +02:00
vc04_services staging: vchiq_core: introduce handle_poll 2021-06-04 15:10:03 +02:00
vme Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2021-02-27 08:07:12 -08:00
vt6655 staging: vt6655: upc: Suppress set but not used warning in macro 2021-05-10 11:19:25 +02:00
vt6656 staging: vt6656: Fix alignment of function args 2021-03-10 09:25:25 +01:00
wfx Networking changes for 5.13. 2021-04-29 11:57:23 -07:00
wlan-ng staging: wlan-ng: use siocdevprivate 2021-07-27 20:11:43 +01:00
Kconfig staging: drop kpc2000 driver 2021-06-12 15:38:35 +02:00
Makefile staging: drop kpc2000 driver 2021-06-12 15:38:35 +02:00