[PATCH] scripts/patch-kernel fix

2012-07-19 Thread Daniel Wisehart
Takes care of errors when running something like:

$ ./scripts/patch-kernel . .. 3.5
Current kernel version is 3.5.0-rc7 ( Saber-toothed Squirrel)
./scripts/patch-kernel: line 229: [: -lt: unary operator expected
./scripts/patch-kernel: line 252: [: -gt: unary operator expected


diff --git a/scripts/patch-kernel b/scripts/patch-kernel
index d000ea3..a7672eb 100755
--- a/scripts/patch-kernel
+++ b/scripts/patch-kernel
@@ -226,7 +226,7 @@ fi
 
 # This all assumes a 2.6.x[.y] kernel tree.
 # Don't allow backwards/reverse patching.
-if [ $STOPSUBLEVEL -lt $SUBLEVEL ]; then
+if [ "$STOPSUBLEVEL"0 -lt "$SUBLEVEL"0 ]; then
backwards
 fi
 
@@ -249,7 +249,7 @@ fi
 # If not ending sublevel is specified, it is incremented until
 # no further sublevels are found.
 
-if [ $STOPSUBLEVEL -gt $SUBLEVEL ]; then
+if [ "$STOPSUBLEVEL"0 -gt "$SUBLEVEL"0 ]; then
 while :# incrementing SUBLEVEL (s in v.p.s)
 do
 CURRENTFULLVERSION="$VERSION.$PATCHLEVEL.$SUBLEVEL"



This communication is restricted - please see http://www.eladian.com for 
further information.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[Bcache v14 PATCH] fix compiler error

2012-07-19 Thread Daniel Wisehart
Hello Kent, 

This patch keeps gcc 4.7.0 happy.  The static function dump_bset() could be 
moved, but that would have made a bigger patch.  :-)

Thanks,
Daniel



diff --git a/drivers/md/bcache/debug.c b/drivers/md/bcache/debug.c
index 3c9c24d..4dc0ba5 100644
--- a/drivers/md/bcache/debug.c
+++ b/drivers/md/bcache/debug.c
@@ -83,6 +83,8 @@ struct keyprint_hack bch_pbtree(const struct btree *b)
 
 #ifdef CONFIG_BCACHE_DEBUG
 
+static void dump_bset(struct btree *b, struct bset *i);
+
 void bch_btree_verify(struct btree *b, struct bset *new)
 {
struct btree *v = b->c->verify_data;


This communication is restricted - please see http://www.eladian.com for 
further information.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/