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

..

acpi

Merge branch 'acpi-ec' into acpi

2017-11-30 13:37:29 +01:00

asm-generic

Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-12-23 11:53:04 -08:00

clocksource

…

crypto

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2018-01-05 12:10:06 -08:00

drm

drm: rework delayed connector cleanup in connector_iter

2017-12-13 22:59:00 +01:00

dt-bindings

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

2017-11-23 21:04:56 -10:00

keys

…

kvm

KVM: arm/arm64: timer: Don't set irq as forwarded if no usable GIC

2017-12-18 10:53:23 +01:00

linux

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

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

math-emu

…

media

Merge tag 'media/v4.15-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2017-11-15 20:30:12 -08:00

memory

…

misc

…

net

net: don't call update_pmtu unconditionally

2018-01-25 16:27:34 -05:00

pcmcia

…

ras

…

rdma

RDMA/restrack: Add general infrastructure to track RDMA resources

2018-01-29 20:21:39 -07:00

scsi

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

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

soc

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

2017-11-17 20:04:24 -08:00

sound

ALSA: hda - Fix yet remaining issue with vmaster 0dB initialization

2017-11-22 12:34:56 +01:00

target

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2017-11-24 19:19:20 -10:00

trace

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-12-28 23:20:21 -08:00

uapi

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

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

video

Merge tag 'fbdev-v4.15' of git://github.com/bzolnier/linux

2017-11-20 21:50:24 -10:00

xen

Merge tag 'for-linus-4.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2017-12-22 12:30:10 -08:00