linux

mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00

Files

Jason Gunthorpe e7996a9a77 Merge tag v4.15 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

To resolve conflicts in:
 drivers/infiniband/hw/mlx5/main.c
 drivers/infiniband/hw/mlx5/qp.c

From patches merged into the -rc cycle. The conflict resolution matches
what linux-next has been carrying.

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

2018-01-30 09:30:00 -07:00

asm-generic

bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type

2017-12-05 15:02:40 +01:00

drm

Merge tag 'drm-for-v4.15' of git://people.freedesktop.org/~airlied/linux

2017-11-15 20:42:10 -08:00

linux

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2018-01-20 11:41:09 -08:00

misc

License cleanup: add SPDX license identifier to uapi header files with a license