The patch titled
whitespace fixes: relayfs
has been removed from the -mm tree. Its filename was
whitespace-fixes-relayfs.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: whitespace fixes: relayfs
From: Daniel Walker <dwalker@xxxxxxxxxx>
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxx>
Cc: Tom Zanussi <zanussi@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/relay.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN kernel/relay.c~whitespace-fixes-relayfs kernel/relay.c
--- a/kernel/relay.c~whitespace-fixes-relayfs
+++ a/kernel/relay.c
@@ -370,7 +370,7 @@ void relay_reset(struct rchan *chan)
if (!chan)
return;
- if (chan->is_global && chan->buf[0]) {
+ if (chan->is_global && chan->buf[0]) {
__relay_reset(chan->buf[0], 0);
return;
}
@@ -850,13 +850,13 @@ static int relay_file_read_avail(struct
buf->subbufs_consumed = consumed;
buf->bytes_consumed = 0;
}
-
+
produced = (produced % n_subbufs) * subbuf_size + buf->offset;
consumed = (consumed % n_subbufs) * subbuf_size + buf->bytes_consumed;
if (consumed > produced)
produced += n_subbufs * subbuf_size;
-
+
if (consumed == produced)
return 0;
_
Patches currently in -mm which might be from dwalker@xxxxxxxxxx are
origin.patch
whitespace-fixes-task-exit-handling.patch
profile-likely-unlikely-macros.patch
profile-likely-unlikely-macros-fix.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
