Can you merge the following branch into the rdma tree please. This is to complete part of the Userspace API (UAPI) disintegration for which the preparatory patches were pulled recently. After these patches, userspace headers will be segregated into:
include/uapi/linux/.../foo.h for the userspace interface stuff, and: include/linux/.../foo.h for the strictly kernel internal stuff. --- The following changes since commit 9e2d8656f5e8aa214e66b462680cf86b210b74a8: Merge branch 'akpm' (Andrew's patch-bomb) (2012-10-09 16:23:15 +0900) are available in the git repository at: git://git.infradead.org/users/dhowells/linux-headers.git tags/disintegrate-rdma-20121009 for you to fetch changes up to e70078e9af5a4012a20448ce0af9b3b0813cc4bb: UAPI: (Scripted) Disintegrate include/rdma (2012-10-09 14:14:45 +0100) ---------------------------------------------------------------- (from the branch description for disintegrate-rdma local branch) clone of "disintegrate-scsi" UAPI Disintegration 2012-10-09 ---------------------------------------------------------------- David Howells (1): UAPI: (Scripted) Disintegrate include/rdma include/rdma/Kbuild | 6 ------ include/rdma/rdma_netlink.h | 36 +------------------------------- include/uapi/rdma/Kbuild | 6 ++++++ include/{ => uapi}/rdma/ib_user_cm.h | 0 include/{ => uapi}/rdma/ib_user_mad.h | 0 include/{ => uapi}/rdma/ib_user_sa.h | 0 include/{ => uapi}/rdma/ib_user_verbs.h | 0 include/uapi/rdma/rdma_netlink.h | 37 +++++++++++++++++++++++++++++++++ include/{ => uapi}/rdma/rdma_user_cm.h | 0 9 files changed, 44 insertions(+), 41 deletions(-) rename include/{ => uapi}/rdma/ib_user_cm.h (100%) rename include/{ => uapi}/rdma/ib_user_mad.h (100%) rename include/{ => uapi}/rdma/ib_user_sa.h (100%) rename include/{ => uapi}/rdma/ib_user_verbs.h (100%) create mode 100644 include/uapi/rdma/rdma_netlink.h rename include/{ => uapi}/rdma/rdma_user_cm.h (100%) . -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/