diff for duplicates of <20170327163623.GA10729@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 45cc793..fdaac85 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ On Mon, Mar 27, 2017 at 10:40:23AM +0800, Zhang Rui wrote: > On Sun, 2017-03-26 at 12:26 +0100, Andrey Utkin wrote: > > On Fri, Mar 10, 2017 at 10:07:35AM +0100, Greg Kroah-Hartman wrote: > > > -> > > 4.10-stable review patch. If anyone has any objections, please let +> > > 4.10-stable review patch.��If anyone has any objections, please let > > > me know. > > > > > > ------------------ @@ -30,16 +30,16 @@ On Mon, Mar 27, 2017 at 10:40:23AM +0800, Zhang Rui wrote: > > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > > > > > --- -> > > drivers/mmc/host/sdhci-acpi.c | 5 ++++- -> > > 1 file changed, 4 insertions(+), 1 deletion(-) +> > > �drivers/mmc/host/sdhci-acpi.c |����5 ++++- +> > > �1 file changed, 4 insertions(+), 1 deletion(-) > > > > > > --- a/drivers/mmc/host/sdhci-acpi.c > > > +++ b/drivers/mmc/host/sdhci-acpi.c > > > @@ -467,7 +467,10 @@ static int sdhci_acpi_probe(struct platf -> > > if (sdhci_acpi_flag(c, SDHCI_ACPI_SD_CD)) { -> > > bool v = sdhci_acpi_flag(c, +> > > � if (sdhci_acpi_flag(c, SDHCI_ACPI_SD_CD)) { +> > > � bool v = sdhci_acpi_flag(c, > > > SDHCI_ACPI_SD_CD_OVERRIDE_LEVEL); -> > > +> > > � > > > - if (mmc_gpiod_request_cd(host->mmc, NULL, 0, v, 0, > > > NULL)) { > > > + err = mmc_gpiod_request_cd(host->mmc, NULL, 0, v, @@ -47,10 +47,10 @@ On Mon, Mar 27, 2017 at 10:40:23AM +0800, Zhang Rui wrote: > > > + if (err) { > > > + if (err == -EPROBE_DEFER) > > > + goto err_free; -> > > dev_warn(dev, "failed to setup card detect +> > > � dev_warn(dev, "failed to setup card detect > > > gpio\n"); -> > > c->use_runtime_pm = false; -> > > } +> > > � c->use_runtime_pm = false; +> > > � } > > > > > > > > Regression reported: https://bugzilla.kernel.org/show_bug.cgi?id=1948 diff --git a/a/content_digest b/N1/content_digest index f405779..e930db7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -18,7 +18,7 @@ "> On Sun, 2017-03-26 at 12:26 +0100, Andrey Utkin wrote:\n" "> > On Fri, Mar 10, 2017 at 10:07:35AM +0100, Greg Kroah-Hartman wrote:\n" "> > > \n" - "> > > 4.10-stable review patch.\302\240\302\240If anyone has any objections, please let\n" + "> > > 4.10-stable review patch.\303\257\302\277\302\275\303\257\302\277\302\275If anyone has any objections, please let\n" "> > > me know.\n" "> > > \n" "> > > ------------------\n" @@ -46,16 +46,16 @@ "> > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>\n" "> > > \n" "> > > ---\n" - "> > > \302\240drivers/mmc/host/sdhci-acpi.c |\302\240\302\240\302\240\302\2405 ++++-\n" - "> > > \302\2401 file changed, 4 insertions(+), 1 deletion(-)\n" + "> > > \303\257\302\277\302\275drivers/mmc/host/sdhci-acpi.c |\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\2755 ++++-\n" + "> > > \303\257\302\277\302\2751 file changed, 4 insertions(+), 1 deletion(-)\n" "> > > \n" "> > > --- a/drivers/mmc/host/sdhci-acpi.c\n" "> > > +++ b/drivers/mmc/host/sdhci-acpi.c\n" "> > > @@ -467,7 +467,10 @@ static int sdhci_acpi_probe(struct platf\n" - "> > > \302\240\tif (sdhci_acpi_flag(c, SDHCI_ACPI_SD_CD)) {\n" - "> > > \302\240\t\tbool v = sdhci_acpi_flag(c,\n" + "> > > \303\257\302\277\302\275\tif (sdhci_acpi_flag(c, SDHCI_ACPI_SD_CD)) {\n" + "> > > \303\257\302\277\302\275\t\tbool v = sdhci_acpi_flag(c,\n" "> > > SDHCI_ACPI_SD_CD_OVERRIDE_LEVEL);\n" - "> > > \302\240\n" + "> > > \303\257\302\277\302\275\n" "> > > -\t\tif (mmc_gpiod_request_cd(host->mmc, NULL, 0, v, 0,\n" "> > > NULL)) {\n" "> > > +\t\terr = mmc_gpiod_request_cd(host->mmc, NULL, 0, v,\n" @@ -63,10 +63,10 @@ "> > > +\t\tif (err) {\n" "> > > +\t\t\tif (err == -EPROBE_DEFER)\n" "> > > +\t\t\t\tgoto err_free;\n" - "> > > \302\240\t\t\tdev_warn(dev, \"failed to setup card detect\n" + "> > > \303\257\302\277\302\275\t\t\tdev_warn(dev, \"failed to setup card detect\n" "> > > gpio\\n\");\n" - "> > > \302\240\t\t\tc->use_runtime_pm = false;\n" - "> > > \302\240\t\t}\n" + "> > > \303\257\302\277\302\275\t\t\tc->use_runtime_pm = false;\n" + "> > > \303\257\302\277\302\275\t\t}\n" "> > > \n" "> > > \n" "> > Regression reported: https://bugzilla.kernel.org/show_bug.cgi?id=1948\n" @@ -83,4 +83,4 @@ "\n" greg k-h -4dea48a8f2f65906c7c069a85a6a59dadc1ec844f0edc01c3c0b67d8c28cb035 +bb19c516cd00aa26387e2337af73473c5b27072a7e1ae15023c2480a8672dea6
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.