diff for duplicates of <1445419649.22669.32.camel@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index 7a84ffa..5f4203f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,16 +25,16 @@ Jarkko sent this already couple hours ago. > +++ b/drivers/i2c/busses/i2c-designware-platdrv.c > @@ -307,8 +307,8 @@ static void dw_i2c_plat_complete(struct device > *dev) -> pm_request_resume(dev); -> } -> #else +> ? pm_request_resume(dev); +> ?} +> ?#else > -#define dw_i2c_prepare NULL > -#define dw_i2c_complete NULL > +#define dw_i2c_plat_prepare NULL > +#define dw_i2c_plat_complete NULL -> #endif -> -> #ifdef CONFIG_PM +> ?#endif +> ? +> ?#ifdef CONFIG_PM > -- diff --git a/a/content_digest b/N1/content_digest index 09ae2b3..a361cf5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,8 @@ "ref\04006973.dp9o3gm8C4@wuerfel\0" - "From\0Andy Shevchenko <andriy.shevchenko@linux.intel.com>\0" - "Subject\0Re: [PATCH] i2c: designware: fix platform driver probe rename\0" + "From\0andriy.shevchenko@linux.intel.com (Andy Shevchenko)\0" + "Subject\0[PATCH] i2c: designware: fix platform driver probe rename\0" "Date\0Wed, 21 Oct 2015 12:27:29 +0300\0" - "To\0Arnd Bergmann <arnd@arndb.de>" - " Wolfram Sang <wsa@the-dreams.de>\0" - "Cc\0Jarkko Nikula <jarkko.nikula@linux.intel.com>" - Mika Westerberg <mika.westerberg@linux.intel.com> - linux-i2c@vger.kernel.org - linux-kernel@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Wed, 2015-10-21 at 11:16 +0200, Arnd Bergmann wrote:\n" @@ -38,20 +32,20 @@ "> +++ b/drivers/i2c/busses/i2c-designware-platdrv.c\n" "> @@ -307,8 +307,8 @@ static void dw_i2c_plat_complete(struct device\n" "> *dev)\n" - "> \302\240\t\tpm_request_resume(dev);\n" - "> \302\240}\n" - "> \302\240#else\n" + "> ?\t\tpm_request_resume(dev);\n" + "> ?}\n" + "> ?#else\n" "> -#define dw_i2c_prepare\tNULL\n" "> -#define dw_i2c_complete\tNULL\n" "> +#define dw_i2c_plat_prepare\tNULL\n" "> +#define dw_i2c_plat_complete\tNULL\n" - "> \302\240#endif\n" - "> \302\240\n" - "> \302\240#ifdef CONFIG_PM\n" + "> ?#endif\n" + "> ?\n" + "> ?#ifdef CONFIG_PM\n" "> \n" "\n" "-- \n" "Andy Shevchenko <andriy.shevchenko@linux.intel.com>\n" Intel Finland Oy -d98a0c5dd4744b2798d5abbee29a3b1fb47495402ebd6b8b6d855d75c9e4141a +7afb917b1e479ee71a9d607323b2d6b6f2cadcfa053c6be8029cdd59a1d421f5
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.