linux-next: manual merge of the akpm-current tree with the rdma tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: drivers/infiniband/core/umem.c between commit: db6c6774af0d ("RDMA/umem: Remove hugetlb flag") from the rdma tree and commit: c041ba1a3294 ("mm/gup: replace get_user_pages_longterm() with FOLL_LONGTERM") from

linux-next: manual merge of the akpm-current tree with the rdma tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: lib/dynamic_debug.c between commit: 923abb9d797b ("RDMA/core: Introduce RDMA subsystem ibdev_* print functions") from the rdma tree and commits: c20acb85ecb2 ("lib/dynamic_debug.c: introduce accessors for strin

linux-next: manual merge of the akpm-current tree with the rdma tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: include/linux/dynamic_debug.h between commit: 923abb9d797b ("RDMA/core: Introduce RDMA subsystem ibdev_* print functions") from the rdma tree and commit: 8dc1ed58157d ("lib/dynamic_debug.c: introduce CONFIG_DY