diff for duplicates of <20140214090217.GD3403@lee--X1> diff --git a/a/1.txt b/N1/1.txt index 4ce7538..0a2cf1e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,43 +1,51 @@ -PiA+PiBodHRwOi8vY29tbWVudHMuZ21hbmUub3JnL2dtYW5lLmxpbnV4Lmtlcm5lbC8xNjQ1MjUx -Cj4gPj4KPiA+PiBTdGVwIDIgZGlkIG5vdCBoYXBwZW4uIEkgZGlkIG5vdCBnZXQgYW55IHJldmll -dyBmb3IgbXkgY2hhbmdlLiBJCj4gPj4gbGl0ZXJhbGx5IHN1Ym1pdHRlZCB0aGF0IHdpdGhpbiBh -IGNvdXBsZSBvZiBob3VycyBhZnRlciB0aGUgcmVxdWVzdC4KPiA+Pgo+ID4+IENvdWxkIHlvdSBw -bGVhc2UgdGVsbCBtZSB3aGF0IHdhcyB3cm9uZyB3aXRoIHRoYXQgY2hhbmdlLCBhbmQgd2h5IEkK -PiA+PiBkaWQgbm90IGdldCBhbnkgcmVzcGVjdCBub3QgdG8gInhhcmdzIHJtIC1yZiIgbXkgd29y -ayBpbiB0aGF0IGFyZWE/IEkKPiA+PiBiZWxpZXZlIEkgd2FzIGlnbm9yZWQgaW5zdGVhZCBvZiBp -bXByb3ZpbmcgdGhlIGNoYW5nZSwgYW5kIHNvbWVvbmUKPiA+PiBlbHNlIHRyaWVkIHRvIGFkZHJl -c3MgdGhlIHNhbWUgdGhpbmcuIFRoZXJlIHdhcyBubyBhcmd1bWVudCBpbiB0aGF0Cj4gPj4gdGhy -ZWFkLiBJdCB3YXMgYSB0ZWNobmljYWwgY2hhbmdlLiBJIHBlcnNvbmFsbHkgZG8gbm90IGZlZWwg -aGFwcHkKPiA+PiBhYm91dCBpdC4KPiA+Cj4gPiBMZXQncyBzdGFydCBhZ2Fpbi4KPiA+Cj4gPiBS -ZWJhc2UgeW91ciB3b3JrIG9uIHRvcCBvZiB0aGUgSFdNT04gdHJlZSBvbiBrZXJuZWwub3JnIGFu -ZCByZXN1Ym1pdAo+ID4gdGhlIGVudGlyZSBzZXQuIElmIHJlYmFzaW5nIHRha2VzIHlvdSBtb3Jl -IHRoYW4gMjAgbWlucywgeW91J3JlCj4gPiBwcm9iYWJseSBkb2luZyBpdCB3cm9uZy4KPiAKPiBJ -IHRyaWVkLCBidXQgSSBjb3VsZCBub3QgbWFuYWdlIGl0IHdpdGhpbiAyMCBtaW51dGVzLCBzbyBJ -IGd1ZXNzIEkgYW0KPiBkb2luZyBzb21ldGhpbmcgd3JvbmcuIENhbiB5b3UgcGxlYXNlIHByb3Zp -ZGUgc29tZSBwb2ludGVycyBob3cgbm90IHRvCj4gZG8gaXQgd3Jvbmc/IFBlcmhhcHMsIEkgYW0g -bm90IGF3YXJlIG9mIHNvbWUgdHJpY2tzLgoKT25lIHF1ZXN0aW9uLCBhcmUgeW91IHN0aWxsIHdv -cmtpbmcgb24gdGhpcyBzdHVmZiBvciBub3Q/IEknbSBjb25mdXNlZApieSB0aGUgZGlzcGFyaXR5 -IGluIHlvdXIgbWVzc2FnZXMuIEknbSBnb2luZyB0byBndWVzcyB0aGF0IHlvdSdyZSBpbgpmb3Ig -bm93LgoKRG86CiAgYGdpdCByZWJhc2UgLWkgPGJhc2U+IC0tb250byA8bmV3YmFzZT5gCldoZXJl -OgogIDxiYXNlPiBpcyB0aGUgU0hBMSBvZiB0aGUgZmlyc3QgcGF0Y2ggYmVsb3cgeW91ciBjaGFu -Z2VzIGluIGBnaXQgbG9nYAogIDxuZXdfYmFzZT4gaXMgR3VlbnRlcidzIHN0YWdpbmcgdHJlZSBv -biBrZXJuZWwub3JnCgpFbnN1cmUgeW91J3JlIHJlYmFzaW5nIGFsbCBvZiB5b3VyIHBhdGNoZXMg -KGFuZCBwYXRjaGVzIHRoYXQgYXJlbid0CnlvdXJzKSB3aGVuIHlvdXIgJEVESVRPUiBwb3BzIHVw -LiBJZiB0aGV5IGFyZSB3cm9uZywgZGVsZXRlIGFsbCB0aGUKbGluZXMgaW4gdGhlIGZpbGUgYW5k -IHRoZSByZWJhc2Ugd2lsbCBiZSBhYm9ydGVkLiBJZiB0aGV5J3JlIGNvcnJlY3QKc2F2ZSBhbmQg -Y2xvc2UgeW91ciAkRURJVE9SLgoKWW91J2xsIHJlY2VpdmUgY29uZmxpY3RzLiBZb3UgY2FuIHNl -ZSB0aGUgc3RhdGUgb2YgdGhlIGNvbmZsaWN0cyB1c2luZwpgZ2l0IHN0YXR1c2AgT3BlbiB0aGUg -ZmlsZSwgZmluZCB0aGUgY29uZmxpY3QgbWFya2VycyBhbmQgbWFrZSBhIGNob2ljZQpmcm9tIHRo -ZSBIRUFEIHNlY3Rpb24gb3IgdGhlIHNlY3Rpb24gZnJvbSB5b3VyIHBhdGNoLiBTb21ldGltZXMK -eW91J2xsIG5lZWQgdG8gbWFudWFsbHkgbWVyZ2UgdGhlIHR3bywgaWYgdGhlcmUgYXJlIGNoYW5n -ZXMgZnJvbSBib3RoCnJlZnMgdGhhdCB5b3Ugd2FudCB0byBrZWVwLiBPbmNlIHlvdSdyZSBoYXBw -eSBgZ2l0IGNvbW1pdCAtYWAgYW5kIGBnaXQKcmViYXNlIC0tY29udGludWVgLiBFYWNoIGNvbmZs -aWN0IHNob3VsZCBub3QgdGFrZSB5b3UgbG9uZywgYnV0IGlmIGl0CmRvZXMsIGtlZXAgYXQgaXQs -IGFzIGl0J3MgZ29vZCBwcmFjdGljZS4gQWZ0ZXIgYSB0aW1lIG9mIGRvaW5nIGl0LAp5b3UnbGwg -YmUgYWJsZSB0byBmaXggbWVyZ2UgY29uZmxpY3RzIGluIG5vIHRpbWUgYXQgYWxsLgoKLS0gCkxl -ZSBKb25lcwpMaW5hcm8gU1RNaWNyb2VsZWN0cm9uaWNzIExhbmRpbmcgVGVhbSBMZWFkCkxpbmFy -by5vcmcg4pSCIE9wZW4gc291cmNlIHNvZnR3YXJlIGZvciBBUk0gU29DcwpGb2xsb3cgTGluYXJv -OiBGYWNlYm9vayB8IFR3aXR0ZXIgfCBCbG9nCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f -X19fX19fX19fX19fX19fX19fXwpsbS1zZW5zb3JzIG1haWxpbmcgbGlzdApsbS1zZW5zb3JzQGxt -LXNlbnNvcnMub3JnCmh0dHA6Ly9saXN0cy5sbS1zZW5zb3JzLm9yZy9tYWlsbWFuL2xpc3RpbmZv -L2xtLXNlbnNvcnM +> >> http://comments.gmane.org/gmane.linux.kernel/1645251 +> >> +> >> Step 2 did not happen. I did not get any review for my change. I +> >> literally submitted that within a couple of hours after the request. +> >> +> >> Could you please tell me what was wrong with that change, and why I +> >> did not get any respect not to "xargs rm -rf" my work in that area? I +> >> believe I was ignored instead of improving the change, and someone +> >> else tried to address the same thing. There was no argument in that +> >> thread. It was a technical change. I personally do not feel happy +> >> about it. +> > +> > Let's start again. +> > +> > Rebase your work on top of the HWMON tree on kernel.org and resubmit +> > the entire set. If rebasing takes you more than 20 mins, you're +> > probably doing it wrong. +> +> I tried, but I could not manage it within 20 minutes, so I guess I am +> doing something wrong. Can you please provide some pointers how not to +> do it wrong? Perhaps, I am not aware of some tricks. + +One question, are you still working on this stuff or not? I'm confused +by the disparity in your messages. I'm going to guess that you're in +for now. + +Do: + `git rebase -i <base> --onto <newbase>` +Where: + <base> is the SHA1 of the first patch below your changes in `git log` + <new_base> is Guenter's staging tree on kernel.org + +Ensure you're rebasing all of your patches (and patches that aren't +yours) when your $EDITOR pops up. If they are wrong, delete all the +lines in the file and the rebase will be aborted. If they're correct +save and close your $EDITOR. + +You'll receive conflicts. You can see the state of the conflicts using +`git status` Open the file, find the conflict markers and make a choice +from the HEAD section or the section from your patch. Sometimes +you'll need to manually merge the two, if there are changes from both +refs that you want to keep. Once you're happy `git commit -a` and `git +rebase --continue`. Each conflict should not take you long, but if it +does, keep at it, as it's good practice. After a time of doing it, +you'll be able to fix merge conflicts in no time at all. + +-- +Lee Jones +Linaro STMicroelectronics Landing Team Lead +Linaro.org │ Open source software for ARM SoCs +Follow Linaro: Facebook | Twitter | Blog diff --git a/a/content_digest b/N1/content_digest index 6d0a325..0321e68 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -17,48 +17,56 @@ " Guenter Roeck <linux@roeck-us.net>\0" "\00:1\0" "b\0" - "PiA+PiBodHRwOi8vY29tbWVudHMuZ21hbmUub3JnL2dtYW5lLmxpbnV4Lmtlcm5lbC8xNjQ1MjUx\n" - "Cj4gPj4KPiA+PiBTdGVwIDIgZGlkIG5vdCBoYXBwZW4uIEkgZGlkIG5vdCBnZXQgYW55IHJldmll\n" - "dyBmb3IgbXkgY2hhbmdlLiBJCj4gPj4gbGl0ZXJhbGx5IHN1Ym1pdHRlZCB0aGF0IHdpdGhpbiBh\n" - "IGNvdXBsZSBvZiBob3VycyBhZnRlciB0aGUgcmVxdWVzdC4KPiA+Pgo+ID4+IENvdWxkIHlvdSBw\n" - "bGVhc2UgdGVsbCBtZSB3aGF0IHdhcyB3cm9uZyB3aXRoIHRoYXQgY2hhbmdlLCBhbmQgd2h5IEkK\n" - "PiA+PiBkaWQgbm90IGdldCBhbnkgcmVzcGVjdCBub3QgdG8gInhhcmdzIHJtIC1yZiIgbXkgd29y\n" - "ayBpbiB0aGF0IGFyZWE/IEkKPiA+PiBiZWxpZXZlIEkgd2FzIGlnbm9yZWQgaW5zdGVhZCBvZiBp\n" - "bXByb3ZpbmcgdGhlIGNoYW5nZSwgYW5kIHNvbWVvbmUKPiA+PiBlbHNlIHRyaWVkIHRvIGFkZHJl\n" - "c3MgdGhlIHNhbWUgdGhpbmcuIFRoZXJlIHdhcyBubyBhcmd1bWVudCBpbiB0aGF0Cj4gPj4gdGhy\n" - "ZWFkLiBJdCB3YXMgYSB0ZWNobmljYWwgY2hhbmdlLiBJIHBlcnNvbmFsbHkgZG8gbm90IGZlZWwg\n" - "aGFwcHkKPiA+PiBhYm91dCBpdC4KPiA+Cj4gPiBMZXQncyBzdGFydCBhZ2Fpbi4KPiA+Cj4gPiBS\n" - "ZWJhc2UgeW91ciB3b3JrIG9uIHRvcCBvZiB0aGUgSFdNT04gdHJlZSBvbiBrZXJuZWwub3JnIGFu\n" - "ZCByZXN1Ym1pdAo+ID4gdGhlIGVudGlyZSBzZXQuIElmIHJlYmFzaW5nIHRha2VzIHlvdSBtb3Jl\n" - "IHRoYW4gMjAgbWlucywgeW91J3JlCj4gPiBwcm9iYWJseSBkb2luZyBpdCB3cm9uZy4KPiAKPiBJ\n" - "IHRyaWVkLCBidXQgSSBjb3VsZCBub3QgbWFuYWdlIGl0IHdpdGhpbiAyMCBtaW51dGVzLCBzbyBJ\n" - "IGd1ZXNzIEkgYW0KPiBkb2luZyBzb21ldGhpbmcgd3JvbmcuIENhbiB5b3UgcGxlYXNlIHByb3Zp\n" - "ZGUgc29tZSBwb2ludGVycyBob3cgbm90IHRvCj4gZG8gaXQgd3Jvbmc/IFBlcmhhcHMsIEkgYW0g\n" - "bm90IGF3YXJlIG9mIHNvbWUgdHJpY2tzLgoKT25lIHF1ZXN0aW9uLCBhcmUgeW91IHN0aWxsIHdv\n" - "cmtpbmcgb24gdGhpcyBzdHVmZiBvciBub3Q/IEknbSBjb25mdXNlZApieSB0aGUgZGlzcGFyaXR5\n" - "IGluIHlvdXIgbWVzc2FnZXMuIEknbSBnb2luZyB0byBndWVzcyB0aGF0IHlvdSdyZSBpbgpmb3Ig\n" - "bm93LgoKRG86CiAgYGdpdCByZWJhc2UgLWkgPGJhc2U+IC0tb250byA8bmV3YmFzZT5gCldoZXJl\n" - "OgogIDxiYXNlPiBpcyB0aGUgU0hBMSBvZiB0aGUgZmlyc3QgcGF0Y2ggYmVsb3cgeW91ciBjaGFu\n" - "Z2VzIGluIGBnaXQgbG9nYAogIDxuZXdfYmFzZT4gaXMgR3VlbnRlcidzIHN0YWdpbmcgdHJlZSBv\n" - "biBrZXJuZWwub3JnCgpFbnN1cmUgeW91J3JlIHJlYmFzaW5nIGFsbCBvZiB5b3VyIHBhdGNoZXMg\n" - "KGFuZCBwYXRjaGVzIHRoYXQgYXJlbid0CnlvdXJzKSB3aGVuIHlvdXIgJEVESVRPUiBwb3BzIHVw\n" - "LiBJZiB0aGV5IGFyZSB3cm9uZywgZGVsZXRlIGFsbCB0aGUKbGluZXMgaW4gdGhlIGZpbGUgYW5k\n" - "IHRoZSByZWJhc2Ugd2lsbCBiZSBhYm9ydGVkLiBJZiB0aGV5J3JlIGNvcnJlY3QKc2F2ZSBhbmQg\n" - "Y2xvc2UgeW91ciAkRURJVE9SLgoKWW91J2xsIHJlY2VpdmUgY29uZmxpY3RzLiBZb3UgY2FuIHNl\n" - "ZSB0aGUgc3RhdGUgb2YgdGhlIGNvbmZsaWN0cyB1c2luZwpgZ2l0IHN0YXR1c2AgT3BlbiB0aGUg\n" - "ZmlsZSwgZmluZCB0aGUgY29uZmxpY3QgbWFya2VycyBhbmQgbWFrZSBhIGNob2ljZQpmcm9tIHRo\n" - "ZSBIRUFEIHNlY3Rpb24gb3IgdGhlIHNlY3Rpb24gZnJvbSB5b3VyIHBhdGNoLiBTb21ldGltZXMK\n" - "eW91J2xsIG5lZWQgdG8gbWFudWFsbHkgbWVyZ2UgdGhlIHR3bywgaWYgdGhlcmUgYXJlIGNoYW5n\n" - "ZXMgZnJvbSBib3RoCnJlZnMgdGhhdCB5b3Ugd2FudCB0byBrZWVwLiBPbmNlIHlvdSdyZSBoYXBw\n" - "eSBgZ2l0IGNvbW1pdCAtYWAgYW5kIGBnaXQKcmViYXNlIC0tY29udGludWVgLiBFYWNoIGNvbmZs\n" - "aWN0IHNob3VsZCBub3QgdGFrZSB5b3UgbG9uZywgYnV0IGlmIGl0CmRvZXMsIGtlZXAgYXQgaXQs\n" - "IGFzIGl0J3MgZ29vZCBwcmFjdGljZS4gQWZ0ZXIgYSB0aW1lIG9mIGRvaW5nIGl0LAp5b3UnbGwg\n" - "YmUgYWJsZSB0byBmaXggbWVyZ2UgY29uZmxpY3RzIGluIG5vIHRpbWUgYXQgYWxsLgoKLS0gCkxl\n" - "ZSBKb25lcwpMaW5hcm8gU1RNaWNyb2VsZWN0cm9uaWNzIExhbmRpbmcgVGVhbSBMZWFkCkxpbmFy\n" - "by5vcmcg4pSCIE9wZW4gc291cmNlIHNvZnR3YXJlIGZvciBBUk0gU29DcwpGb2xsb3cgTGluYXJv\n" - "OiBGYWNlYm9vayB8IFR3aXR0ZXIgfCBCbG9nCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f\n" - "X19fX19fX19fX19fX19fX19fXwpsbS1zZW5zb3JzIG1haWxpbmcgbGlzdApsbS1zZW5zb3JzQGxt\n" - "LXNlbnNvcnMub3JnCmh0dHA6Ly9saXN0cy5sbS1zZW5zb3JzLm9yZy9tYWlsbWFuL2xpc3RpbmZv\n" - L2xtLXNlbnNvcnM + "> >> http://comments.gmane.org/gmane.linux.kernel/1645251\n" + "> >>\n" + "> >> Step 2 did not happen. I did not get any review for my change. I\n" + "> >> literally submitted that within a couple of hours after the request.\n" + "> >>\n" + "> >> Could you please tell me what was wrong with that change, and why I\n" + "> >> did not get any respect not to \"xargs rm -rf\" my work in that area? I\n" + "> >> believe I was ignored instead of improving the change, and someone\n" + "> >> else tried to address the same thing. There was no argument in that\n" + "> >> thread. It was a technical change. I personally do not feel happy\n" + "> >> about it.\n" + "> >\n" + "> > Let's start again.\n" + "> >\n" + "> > Rebase your work on top of the HWMON tree on kernel.org and resubmit\n" + "> > the entire set. If rebasing takes you more than 20 mins, you're\n" + "> > probably doing it wrong.\n" + "> \n" + "> I tried, but I could not manage it within 20 minutes, so I guess I am\n" + "> doing something wrong. Can you please provide some pointers how not to\n" + "> do it wrong? Perhaps, I am not aware of some tricks.\n" + "\n" + "One question, are you still working on this stuff or not? I'm confused\n" + "by the disparity in your messages. I'm going to guess that you're in\n" + "for now.\n" + "\n" + "Do:\n" + " `git rebase -i <base> --onto <newbase>`\n" + "Where:\n" + " <base> is the SHA1 of the first patch below your changes in `git log`\n" + " <new_base> is Guenter's staging tree on kernel.org\n" + "\n" + "Ensure you're rebasing all of your patches (and patches that aren't\n" + "yours) when your $EDITOR pops up. If they are wrong, delete all the\n" + "lines in the file and the rebase will be aborted. If they're correct\n" + "save and close your $EDITOR.\n" + "\n" + "You'll receive conflicts. You can see the state of the conflicts using\n" + "`git status` Open the file, find the conflict markers and make a choice\n" + "from the HEAD section or the section from your patch. Sometimes\n" + "you'll need to manually merge the two, if there are changes from both\n" + "refs that you want to keep. Once you're happy `git commit -a` and `git\n" + "rebase --continue`. Each conflict should not take you long, but if it\n" + "does, keep at it, as it's good practice. After a time of doing it,\n" + "you'll be able to fix merge conflicts in no time at all.\n" + "\n" + "-- \n" + "Lee Jones\n" + "Linaro STMicroelectronics Landing Team Lead\n" + "Linaro.org \342\224\202 Open source software for ARM SoCs\n" + Follow Linaro: Facebook | Twitter | Blog -1800a80f2d90db0a2694992b980e45525c539d51583aa4f38576156fb2b37b78 +43cc27d92de8fa81625d18e8a3ddc755db4228a90bf8db247fba2dfe24650574
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.