diff for duplicates of <1492554253.2689.15.camel@sandisk.com> diff --git a/a/1.txt b/N1/1.txt index 5eeb117..a122fe6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,13 +4,13 @@ On Tue, 2017-04-18 at 08:52 -0700, Christoph Hellwig wrote: > --- a/drivers/block/paride/pd.c > +++ b/drivers/block/paride/pd.c > @@ -747,7 +747,8 @@ static int pd_special_command(struct pd_unit *disk, -> -> rq->special = func; -> -> - err = blk_execute_rq(disk->gd->queue, disk->gd, rq, 0); +> =20 +> rq->special =3D func; +> =20 +> - err =3D blk_execute_rq(disk->gd->queue, disk->gd, rq, 0); > + blk_execute_rq(disk->gd->queue, disk->gd, rq, 0); -> + err = req->errors ? -EIO : 0; -> +> + err =3D req->errors ? -EIO : 0; +> =20 > blk_put_request(rq); > return err; diff --git a/a/content_digest b/N1/content_digest index 405ff46..ba880bd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -22,13 +22,13 @@ "> --- a/drivers/block/paride/pd.c\n" "> +++ b/drivers/block/paride/pd.c\n" "> @@ -747,7 +747,8 @@ static int pd_special_command(struct pd_unit *disk,\n" - "> \n" - "> \trq->special = func;\n" - "> \n" - "> -\terr = blk_execute_rq(disk->gd->queue, disk->gd, rq, 0);\n" + "> =20\n" + "> \trq->special =3D func;\n" + "> =20\n" + "> -\terr =3D blk_execute_rq(disk->gd->queue, disk->gd, rq, 0);\n" "> +\tblk_execute_rq(disk->gd->queue, disk->gd, rq, 0);\n" - "> +\terr = req->errors ? -EIO : 0;\n" - "> \n" + "> +\terr =3D req->errors ? -EIO : 0;\n" + "> =20\n" "> \tblk_put_request(rq);\n" "> \treturn err;\n" "\n" @@ -40,4 +40,4 @@ "\n" Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com> -6134db2378f7a2499fbc5379491fb222e0a804a16fe8eb51beb5dd47b917a0a6 +611e5c3c574be0351691624cd37a519410e8df64174ab91b31459f9d75d0c979
diff --git a/a/1.txt b/N2/1.txt index 5eeb117..3158276 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,4 +1,4 @@ -On Tue, 2017-04-18 at 08:52 -0700, Christoph Hellwig wrote: +On Tue, 2017-04-18@08:52 -0700, Christoph Hellwig wrote: > diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c > index b05e151c9b38..82c6d02193ae 100644 > --- a/drivers/block/paride/pd.c @@ -20,4 +20,4 @@ Sorry that I hadn't noticed this before but shouldn't "req" be changed into "rq"? Otherwise this patch looks fine to me. If this comment gets addressed you can add: -Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com> +Reviewed-by: Bart Van Assche <bart.vanassche at sandisk.com> diff --git a/a/content_digest b/N2/content_digest index 405ff46..e2e1017 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,22 +1,11 @@ "ref\020170418155229.5977-1-hch@bombadil.infradead.org\0" "ref\020170418155229.5977-2-hch@bombadil.infradead.org\0" - "From\0Bart Van Assche <Bart.VanAssche@sandisk.com>\0" - "Subject\0Re: block: remove the blk_execute_rq return value\0" + "From\0Bart.VanAssche@sandisk.com (Bart Van Assche)\0" + "Subject\0block: remove the blk_execute_rq return value\0" "Date\0Tue, 18 Apr 2017 22:24:15 +0000\0" - "To\0hch@bombadil.infradead.org <hch@bombadil.infradead.org>" - " axboe@kernel.dk <axboe@kernel.dk>\0" - "Cc\0linux-block@vger.kernel.org <linux-block@vger.kernel.org>" - hch@lst.de <hch@lst.de> - konrad.wilk@oracle.com <konrad.wilk@oracle.com> - roger.pau@citrix.com <roger.pau@citrix.com> - linux-scsi@vger.kernel.org <linux-scsi@vger.kernel.org> - linux-nvme@lists.infradead.org <linux-nvme@lists.infradead.org> - jbacik@fb.com <jbacik@fb.com> - james.smart@broadcom.com <james.smart@broadcom.com> - " dm-devel@redhat.com <dm-devel@redhat.com>\0" "\00:1\0" "b\0" - "On Tue, 2017-04-18 at 08:52 -0700, Christoph Hellwig wrote:\n" + "On Tue, 2017-04-18@08:52 -0700, Christoph Hellwig wrote:\n" "> diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c\n" "> index b05e151c9b38..82c6d02193ae 100644\n" "> --- a/drivers/block/paride/pd.c\n" @@ -38,6 +27,6 @@ "\"rq\"? Otherwise this patch looks fine to me. If this comment gets addressed\n" "you can add:\n" "\n" - Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com> + Reviewed-by: Bart Van Assche <bart.vanassche at sandisk.com> -6134db2378f7a2499fbc5379491fb222e0a804a16fe8eb51beb5dd47b917a0a6 +d97ffb8ef6d8bf43a7eaaa139048c7229df3894855ff124cb235ca4c7cf699cb
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.