Re: [git pull] Please pull powerpc.git merge branch

2014-04-01 Thread Benjamin Herrenschmidt
On Wed, 2014-04-02 at 10:34 +1100, Benjamin Herrenschmidt wrote: > Hi Linus ! > > This time around, the powerpc merges are going to be a little bit > more complicated than usual. Looks like I sent this one twice, one with "merge" and one with "next" in the subject. They are otherwise identical (i

Re: [git pull] Please pull powerpc.git merge branch

2014-01-15 Thread Benjamin Herrenschmidt
On Wed, 2014-01-15 at 15:05 +0700, Linus Torvalds wrote: > On Wed, Jan 15, 2014 at 12:01 PM, Benjamin Herrenschmidt > wrote: > > > > My original intend was to put it in powerpc-next and then shoot it to > > stable, but it got a tad annoying (due to churn it needs to be applied > > at least on rc4

Re: [git pull] Please pull powerpc.git merge branch

2014-01-15 Thread Linus Torvalds
On Wed, Jan 15, 2014 at 12:01 PM, Benjamin Herrenschmidt wrote: > > My original intend was to put it in powerpc-next and then shoot it to > stable, but it got a tad annoying (due to churn it needs to be applied > at least on rc4 or later while my next is at rc1 and clean that way), so > I put it i

Re: [git pull] Please pull powerpc.git merge branch

2013-12-09 Thread Benjamin Herrenschmidt
On Mon, 2013-12-09 at 19:58 -0800, Linus Torvalds wrote: > On Mon, Dec 9, 2013 at 5:57 PM, Benjamin Herrenschmidt > wrote: > > > > Here are a handful of powerpc fixes for 3.13. > > Grr. > > I've pulled it, but looking at that history, it's just pure and utter > f*cking garbage. > > It was rebas

Re: [git pull] Please pull powerpc.git merge branch

2013-12-09 Thread Linus Torvalds
On Mon, Dec 9, 2013 at 5:57 PM, Benjamin Herrenschmidt wrote: > > Here are a handful of powerpc fixes for 3.13. Grr. I've pulled it, but looking at that history, it's just pure and utter f*cking garbage. It was rebased *minutes* before sending it, as far as I can tell. Why? And it has a pointl

Re: [git pull] Please pull powerpc.git merge branch

2013-06-09 Thread Linus Torvalds
On Sun, Jun 9, 2013 at 9:20 PM, Jeremy Kerr wrote: > > So, we now use the original date header (if present) in the mbox views: > > $ wget -qO - http://patchwork.ozlabs.org/patch/249598/mbox/ | grep ^Date > Date: Fri, 7 Jun 2013 15:42:54 +1000 > > ... for all your data-mining needs. Goodie, and I

Re: [git pull] Please pull powerpc.git merge branch

2013-06-09 Thread Jeremy Kerr
Hi Linus, > No. The date from the email was > > Date: Fri, 7 Jun 2013 15:42:54 +1000 > > and we want *that* date. Ah, gotchya. So, we now use the original date header (if present) in the mbox views: $ wget -qO - http://patchwork.ozlabs.org/patch/249598/mbox/ | grep ^Date Date: Fri, 7 Jun

Re: [git pull] Please pull powerpc.git merge branch

2013-06-09 Thread Linus Torvalds
On Sun, Jun 9, 2013 at 8:20 PM, Linus Torvalds wrote: > > .. the rationale for this is that the work pattern of people is > actually interesting information. You can do things like this: > > git log --pretty=%aD --author=Torvalds Final side note: for me, and other git users that apply other p

Re: [git pull] Please pull powerpc.git merge branch

2013-06-09 Thread Linus Torvalds
On Sun, Jun 9, 2013 at 8:06 PM, Linus Torvalds wrote: > > And it does matter. .. the rationale for this is that the work pattern of people is actually interesting information. You can do things like this: git log --pretty=%aD --author=Torvalds to see what my work pattern is, and I think tha

Re: [git pull] Please pull powerpc.git merge branch

2013-06-09 Thread Linus Torvalds
On Sun, Jun 9, 2013 at 7:44 PM, Jeremy Kerr wrote: > > We keep all patch dates in UTC, but were generating the Date header > incorrectly. Now fixed: No, not fixed. Keeping patch dates in UTC *corrupts* the date. I'll ask people to stop using patchworks if it cannot keep track of emailed dates.

Re: [git pull] Please pull powerpc.git merge branch

2013-06-09 Thread Jeremy Kerr
Hi Linus, > Is Jeremy the patchwork maintainer? Yep, that's me. > and it turns out that apparently 'patchwork' is just making up random > times, because when you download the email as an mbox, it will turn > this into that corrupt and incorrect > > Date: Thu, 06 Jun 2013 19:42:54 - > >

Re: [git pull] Please pull powerpc.git merge branch

2013-06-09 Thread Benjamin Herrenschmidt
On Sun, 2013-06-09 at 14:33 -0700, Linus Torvalds wrote: > On Sun, Jun 9, 2013 at 12:56 AM, Benjamin Herrenschmidt > wrote: > > > > Here are a few more powerpc changes for 3.10. I've merged your > > tree in at some point (which I generally avoid) in order to get > > the compat network fixes as soo

Re: [git pull] Please pull powerpc.git merge branch

2013-06-09 Thread Linus Torvalds
[ Is Jeremy the patchwork maintainer? If not, can people forward this to the real maintainer? ] On Sun, Jun 9, 2013 at 2:33 PM, Linus Torvalds wrote: > > This is not just bugfixes. In fact, as far as I can tell, this > *introduces* bugs, with that "get_user()" in the exception path that > can app

Re: [git pull] Please pull powerpc.git merge branch

2013-06-09 Thread Linus Torvalds
On Sun, Jun 9, 2013 at 12:56 AM, Benjamin Herrenschmidt wrote: > > Here are a few more powerpc changes for 3.10. I've merged your > tree in at some point (which I generally avoid) in order to get > the compat network fixes as soon as possible. > > Mostly regressions, and stuff I judged could/shoul

Re: [git pull] Please pull powerpc.git merge branch

2013-05-31 Thread Benjamin Herrenschmidt
On Sat, 2013-06-01 at 09:22 +1000, Benjamin Herrenschmidt wrote: > Hi Linus ! > > Here are a few more fixes for powerpc 3.10. It's a bit more than I would > have liked this late in the game but I suppose that's what happens with > a brand new chip generation coming out. > > A few regression fixes,

Re: [git pull] Please pull powerpc.git merge branch

2013-01-29 Thread Geert Uytterhoeven
On Tue, Jan 29, 2013 at 1:09 AM, Benjamin Herrenschmidt wrote: > On Mon, 2013-01-28 at 16:03 -0800, Linus Torvalds wrote: >> I'll have you know that I haven't quite even left for Au yet, and I >> have LCA before diving. So no snarky "in between dives" comments, >> please. > > It wasn't meant to be

Re: [git pull] Please pull powerpc.git merge branch

2013-01-28 Thread Benjamin Herrenschmidt
On Mon, 2013-01-28 at 16:03 -0800, Linus Torvalds wrote: > I'll have you know that I haven't quite even left for Au yet, and I > have LCA before diving. So no snarky "in between dives" comments, > please. It wasn't meant to be "snarky", sorry about that... > At least not for a few days. > > >

Re: [git pull] Please pull powerpc.git merge branch

2013-01-28 Thread Linus Torvalds
On Mon, Jan 28, 2013 at 3:42 PM, Benjamin Herrenschmidt wrote: > > Whenever you have a chance between two dives, you might want to consider > pulling my merge branch to pickup a few fixes for 3.8 that have been > accumulating for the last couple of weeks (I was myself travelling > then on vacation

Re: [git pull] Please pull powerpc.git merge branch

2013-01-02 Thread Benjamin Herrenschmidt
On Thu, 2013-01-03 at 17:13 +1100, Benjamin Herrenschmidt wrote: > Hi Linus ! > > Here are a couple of small powerpc fixes. They aren't new bugs (and > they are both CCed to stable) but I didn't see the point of sitting > on the fixes any longer. Looks like I still need to fix my script to get th

Re: [git pull] Please pull powerpc.git merge branch

2012-11-25 Thread Benjamin Herrenschmidt
On Mon, 2012-11-26 at 09:07 +1100, Benjamin Herrenschmidt wrote: > Hi Linus ! > > Here's a patch that would be good to still have in 3.7. It's a one liner > fixing > a regression introduced by the new EEH code in .37 (potential oops on some > PCI setups when configuring MSIs). > > Cheers, > Ben.

Re: [git pull] Please pull powerpc.git merge branch

2012-11-25 Thread Benjamin Herrenschmidt
On Mon, 2012-11-26 at 09:08 +1100, Benjamin Herrenschmidt wrote: > On Mon, 2012-11-26 at 09:07 +1100, Benjamin Herrenschmidt wrote: > > Hi Linus ! > > > > Here's a patch that would be good to still have in 3.7. It's a one liner > > fixing > > a regression introduced by the new EEH code in .37 (po

Re: [git pull] Please pull powerpc.git merge branch

2012-10-04 Thread Benjamin Herrenschmidt
On Thu, 2012-10-04 at 09:02 -0700, Linus Torvalds wrote: > Hmm. There's nothing there. > > Did you mean for me to pull some branch/tag you didn't mention? Heh, yeah, the mirrors hadn't updated yet so git request-pull didn't put the branch name in. It's common but I usually fix it up by hand. Sinc

Re: [git pull] Please pull powerpc.git merge branch

2012-10-04 Thread Benjamin Herrenschmidt
On Thu, 2012-10-04 at 09:00 -0700, Linus Torvalds wrote: > So this happens if you have "reverse merges" (ie you've pulled my > tree, or some other tree I've pulled), and there is no longer a single > clear common point that you started from. In that case, there is no > simple diff for the "what has

Re: [git pull] Please pull powerpc.git merge branch

2012-10-04 Thread Linus Torvalds
On Thu, Oct 4, 2012 at 1:38 AM, Benjamin Herrenschmidt wrote: > > The following changes since commit 271fd03a3013b106ccc178d54219c1be0c9759b7: > > powerpc/powernv: I/O and memory alignment for P2P bridges (2012-09-11 > 16:59:47 -0600) > > are available in the git repository at: > > git://git.

Re: [git pull] Please pull powerpc.git merge branch

2012-10-04 Thread Linus Torvalds
On Thu, Oct 4, 2012 at 1:38 AM, Benjamin Herrenschmidt wrote: > > First, however, a note about the pull request details ... the diffstat looks > completely on crack, any idea what's up ? It sees piles of files modified > in various other archs & generic code but I see no patch in that branch > tha

Re: [git pull] Please pull powerpc.git merge branch

2012-09-05 Thread Benjamin Herrenschmidt
On Wed, 2012-09-05 at 16:12 +1000, Benjamin Herrenschmidt wrote: > The following changes since commit > 5b716ac728bcc01b1f2a7ed6e437196602237c27: > > Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 > (2012-09-02 11:30:10 -0700) > > are available in the git repository at: > > >