diff for duplicates of <20110314092511.GK2008@bicker> diff --git a/a/1.txt b/N1/1.txt index 13bb0ee..075b666 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,7 +9,7 @@ index fe1564c..f33575c 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -1383,7 +1383,7 @@ static int recv_dless_read(struct drbd_conf *mdev, struct drbd_request *req, - D_ASSERT(sector = bio->bi_sector); + D_ASSERT(sector == bio->bi_sector); bio_for_each_segment(bvec, bio, i) { - expect = min_t(int, data_size, bvec->bv_len); diff --git a/a/content_digest b/N1/content_digest index 291d893..f87ff3b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,10 @@ "From\0Dan Carpenter <error27@gmail.com>\0" - "Subject\0[patch] drbd: change int to unsigned int\0" - "Date\0Mon, 14 Mar 2011 09:25:11 +0000\0" + "Subject\0[Drbd-dev] [patch] drbd: change int to unsigned int\0" + "Date\0Mon, 14 Mar 2011 12:25:11 +0300\0" "To\0Lars Ellenberg <drbd-dev@lists.linbit.com>\0" - "Cc\0drbd-user@lists.linbit.com" + "Cc\0kernel-janitors@vger.kernel.org" linux-kernel@vger.kernel.org - " kernel-janitors@vger.kernel.org\0" + " drbd-user@lists.linbit.com\0" "\00:1\0" "b\0" "These are changes to make my static checker happy. I don't know the\n" @@ -18,7 +18,7 @@ "--- a/drivers/block/drbd/drbd_receiver.c\n" "+++ b/drivers/block/drbd/drbd_receiver.c\n" "@@ -1383,7 +1383,7 @@ static int recv_dless_read(struct drbd_conf *mdev, struct drbd_request *req,\n" - " \tD_ASSERT(sector = bio->bi_sector);\n" + " \tD_ASSERT(sector == bio->bi_sector);\n" " \n" " \tbio_for_each_segment(bvec, bio, i) {\n" "-\t\texpect = min_t(int, data_size, bvec->bv_len);\n" @@ -45,4 +45,4 @@ " \tstatic struct asender_cmd asender_tbl[] = {\n" " \t\t/* anything missing from this table is in" -b706bc11b532732789915c45666ceff2b650f6f88b76c7740b3c959052c5635c +af2b102838a6c022499b1a7540d3ac38edb55adbd341f0b5cdd73c2522731296
diff --git a/a/1.txt b/N2/1.txt index 13bb0ee..075b666 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -9,7 +9,7 @@ index fe1564c..f33575c 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -1383,7 +1383,7 @@ static int recv_dless_read(struct drbd_conf *mdev, struct drbd_request *req, - D_ASSERT(sector = bio->bi_sector); + D_ASSERT(sector == bio->bi_sector); bio_for_each_segment(bvec, bio, i) { - expect = min_t(int, data_size, bvec->bv_len); diff --git a/a/content_digest b/N2/content_digest index 291d893..7119d2e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <error27@gmail.com>\0" "Subject\0[patch] drbd: change int to unsigned int\0" - "Date\0Mon, 14 Mar 2011 09:25:11 +0000\0" + "Date\0Mon, 14 Mar 2011 12:25:11 +0300\0" "To\0Lars Ellenberg <drbd-dev@lists.linbit.com>\0" "Cc\0drbd-user@lists.linbit.com" linux-kernel@vger.kernel.org @@ -18,7 +18,7 @@ "--- a/drivers/block/drbd/drbd_receiver.c\n" "+++ b/drivers/block/drbd/drbd_receiver.c\n" "@@ -1383,7 +1383,7 @@ static int recv_dless_read(struct drbd_conf *mdev, struct drbd_request *req,\n" - " \tD_ASSERT(sector = bio->bi_sector);\n" + " \tD_ASSERT(sector == bio->bi_sector);\n" " \n" " \tbio_for_each_segment(bvec, bio, i) {\n" "-\t\texpect = min_t(int, data_size, bvec->bv_len);\n" @@ -45,4 +45,4 @@ " \tstatic struct asender_cmd asender_tbl[] = {\n" " \t\t/* anything missing from this table is in" -b706bc11b532732789915c45666ceff2b650f6f88b76c7740b3c959052c5635c +53ee73aab831a0b684c7ab37621a1495f1f9e7d56bd016f7a7150ed4f721a3ee
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.