Jason Gunthorpe 7aaa1807e6 IB/cache: Restore compatibility for ib_query_gid ...

Code changes in smc have become so complicated this cycle that the RDMA
patches to remove ib_query_gid in smc create too complex merge conflicts.
Allow those conflicts to be resolved by using the net/smc hunks by
providing a compatibility wrapper. During the second phase of the merge
window this wrapper will be deleted and smc updated to use the new API.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reviewed-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

2018-07-27 10:08:34 -06:00

..

acpi

Merge tag 'acpi-4.18-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2018-06-13 07:32:10 -07:00

asm-generic

int-ll64.h: define u{8,16,32,64} and s{8,16,32,64} based on uapi header

2018-06-07 17:34:38 -07:00

clocksource

Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2018-04-05 21:21:08 -07:00

crypto

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

2018-06-05 15:51:21 -07:00

drm

Merge tag 'drm-next-2018-06-06-1' of git://anongit.freedesktop.org/drm/drm

2018-06-06 08:16:33 -07:00

dt-bindings

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2018-06-11 18:15:22 -07:00

keys

docs: Fix some broken references

2018-06-15 18:10:01 -03:00

kvm

KVM: arm/arm64: Bump VGIC_V3_MAX_CPUS to 512

2018-05-25 12:29:27 +01:00

linux

Merge branch 'mellanox/mlx5-next' into rdma.git for-next

2018-07-24 13:10:23 -06:00

math-emu

…

media

media: v4l2-core: push taking ioctl mutex down to ioctl handler

2018-05-28 16:31:44 -04:00

memory

…

misc

ocxl: Expose the thread_id needed for wait on POWER9

2018-06-03 20:40:32 +10:00

net

sctp: define sctp_packet_gso_append to build GSO frames

2018-06-14 10:25:53 -07:00

pcmcia

…

ras

PCI/AER: Add TLP header information to tracepoint

2018-05-10 08:34:52 -05:00

rdma

IB/cache: Restore compatibility for ib_query_gid

2018-07-27 10:08:34 -06:00

scsi

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2018-06-10 13:01:12 -07:00

soc

Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2018-06-11 18:19:45 -07:00

sound

Merge tag 'sound-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

2018-06-06 09:08:38 -07:00

target

scsi: target: transport should handle st FM/EOM/ILI reads

2018-05-18 12:22:48 -04:00

trace

Merge tag 'nfs-for-4.18-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

2018-06-12 10:09:03 -07:00

uapi

rdma/cxgb4: Add support for srq functions & structs

2018-07-25 21:08:04 -06:00

video

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

2018-06-17 05:00:24 +09:00

xen

docs: Fix some broken references

2018-06-15 18:10:01 -03:00