The patch titled
Subject: Revert parts of "hlist: drop the node parameter from iterators"
has been added to the -mm tree. Its filename is
revert-parts-of-hlist-drop-the-node-parameter-from-iterators.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/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Arnd Bergmann <arnd@xxxxxxxx>
Subject: Revert parts of "hlist: drop the node parameter from iterators"
commit b67bfe0d42 "hlist: drop the node parameter from iterators" did a
lot of nice changes but also contains two small hunks that seem to have
slipped in accidentally and have no apparent connection to the intent of
the patch.
This reverts the two extraneous changes.
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Peter Senna Tschudin <peter.senna@xxxxxxxxx>
Cc: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
Cc: Sasha Levin <sasha.levin@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/smpboot.c | 2 +-
net/9p/trans_virtio.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff -puN kernel/smpboot.c~revert-parts-of-hlist-drop-the-node-parameter-from-iterators kernel/smpboot.c
--- a/kernel/smpboot.c~revert-parts-of-hlist-drop-the-node-parameter-from-iterators
+++ a/kernel/smpboot.c
@@ -131,7 +131,7 @@ static int smpboot_thread_fn(void *data)
continue;
}
- //BUG_ON(td->cpu != smp_processor_id());
+ BUG_ON(td->cpu != smp_processor_id());
/* Check for state change setup */
switch (td->status) {
diff -puN net/9p/trans_virtio.c~revert-parts-of-hlist-drop-the-node-parameter-from-iterators net/9p/trans_virtio.c
--- a/net/9p/trans_virtio.c~revert-parts-of-hlist-drop-the-node-parameter-from-iterators
+++ a/net/9p/trans_virtio.c
@@ -655,7 +655,7 @@ static struct p9_trans_module p9_virtio_
.create = p9_virtio_create,
.close = p9_virtio_close,
.request = p9_virtio_request,
- //.zc_request = p9_virtio_zc_request,
+ .zc_request = p9_virtio_zc_request,
.cancel = p9_virtio_cancel,
/*
* We leave one entry for input and one entry for response
_
Patches currently in -mm which might be from arnd@xxxxxxxx are
linux-next.patch
revert-parts-of-hlist-drop-the-node-parameter-from-iterators.patch
kconfig-consolidate-config_debug_strict_user_copy_checks.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
