Doug Ledford 0d52d80376 RDMA/uapi: Fix uapi breakage ...

During this merge window, we added support for addition RDMA netlink
operations.  Unfortunately, we added the items in the middle of our uapi
enum.  Fix that before final release.

Fixes: da5c850782 ("RDMA/nldev: add driver-specific resource
tracking")
Signed-off-by: Doug Ledford <dledford@redhat.com>

2018-05-15 15:54:46 -04:00

..

acpi

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

2018-04-12 11:04:35 -07:00

asm-generic

Merge tag 'asm-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

2018-04-12 09:15:48 -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

crypto: api - Remove unused crypto_type lookup function

2018-03-31 01:32:57 +08:00

drm

Backmerge tag 'v4.16-rc7' into drm-next

2018-03-28 14:30:41 +10:00

dt-bindings

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

2018-04-13 15:51:06 -07:00

keys

…

kvm

…

linux

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

2018-04-15 16:12:35 -07:00

math-emu

…

media

Merge tag 'media/v4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2018-04-10 10:10:30 -07:00

memory

…

misc

…

net

slip: Check if rstate is initialized before uncompressing

2018-04-11 10:33:46 -04:00

pcmcia

…

ras

…

rdma

IB/{hfi1, qib, rdmavt}: Move logic to allocate receive WQE into rdmavt

2018-05-09 15:53:30 -04:00

scsi

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

2018-04-05 15:05:53 -07:00

soc

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

2018-04-05 21:29:35 -07:00

sound

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

2018-04-05 10:42:07 -07:00

target

…

trace

Merge tag 'nfs-for-4.17-1' of git://git.linux-nfs.org/projects/anna/linux-nfs

2018-04-12 12:55:50 -07:00

uapi

RDMA/uapi: Fix uapi breakage

2018-05-15 15:54:46 -04:00

video

…

xen

xen/pvh: Indicate XENFEAT_linux_rsdp_unrestricted to Xen

2018-04-10 09:22:22 -04:00