<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><br><div><div>Am 09.06.2013 um 22:29 schrieb radek polak:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div><br><blockquote><br><br>I tried to do a clean apply but it failed (got some "whitespace" errors and conflicts). I did get it from<br><br><a href="https://gitorious.org/shr/linux/commit/5c4603590af40cccce1d75396d4cb3fdffe0fdef?format=patch">https://gitorious.org/shr/linux/commit/5c4603590af40cccce1d75396d4cb3fdffe0fdef?format=patch</a><br><br>since I did not find a button to download the patch file from github.<br><br>I think to remember that I had similar problems in January and therefore applied the<br>patch by copy&paste. Maybe the white noise is because I forgot a little piece.</blockquote><p><br></p><p>Yay</p><div> <br class="webkit-block-placeholder"></div><blockquote><br><br>So what is best the location to download the patch file? Or can you send it by mail again?</blockquote><p><br></p><p>Why dont you use cherry pick?</p></div></blockquote><div>Well, some reasons:</div><div><br></div><div>1. I am a sporadic git user and remembering all these git commands (and</div><div> knowing all details what side-effects and pits to fall in they can have) is</div><div> beyond my mental capacity...</div><blockquote type="cite"><div><p> Like:</p><p><br></p><p>git remote add radekp <a href="https://github.com/radekp/linux-2.6.git">https://github.com/radekp/linux-2.6.git</a></p><p>git fetch radekp</p></div></blockquote>2. doesn't this need a lot of disk space while a .patch file is just some 100 bytes?<br><blockquote type="cite"><div><p>git cherry-pick <span style="line-height: 1.3;">a80d1a70b2d0e03babb667e7f04af2213cd5b5c5</span></p></div></blockquote>3. how do I know the location and the hash code?</div><div><br></div><div>4. and is it the same as the one at gitorius (which has a different hex code)?<br><blockquote type="cite"><div><p><span style="line-height: 1.3;"><br></span></p><p><span style="line-height: 1.3;">Copy paste will make big mess if i want merge your tree back.</span></p></div></blockquote>In my experience it may save hours if you see the right patch in</div><div>the Google web search results (mail or formatted) but you don't</div><div>find a way how to apply a diff/patch file by using git...</div><div><br></div><div>And generally if a patch does not apply cleanly I can try to resolve conflicts</div><div>and that may be as wrong as copy&paste :(</div><br><div>Using your commands the patch applied fine.</div><div><br></div><div>But noise is still there. So it must be something else.</div><div><br></div><div>Thanks,</div><div>Nikolaus</div><div><br></div></body></html>