diff for duplicates of <20120912160302.ae257eb4.akpm@linux-foundation.org> diff --git a/a/1.txt b/N1/1.txt index e83f200..452e6c6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,7 +24,7 @@ diff -puN drivers/i2c/i2c-core.c~idr-rename-max_level-to-max_idr_level-fix drive +++ a/drivers/i2c/i2c-core.c @@ -982,7 +982,7 @@ int i2c_add_numbered_adapter(struct i2c_ - if (adap->nr = -1) /* -1 means dynamically assign bus id */ + if (adap->nr == -1) /* -1 means dynamically assign bus id */ return i2c_add_adapter(adap); - if (adap->nr & ~MAX_ID_MASK) + if (adap->nr & ~MAX_IDR_MASK) @@ -41,7 +41,7 @@ diff -puN drivers/infiniband/core/cm.c~idr-rename-max_level-to-max_idr_level-fix - next_id = ((unsigned) id + 1) & MAX_ID_MASK; + next_id = ((unsigned) id + 1) & MAX_IDR_MASK; spin_unlock_irqrestore(&cm.lock, flags); - } while( (ret = -EAGAIN) && idr_pre_get(&cm.local_id_table, GFP_KERNEL) ); + } while( (ret == -EAGAIN) && idr_pre_get(&cm.local_id_table, GFP_KERNEL) ); diff -puN drivers/pps/pps.c~idr-rename-max_level-to-max_idr_level-fix drivers/pps/pps.c --- a/drivers/pps/pps.c~idr-rename-max_level-to-max_idr_level-fix @@ -74,9 +74,15 @@ diff -puN fs/super.c~idr-rename-max_level-to-max_idr_level-fix fs/super.c else if (error) return -EAGAIN; -- if ((dev & MAX_ID_MASK) = (1 << MINORBITS)) { -+ if ((dev & MAX_IDR_MASK) = (1 << MINORBITS)) { +- if ((dev & MAX_ID_MASK) == (1 << MINORBITS)) { ++ if ((dev & MAX_IDR_MASK) == (1 << MINORBITS)) { spin_lock(&unnamed_dev_lock); ida_remove(&unnamed_dev_ida, dev); if (unnamed_dev_start > dev) _ + +-- +To unsubscribe, send a message with 'unsubscribe linux-mm' in +the body to majordomo@kvack.org. For more info on Linux MM, +see: http://www.linux-mm.org/ . +Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N1/content_digest index 7fca3e4..6fb886d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\020120911094823.GA29568@localhost\0" "From\0Andrew Morton <akpm@linux-foundation.org>\0" "Subject\0Re: [PATCH] idr: Rename MAX_LEVEL to MAX_ID_LEVEL\0" - "Date\0Wed, 12 Sep 2012 23:03:02 +0000\0" + "Date\0Wed, 12 Sep 2012 16:03:02 -0700\0" "To\0Fengguang Wu <fengguang.wu@intel.com>\0" "Cc\0walter harms <wharms@bfs.de>" Glauber Costa <glommer@parallels.com> @@ -37,7 +37,7 @@ "+++ a/drivers/i2c/i2c-core.c\n" "@@ -982,7 +982,7 @@ int i2c_add_numbered_adapter(struct i2c_\n" " \n" - " \tif (adap->nr = -1) /* -1 means dynamically assign bus id */\n" + " \tif (adap->nr == -1) /* -1 means dynamically assign bus id */\n" " \t\treturn i2c_add_adapter(adap);\n" "-\tif (adap->nr & ~MAX_ID_MASK)\n" "+\tif (adap->nr & ~MAX_IDR_MASK)\n" @@ -54,7 +54,7 @@ "-\t\t\tnext_id = ((unsigned) id + 1) & MAX_ID_MASK;\n" "+\t\t\tnext_id = ((unsigned) id + 1) & MAX_IDR_MASK;\n" " \t\tspin_unlock_irqrestore(&cm.lock, flags);\n" - " \t} while( (ret = -EAGAIN) && idr_pre_get(&cm.local_id_table, GFP_KERNEL) );\n" + " \t} while( (ret == -EAGAIN) && idr_pre_get(&cm.local_id_table, GFP_KERNEL) );\n" " \n" "diff -puN drivers/pps/pps.c~idr-rename-max_level-to-max_idr_level-fix drivers/pps/pps.c\n" "--- a/drivers/pps/pps.c~idr-rename-max_level-to-max_idr_level-fix\n" @@ -87,11 +87,17 @@ " \telse if (error)\n" " \t\treturn -EAGAIN;\n" " \n" - "-\tif ((dev & MAX_ID_MASK) = (1 << MINORBITS)) {\n" - "+\tif ((dev & MAX_IDR_MASK) = (1 << MINORBITS)) {\n" + "-\tif ((dev & MAX_ID_MASK) == (1 << MINORBITS)) {\n" + "+\tif ((dev & MAX_IDR_MASK) == (1 << MINORBITS)) {\n" " \t\tspin_lock(&unnamed_dev_lock);\n" " \t\tida_remove(&unnamed_dev_ida, dev);\n" " \t\tif (unnamed_dev_start > dev)\n" - _ + "_\n" + "\n" + "--\n" + "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" + "the body to majordomo@kvack.org. For more info on Linux MM,\n" + "see: http://www.linux-mm.org/ .\n" + "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" -d6178760859c9fd720c8efbf2e6052d0cea90d23ef7f7e48088b7a11887399c4 +9c2b48188ce1cb0d5dfb75ef84f3fbb0b2c558c89669c7711afb8bbc40cadefa
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.