The patch titled
Subject: linux-next-git-rejects
has been added to the -mm tree. Its filename is
linux-next-git-rejects.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/linux-next-git-rejects.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/linux-next-git-rejects.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/infiniband/core/uverbs_main.c | 11 -----------
1 file changed, 11 deletions(-)
diff -puN drivers/infiniband/core/uverbs_main.c~linux-next-git-rejects drivers/infiniband/core/uverbs_main.c
--- a/drivers/infiniband/core/uverbs_main.c~linux-next-git-rejects
+++ a/drivers/infiniband/core/uverbs_main.c
@@ -1055,9 +1055,6 @@ static void ib_uverbs_add_one(struct ib_
if (ib_uverbs_create_uapi(device, uverbs_dev))
goto err_uapi;
-<<<<<<< HEAD
- cdev_init(&uverbs_dev->cdev, NULL);
-=======
device_initialize(&uverbs_dev->dev);
uverbs_dev->dev.class = uverbs_class;
uverbs_dev->dev.parent = device->dev.parent;
@@ -1069,7 +1066,6 @@ static void ib_uverbs_add_one(struct ib_
cdev_init(&uverbs_dev->cdev,
device->mmap ? &uverbs_mmap_fops : &uverbs_fops);
->>>>>>> linux-next/akpm-base
uverbs_dev->cdev.owner = THIS_MODULE;
ret = cdev_device_add(&uverbs_dev->cdev, &uverbs_dev->dev);
@@ -1079,16 +1075,9 @@ static void ib_uverbs_add_one(struct ib_
ib_set_client_data(device, &uverbs_client, uverbs_dev);
return;
-<<<<<<< HEAD
-err_class:
- device_destroy(uverbs_class, uverbs_dev->cdev.dev);
-err_cdev:
- cdev_del(&uverbs_dev->cdev);
-=======
err_cdev:
cdev_del(&uverbs_dev->cdev);
put_device(&uverbs_dev->dev);
->>>>>>> linux-next/akpm-base
err_uapi:
clear_bit(devnum, dev_map);
err:
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
fix-crash-on-ocfs2_duplicate_clusters_by_page-v5-checkpatch-fixes.patch
proc-kcore-fix-invalid-memory-access-in-multi-page-read-optimization-v3-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
fix-clusters-leak-in-ocfs2_defrag_extent-fix.patch
mm.patch
mmpage_alloc-pf_wq_worker-threads-must-sleep-at-should_reclaim_retry-fix.patch
mm-calculate-deferred-pages-after-skipping-mirrored-memory-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
lib-bitmapc-fix-remaining-space-computation-in-bitmap_print_to_pagebuf-fix.patch
lib-bitmapc-fix-remaining-space-computation-in-bitmap_print_to_pagebuf-fix-fix.patch
ipc-allow-boot-time-extension-of-ipcmni-from-32k-to-8m-checkpatch-fixes.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
