All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <1369150371.18338.4.camel@lorien>

diff --git a/a/1.txt b/N1/1.txt
index 5e3ff95..8240cf1 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,34 +1,52 @@
-T24gVHVlLCAyMDEzLTA1LTIxIGF0IDAwOjI4IC0wMzAwLCBHdXN0YXZvIFBhZG92YW4gd3JvdGU6
-DQo+IEhpIFNodWFuLA0KPiANCj4gKiBTaHVhaCBLaGFuIDxzaHVhaC5raEBzYW1zdW5nLmNvbT4g
-WzIwMTMtMDUtMjEgMDE6MDI6NTggKzAwMDBdOg0KPiANCj4gPiBBZGQgbWlzc2luZyByZXNldF9y
-ZXN1bWUgZGV2X3BtX29wcy4gTWlzc2luZyByZXNldF9yZXN1bWUgcmVzdWx0cyBpbiB0aGUNCj4g
-PiBmb2xsb3dpbmcgbWVzc2FnZSBhZnRlciBwb3dlciBtYW5hZ2VtZW50IGRldmljZSB0ZXN0LiBU
-aGlzIGNoYW5nZSBzZXRzDQo+ID4gcmVzZXRfcmVzdW1lIHRvIGJ0dXNiX3Jlc3VtZSgpLg0KPiA+
-IA0KPiA+IFsgMjUwNi45MzYxMzRdIGJ0dXNiIDEtMS41OjEuMDogbm8gcmVzZXRfcmVzdW1lIGZv
-ciBkcml2ZXIgYnR1c2I/DQo+ID4gWyAyNTA2LjkzNjEzN10gYnR1c2IgMS0xLjU6MS4xOiBubyBy
-ZXNldF9yZXN1bWUgZm9yIGRyaXZlciBidHVzYj8NCj4gPiANCj4gPiBTaWduZWQtb2ZmLWJ5OiBT
-aHVhaCBLaGFuIDxzaHVhaC5raEBzYW1zdW5nLmNvbT4NCj4gPiAtLS0NCj4gPiAgZHJpdmVycy9i
-bHVldG9vdGgvYnR1c2IuYyB8ICAgIDEgKw0KPiA+ICAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRp
-b24oKykNCj4gPiANCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ibHVldG9vdGgvYnR1c2IuYyBi
-L2RyaXZlcnMvYmx1ZXRvb3RoL2J0dXNiLmMNCj4gPiBpbmRleCA3YTdlNWY4Li4xZWI5MGMwIDEw
-MDY0NA0KPiA+IC0tLSBhL2RyaXZlcnMvYmx1ZXRvb3RoL2J0dXNiLmMNCj4gPiArKysgYi9kcml2
-ZXJzL2JsdWV0b290aC9idHVzYi5jDQo+ID4gQEAgLTE2MTYsNiArMTYxNiw3IEBAIHN0YXRpYyBz
-dHJ1Y3QgdXNiX2RyaXZlciBidHVzYl9kcml2ZXIgPSB7DQo+ID4gICNpZmRlZiBDT05GSUdfUE0N
-Cj4gPiAgCS5zdXNwZW5kCT0gYnR1c2Jfc3VzcGVuZCwNCj4gPiAgCS5yZXN1bWUJCT0gYnR1c2Jf
-cmVzdW1lLA0KPiA+ICsJLnJlc2V0X3Jlc3VtZQk9IGJ0dXNiX3Jlc3VtZSwNCj4gPiAgI2VuZGlm
-DQo+ID4gIAkuaWRfdGFibGUJPSBidHVzYl90YWJsZSwNCj4gPiAgCS5zdXBwb3J0c19hdXRvc3Vz
-cGVuZCA9IDEsDQo+IA0KPiBQYXRjaCBzdGlsbCBkb2Vzbid0IGFwcGx5LCBhcmUgeW91IHNlbmRp
-bmcgaXQgd2l0aCBnaXQtc2VuZC1lbWFpbD8NCj4gDQo+IEFwcGx5aW5nOiBCbHVldG9vdGg6IEFk
-ZCBtaXNzaW5nIHJlc2V0X3Jlc3VtZSBkZXZfcG1fb3BzDQo+IC9ob21lL3BhZG92YW4vcC9saW51
-eC10cmVlcy9ibHVldG9vdGgtbmV4dC8uZ2l0L3JlYmFzZS1hcHBseS9wYXRjaDoxMzogdHJhaWxp
-bmcgd2hpdGVzcGFjZS4NCj4gICAgICAgICAucmVzZXRfcmVzdW1lICAgPSBidHVzYl9yZXN1bWUs
-DQo+IGVycm9yOiBwYXRjaCBmYWlsZWQ6IGRyaXZlcnMvYmx1ZXRvb3RoL2J0dXNiLmM6MTYxNg0K
-PiBlcnJvcjogZHJpdmVycy9ibHVldG9vdGgvYnR1c2IuYzogcGF0Y2ggZG9lcyBub3QgYXBwbHkN
-Cj4gUGF0Y2ggZmFpbGVkIGF0IDAwMDEgQmx1ZXRvb3RoOiBBZGQgbWlzc2luZyByZXNldF9yZXN1
-bWUgZGV2X3BtX29wcw0KPiANCj4gCUd1c3Rhdm8NCg0KSSBzYXZlZCB0aGUgcGF0Y2ggZnJvbSB0
-aGUgZW1haWwgSSBzZW50IGFuZCBhcHBsaWVkIHRvIHlvdXIgbGF0ZXN0IGdpdA0KYW5kIGl0IGFw
-cGxpZXMuIEkgYW0gbm90IHN1cmUgd2hhdCBoYXBwZW5lZC4gSW4gYW55IGNhc2UsIEkganVzdCBy
-ZXNlbnQNCml0IHVzaW5nIGdpdC1zZW5kLWVtYWlsLiBIb3BlIHRoYXQgd29ya3MuDQoNCi0tIFNo
-dWFoDQoNClNodWFoIEtoYW4sIExpbnV4IEtlcm5lbCBEZXZlbG9wZXIgLSBPcGVuIFNvdXJjZSBH
-cm91cCANClNhbXN1bmcgUmVzZWFyY2ggQW1lcmljYSAoU2lsaWNvbiBWYWxsZXkpDQpzaHVhaC5r
-aEBzYW1zdW5nLmNvbSB8ICg5NzApIDY3Mi0wNjU4DQoNCg==
+On Tue, 2013-05-21 at 00:28 -0300, Gustavo Padovan wrote:
+> Hi Shuan,
+> 
+> * Shuah Khan <shuah.kh@samsung.com> [2013-05-21 01:02:58 +0000]:
+> 
+> > Add missing reset_resume dev_pm_ops. Missing reset_resume results in the
+> > following message after power management device test. This change sets
+> > reset_resume to btusb_resume().
+> > 
+> > [ 2506.936134] btusb 1-1.5:1.0: no reset_resume for driver btusb?
+> > [ 2506.936137] btusb 1-1.5:1.1: no reset_resume for driver btusb?
+> > 
+> > Signed-off-by: Shuah Khan <shuah.kh@samsung.com>
+> > ---
+> >  drivers/bluetooth/btusb.c |    1 +
+> >  1 file changed, 1 insertion(+)
+> > 
+> > diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
+> > index 7a7e5f8..1eb90c0 100644
+> > --- a/drivers/bluetooth/btusb.c
+> > +++ b/drivers/bluetooth/btusb.c
+> > @@ -1616,6 +1616,7 @@ static struct usb_driver btusb_driver = {
+> >  #ifdef CONFIG_PM
+> >  	.suspend	= btusb_suspend,
+> >  	.resume		= btusb_resume,
+> > +	.reset_resume	= btusb_resume,
+> >  #endif
+> >  	.id_table	= btusb_table,
+> >  	.supports_autosuspend = 1,
+> 
+> Patch still doesn't apply, are you sending it with git-send-email?
+> 
+> Applying: Bluetooth: Add missing reset_resume dev_pm_ops
+> /home/padovan/p/linux-trees/bluetooth-next/.git/rebase-apply/patch:13: trailing whitespace.
+>         .reset_resume   = btusb_resume,
+> error: patch failed: drivers/bluetooth/btusb.c:1616
+> error: drivers/bluetooth/btusb.c: patch does not apply
+> Patch failed at 0001 Bluetooth: Add missing reset_resume dev_pm_ops
+> 
+> 	Gustavo
+
+I saved the patch from the email I sent and applied to your latest git
+and it applies. I am not sure what happened. In any case, I just resent
+it using git-send-email. Hope that works.
+
+-- Shuah
+
+Shuah Khan, Linux Kernel Developer - Open Source Group 
+Samsung Research America (Silicon Valley)
+shuah.kh@samsung.com | (970) 672-0658
+
+ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥
diff --git a/a/content_digest b/N1/content_digest
index d4a5b73..d703284 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -14,39 +14,57 @@
  " shuahkhan@gmail.com <shuahkhan@gmail.com>\0"
  "\00:1\0"
  "b\0"
- "T24gVHVlLCAyMDEzLTA1LTIxIGF0IDAwOjI4IC0wMzAwLCBHdXN0YXZvIFBhZG92YW4gd3JvdGU6\n"
- "DQo+IEhpIFNodWFuLA0KPiANCj4gKiBTaHVhaCBLaGFuIDxzaHVhaC5raEBzYW1zdW5nLmNvbT4g\n"
- "WzIwMTMtMDUtMjEgMDE6MDI6NTggKzAwMDBdOg0KPiANCj4gPiBBZGQgbWlzc2luZyByZXNldF9y\n"
- "ZXN1bWUgZGV2X3BtX29wcy4gTWlzc2luZyByZXNldF9yZXN1bWUgcmVzdWx0cyBpbiB0aGUNCj4g\n"
- "PiBmb2xsb3dpbmcgbWVzc2FnZSBhZnRlciBwb3dlciBtYW5hZ2VtZW50IGRldmljZSB0ZXN0LiBU\n"
- "aGlzIGNoYW5nZSBzZXRzDQo+ID4gcmVzZXRfcmVzdW1lIHRvIGJ0dXNiX3Jlc3VtZSgpLg0KPiA+\n"
- "IA0KPiA+IFsgMjUwNi45MzYxMzRdIGJ0dXNiIDEtMS41OjEuMDogbm8gcmVzZXRfcmVzdW1lIGZv\n"
- "ciBkcml2ZXIgYnR1c2I/DQo+ID4gWyAyNTA2LjkzNjEzN10gYnR1c2IgMS0xLjU6MS4xOiBubyBy\n"
- "ZXNldF9yZXN1bWUgZm9yIGRyaXZlciBidHVzYj8NCj4gPiANCj4gPiBTaWduZWQtb2ZmLWJ5OiBT\n"
- "aHVhaCBLaGFuIDxzaHVhaC5raEBzYW1zdW5nLmNvbT4NCj4gPiAtLS0NCj4gPiAgZHJpdmVycy9i\n"
- "bHVldG9vdGgvYnR1c2IuYyB8ICAgIDEgKw0KPiA+ICAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRp\n"
- "b24oKykNCj4gPiANCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ibHVldG9vdGgvYnR1c2IuYyBi\n"
- "L2RyaXZlcnMvYmx1ZXRvb3RoL2J0dXNiLmMNCj4gPiBpbmRleCA3YTdlNWY4Li4xZWI5MGMwIDEw\n"
- "MDY0NA0KPiA+IC0tLSBhL2RyaXZlcnMvYmx1ZXRvb3RoL2J0dXNiLmMNCj4gPiArKysgYi9kcml2\n"
- "ZXJzL2JsdWV0b290aC9idHVzYi5jDQo+ID4gQEAgLTE2MTYsNiArMTYxNiw3IEBAIHN0YXRpYyBz\n"
- "dHJ1Y3QgdXNiX2RyaXZlciBidHVzYl9kcml2ZXIgPSB7DQo+ID4gICNpZmRlZiBDT05GSUdfUE0N\n"
- "Cj4gPiAgCS5zdXNwZW5kCT0gYnR1c2Jfc3VzcGVuZCwNCj4gPiAgCS5yZXN1bWUJCT0gYnR1c2Jf\n"
- "cmVzdW1lLA0KPiA+ICsJLnJlc2V0X3Jlc3VtZQk9IGJ0dXNiX3Jlc3VtZSwNCj4gPiAgI2VuZGlm\n"
- "DQo+ID4gIAkuaWRfdGFibGUJPSBidHVzYl90YWJsZSwNCj4gPiAgCS5zdXBwb3J0c19hdXRvc3Vz\n"
- "cGVuZCA9IDEsDQo+IA0KPiBQYXRjaCBzdGlsbCBkb2Vzbid0IGFwcGx5LCBhcmUgeW91IHNlbmRp\n"
- "bmcgaXQgd2l0aCBnaXQtc2VuZC1lbWFpbD8NCj4gDQo+IEFwcGx5aW5nOiBCbHVldG9vdGg6IEFk\n"
- "ZCBtaXNzaW5nIHJlc2V0X3Jlc3VtZSBkZXZfcG1fb3BzDQo+IC9ob21lL3BhZG92YW4vcC9saW51\n"
- "eC10cmVlcy9ibHVldG9vdGgtbmV4dC8uZ2l0L3JlYmFzZS1hcHBseS9wYXRjaDoxMzogdHJhaWxp\n"
- "bmcgd2hpdGVzcGFjZS4NCj4gICAgICAgICAucmVzZXRfcmVzdW1lICAgPSBidHVzYl9yZXN1bWUs\n"
- "DQo+IGVycm9yOiBwYXRjaCBmYWlsZWQ6IGRyaXZlcnMvYmx1ZXRvb3RoL2J0dXNiLmM6MTYxNg0K\n"
- "PiBlcnJvcjogZHJpdmVycy9ibHVldG9vdGgvYnR1c2IuYzogcGF0Y2ggZG9lcyBub3QgYXBwbHkN\n"
- "Cj4gUGF0Y2ggZmFpbGVkIGF0IDAwMDEgQmx1ZXRvb3RoOiBBZGQgbWlzc2luZyByZXNldF9yZXN1\n"
- "bWUgZGV2X3BtX29wcw0KPiANCj4gCUd1c3Rhdm8NCg0KSSBzYXZlZCB0aGUgcGF0Y2ggZnJvbSB0\n"
- "aGUgZW1haWwgSSBzZW50IGFuZCBhcHBsaWVkIHRvIHlvdXIgbGF0ZXN0IGdpdA0KYW5kIGl0IGFw\n"
- "cGxpZXMuIEkgYW0gbm90IHN1cmUgd2hhdCBoYXBwZW5lZC4gSW4gYW55IGNhc2UsIEkganVzdCBy\n"
- "ZXNlbnQNCml0IHVzaW5nIGdpdC1zZW5kLWVtYWlsLiBIb3BlIHRoYXQgd29ya3MuDQoNCi0tIFNo\n"
- "dWFoDQoNClNodWFoIEtoYW4sIExpbnV4IEtlcm5lbCBEZXZlbG9wZXIgLSBPcGVuIFNvdXJjZSBH\n"
- "cm91cCANClNhbXN1bmcgUmVzZWFyY2ggQW1lcmljYSAoU2lsaWNvbiBWYWxsZXkpDQpzaHVhaC5r\n"
- aEBzYW1zdW5nLmNvbSB8ICg5NzApIDY3Mi0wNjU4DQoNCg==
+ "On Tue, 2013-05-21 at 00:28 -0300, Gustavo Padovan wrote:\n"
+ "> Hi Shuan,\n"
+ "> \n"
+ "> * Shuah Khan <shuah.kh@samsung.com> [2013-05-21 01:02:58 +0000]:\n"
+ "> \n"
+ "> > Add missing reset_resume dev_pm_ops. Missing reset_resume results in the\n"
+ "> > following message after power management device test. This change sets\n"
+ "> > reset_resume to btusb_resume().\n"
+ "> > \n"
+ "> > [ 2506.936134] btusb 1-1.5:1.0: no reset_resume for driver btusb?\n"
+ "> > [ 2506.936137] btusb 1-1.5:1.1: no reset_resume for driver btusb?\n"
+ "> > \n"
+ "> > Signed-off-by: Shuah Khan <shuah.kh@samsung.com>\n"
+ "> > ---\n"
+ "> >  drivers/bluetooth/btusb.c |    1 +\n"
+ "> >  1 file changed, 1 insertion(+)\n"
+ "> > \n"
+ "> > diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c\n"
+ "> > index 7a7e5f8..1eb90c0 100644\n"
+ "> > --- a/drivers/bluetooth/btusb.c\n"
+ "> > +++ b/drivers/bluetooth/btusb.c\n"
+ "> > @@ -1616,6 +1616,7 @@ static struct usb_driver btusb_driver = {\n"
+ "> >  #ifdef CONFIG_PM\n"
+ "> >  \t.suspend\t= btusb_suspend,\n"
+ "> >  \t.resume\t\t= btusb_resume,\n"
+ "> > +\t.reset_resume\t= btusb_resume,\n"
+ "> >  #endif\n"
+ "> >  \t.id_table\t= btusb_table,\n"
+ "> >  \t.supports_autosuspend = 1,\n"
+ "> \n"
+ "> Patch still doesn't apply, are you sending it with git-send-email?\n"
+ "> \n"
+ "> Applying: Bluetooth: Add missing reset_resume dev_pm_ops\n"
+ "> /home/padovan/p/linux-trees/bluetooth-next/.git/rebase-apply/patch:13: trailing whitespace.\n"
+ ">         .reset_resume   = btusb_resume,\n"
+ "> error: patch failed: drivers/bluetooth/btusb.c:1616\n"
+ "> error: drivers/bluetooth/btusb.c: patch does not apply\n"
+ "> Patch failed at 0001 Bluetooth: Add missing reset_resume dev_pm_ops\n"
+ "> \n"
+ "> \tGustavo\n"
+ "\n"
+ "I saved the patch from the email I sent and applied to your latest git\n"
+ "and it applies. I am not sure what happened. In any case, I just resent\n"
+ "it using git-send-email. Hope that works.\n"
+ "\n"
+ "-- Shuah\n"
+ "\n"
+ "Shuah Khan, Linux Kernel Developer - Open Source Group \n"
+ "Samsung Research America (Silicon Valley)\n"
+ "shuah.kh@samsung.com | (970) 672-0658\n"
+ "\n"
+ "\303\277\303\264\303\250\302\272{.n\303\207+\302\211\302\267\302\237\302\256\302\211\302\255\302\206+%\302\212\303\213\303\277\302\261\303\251\303\235\302\266\027\302\245\302\212w\303\277\302\272{.n\303\207+\302\211\302\267\302\245\302\212{\302\261\303\276G\302\253\302\235\303\251\303\277\302\212{ay\302\272\035\303\212\302\207\303\232\302\231\303\253,j\a\302\255\302\242f\302\243\302\242\302\267h\302\232\302\217\303\257\302\201\303\252\303\277\302\221\303\252\303\247z_\303\250\302\256\003(\302\255\303\251\302\232\302\216\302\212\303\235\302\242j\"\302\235\303\272\032\302\266\033m\302\247\303\277\303\277\302\276\a\302\253\303\276G\302\253\302\235\303\251\303\277\302\242\302\270?\302\231\302\250\303\250\302\255\303\232&\302\243\303\270\302\247~\302\217\303\241\302\266iO\302\225\303\246\302\254z\302\267\302\232v\303\230^\024\004\032\302\266\033m\302\247\303\277\303\277\303\203\f\303\277\302\266\303\254\303\277\302\242\302\270?\302\226I\302\245"
 
-fb24c6ef27be9d59474c01d0bce66b7fdfdef29dec587613778777b8434ea6ed
+71d1bf3787b15aaf8c29da9ee3fdabf00ede14135dc656d6f189434b54022b27

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.