The patch titled
random: revert braindamage that snuck into checkpatch cleanup
has been removed from the -mm tree. Its filename was
random-clean-up-checkpatch-complaints-fix.patch
This patch was dropped because it was folded into random-clean-up-checkpatch-complaints.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: random: revert braindamage that snuck into checkpatch cleanup
From: Matt Mackall <mpm@xxxxxxxxxxx>
Signed-off-by: Matt Mackall <mpm@xxxxxxxxxxx>
Tested-by: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Cc: Theodore Ts'o <tytso@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/char/random.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/char/random.c~random-clean-up-checkpatch-complaints-fix drivers/char/random.c
--- a/drivers/char/random.c~random-clean-up-checkpatch-complaints-fix
+++ a/drivers/char/random.c
@@ -1328,7 +1328,7 @@ ctl_table random_table[] = {
* Rotation is separate from addition to prevent recomputation
*/
#define ROUND(f, a, b, c, d, x, s) \
- (a += f(b, c, d) + in[x], a = (a << s) | (a >> (32 - s)))
+ (a += f(b, c, d) + x, a = (a << s) | (a >> (32 - s)))
#define K1 0
#define K2 013240474631UL
#define K3 015666365641UL
_
Patches currently in -mm which might be from mpm@xxxxxxxxxxx are
origin.patch
use-directly-kmalloc-and-kfree-in-init-initramfsc.patch
random-clean-up-checkpatch-complaints.patch
random-clean-up-checkpatch-complaints-fix.patch
random-consolidate-wakeup-logic.patch
random-use-unlocked_ioctl.patch
random-reuse-rand_initialize.patch
random-improve-variable-naming-clear-extract-buffer.patch
random-make-backtracking-attacks-harder.patch
random-remove-cacheline-alignment-for-locks.patch
random-eliminate-redundant-new_rotate-variable.patch
random-remove-some-prefetch-logic.patch
random-simplify-add_ptr-logic.patch
random-make-mixing-interface-byte-oriented.patch
random-simplify-and-rename-credit_entropy_store.patch
random-add-async-notification-support-to-dev-random.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
