diff for duplicates of <20180726150940.GD27305@kroah.com> diff --git a/a/1.txt b/N1/1.txt index a424a84..551b752 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ On Fri, Jul 20, 2018 at 08:23:44PM +0100, Ben Hutchings wrote: > On Sun, 2018-07-01 at 18:02 +0200, Greg Kroah-Hartman wrote: -> > 4.4-stable review patch. If anyone has any objections, please let me know. +> > 4.4-stable review patch.��If anyone has any objections, please let me know. > > > > ------------------ > > @@ -27,28 +27,28 @@ On Fri, Jul 20, 2018 at 08:23:44PM +0100, Ben Hutchings wrote: > > Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > --- -> > drivers/spi/spi.c | 10 ++++++++-- -> > 1 file changed, 8 insertions(+), 2 deletions(-) +> > �drivers/spi/spi.c |���10 ++++++++-- +> > �1 file changed, 8 insertions(+), 2 deletions(-) > > > > --- a/drivers/spi/spi.c > > +++ b/drivers/spi/spi.c > > @@ -707,8 +707,14 @@ static int spi_map_buf(struct spi_master -> > for (i = 0; i < sgs; i++) { -> > -> > if (vmalloced_buf) { +> > � for (i = 0; i < sgs; i++) { +> > � +> > � if (vmalloced_buf) { > > - min = min_t(size_t, -> > - len, desc_len - offset_in_page(buf)); +> > - ����len, desc_len - offset_in_page(buf)); > > + /* -> > + * Next scatterlist entry size is the minimum between -> > + * the desc_len and the remaining buffer length that -> > + * fits in a page. -> > + */ +> > + �* Next scatterlist entry size is the minimum between +> > + �* the desc_len and the remaining buffer length that +> > + �* fits in a page. +> > + �*/ > > + min = min_t(size_t, desc_len, -> > + min_t(size_t, len, -> > + PAGE_SIZE - offset_in_page(buf))); -> > vm_page = vmalloc_to_page(buf); -> > if (!vm_page) { -> > sg_free_table(sgt); +> > + ����min_t(size_t, len, +> > + ��PAGE_SIZE - offset_in_page(buf))); +> > � vm_page = vmalloc_to_page(buf); +> > � if (!vm_page) { +> > � sg_free_table(sgt); > > I think this makes sense upstream, but in 4.4 it seems to be a no-op > since desc_len is always set to PAGE_SIZE when vmalloced_buf is true. diff --git a/a/content_digest b/N1/content_digest index 22d2cbc..3faedb4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -14,7 +14,7 @@ "b\0" "On Fri, Jul 20, 2018 at 08:23:44PM +0100, Ben Hutchings wrote:\n" "> On Sun, 2018-07-01 at 18:02 +0200, Greg Kroah-Hartman wrote:\n" - "> > 4.4-stable review patch.\302\240\302\240If anyone has any objections, please let me know.\n" + "> > 4.4-stable review patch.\303\257\302\277\302\275\303\257\302\277\302\275If anyone has any objections, please let me know.\n" "> > \n" "> > ------------------\n" "> > \n" @@ -41,28 +41,28 @@ "> > Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>\n" "> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>\n" "> > ---\n" - "> > \302\240drivers/spi/spi.c |\302\240\302\240\302\24010 ++++++++--\n" - "> > \302\2401 file changed, 8 insertions(+), 2 deletions(-)\n" + "> > \303\257\302\277\302\275drivers/spi/spi.c |\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\27510 ++++++++--\n" + "> > \303\257\302\277\302\2751 file changed, 8 insertions(+), 2 deletions(-)\n" "> > \n" "> > --- a/drivers/spi/spi.c\n" "> > +++ b/drivers/spi/spi.c\n" "> > @@ -707,8 +707,14 @@ static int spi_map_buf(struct spi_master\n" - "> > \302\240\tfor (i = 0; i < sgs; i++) {\n" - "> > \302\240\n" - "> > \302\240\t\tif (vmalloced_buf) { \n" + "> > \303\257\302\277\302\275\tfor (i = 0; i < sgs; i++) {\n" + "> > \303\257\302\277\302\275\n" + "> > \303\257\302\277\302\275\t\tif (vmalloced_buf) { \n" "> > -\t\t\tmin = min_t(size_t,\n" - "> > -\t\t\t\t\302\240\302\240\302\240\302\240len, desc_len - offset_in_page(buf));\n" + "> > -\t\t\t\t\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275len, desc_len - offset_in_page(buf));\n" "> > +\t\t\t/*\n" - "> > +\t\t\t\302\240* Next scatterlist entry size is the minimum between\n" - "> > +\t\t\t\302\240* the desc_len and the remaining buffer length that\n" - "> > +\t\t\t\302\240* fits in a page.\n" - "> > +\t\t\t\302\240*/\n" + "> > +\t\t\t\303\257\302\277\302\275* Next scatterlist entry size is the minimum between\n" + "> > +\t\t\t\303\257\302\277\302\275* the desc_len and the remaining buffer length that\n" + "> > +\t\t\t\303\257\302\277\302\275* fits in a page.\n" + "> > +\t\t\t\303\257\302\277\302\275*/\n" "> > +\t\t\tmin = min_t(size_t, desc_len,\n" - "> > +\t\t\t\t\302\240\302\240\302\240\302\240min_t(size_t, len,\n" - "> > +\t\t\t\t\t\302\240\302\240PAGE_SIZE - offset_in_page(buf)));\n" - "> > \302\240\t\t\tvm_page = vmalloc_to_page(buf);\n" - "> > \302\240\t\t\tif (!vm_page) {\n" - "> > \302\240\t\t\t\tsg_free_table(sgt);\n" + "> > +\t\t\t\t\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275min_t(size_t, len,\n" + "> > +\t\t\t\t\t\303\257\302\277\302\275\303\257\302\277\302\275PAGE_SIZE - offset_in_page(buf)));\n" + "> > \303\257\302\277\302\275\t\t\tvm_page = vmalloc_to_page(buf);\n" + "> > \303\257\302\277\302\275\t\t\tif (!vm_page) {\n" + "> > \303\257\302\277\302\275\t\t\t\tsg_free_table(sgt);\n" "> \n" "> I think this makes sense upstream, but in 4.4 it seems to be a no-op\n" "> since desc_len is always set to PAGE_SIZE when vmalloced_buf is true.\n" @@ -75,4 +75,4 @@ "\n" greg k-h -bb8673af9564038108fc8e47d200debfadd35e42a45b60bd4cc1f50a21377639 +4fdca1facd050157d2e10195a91945b5c0d3304a1fdeeecd4dc0c8c408446bc5
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.