iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/drivers/char
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
  9e26680733d5 ("bnxt_en: Update firmware call to retrieve TX PTP timestamp")
  9e518f25802c ("bnxt_en: 1PPS functions to configure TSIO pins")
  099fdeda659d ("bnxt_en: Event handler for PPS events")

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

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

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

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2021-08-13 06:41:22 -07:00
..
agp
parisc: parisc-agp requires SBA IOMMU driver
2021-04-06 11:46:39 +02:00
hw_random
ARM: SoC changes for 5.14
2021-07-10 09:22:44 -07:00
ipmi
Merge branch 'akpm' (patches from Andrew)
2021-07-02 12:08:10 -07:00
mwave
char/mwave: turn tp3780I_Cleanup() into void function
2021-03-24 08:26:30 +01:00
pcmcia
net: split out ndo_siowandev ioctl
2021-07-27 20:11:45 +01:00
tpm
tpm_ftpm_tee: Free and unregister TEE shared memory during kexec
2021-07-21 07:55:50 +02:00
xilinx_hwicap
treewide: Add SPDX license identifier - Makefile/Kconfig
2019-05-21 10:50:46 +02:00
xillybus
char: xillybus: Fix spelling mistake "overflew" -> "overflowed"
2021-06-03 14:11:08 +02:00
adi.c
…
apm-emulation.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
applicom.c
Merge 5.12-rc6 into char-misc-next
2021-04-05 08:43:50 +02:00
applicom.h
…
bsr.c
mm: don't include asm/pgtable.h if linux/mm.h is already included
2020-06-09 09:39:13 -07:00
ds1620.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
dsp56k.c
…
dtlk.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
hangcheck-timer.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 405
2019-06-05 17:37:13 +02:00
hpet.c
char: hpet: Remove unused variable 'm'
2021-05-21 10:09:30 +02:00
Kconfig
TTY / Serial patches for 5.14-rc1
2021-07-05 14:08:24 -07:00
lp.c
char: lp: remove redundant space around (inside) parenthesized expressions
2021-03-24 08:26:32 +01:00
Makefile
remove the raw driver
2021-06-04 15:35:03 +02:00
mem.c
remove the raw driver
2021-06-04 15:35:03 +02:00
misc.c
char: misc: increase DYNAMIC_MINORS value
2020-11-03 09:52:04 +01:00
mspec.c
char: mspec: Use kvzalloc() in mspec_mmap()
2020-08-28 12:10:04 +02:00
nsc_gpio.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
nvram.c
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
nwbutton.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
nwbutton.h
misc: cleanup minor number definitions in c file into miscdevice.h
2020-03-18 12:27:03 +01:00
nwflash.c
misc: move FLASH_MINOR into miscdevice.h and fix conflicts
2020-03-18 12:27:04 +01:00
pc8736x_gpio.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
powernv-op-panel.c
powerpc/powernv: Fix fall-through warning for Clang
2021-07-13 19:21:41 -05:00
ppdev.c
ppdev: Distribute switch variables for initialization
2020-02-23 20:28:12 +01:00
ps3flash.c
powerpc/ps3: make system bus's remove and shutdown callbacks return void
2020-12-04 01:01:22 +11:00
random.c
random: remove dead code left over from blocking pool
2021-04-02 18:28:12 +11:00
scx200_gpio.c
treewide: Add SPDX license identifier for more missed files
2019-05-21 10:50:45 +02:00
sonypi.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 61
2019-05-24 17:36:45 +02:00
tb0219.c
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 156
2019-05-30 11:26:35 -07:00
tlclk.c
drivers: char: tlclk.c: Avoid data race between init and interrupt handler
2020-04-23 16:55:24 +02:00
toshiba.c
module: remove never implemented MODULE_SUPPORTED_DEVICE
2021-03-17 13:16:18 -07:00
ttyprintk.c
ttyprintk: remove redundant initialization of variable i
2021-05-27 14:19:50 +02:00
uv_mmtimer.c
…
virtio_console.c
virtio_console: Assure used length from device is limited
2021-07-03 04:50:53 -04:00