Re: [git pull] Please pull powerpc.git merge branch
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 (it's "next" really). I though I had cancelled the sending of the first one with the bad subject but it looks like my mailer was faster than me. Cheers, Ben. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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 (it's next really). I though I had cancelled the sending of the first one with the bad subject but it looks like my mailer was faster than me. Cheers, Ben. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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 or later while my next is at rc1 and clean that way), so > > I put it in the merge branch. > > Quite frankly, I'll prefer to not merge it now, and then 3.13 will get > it from stable, when it does things like this. > > Partly because it fixes a power-only bug, but potentially changes > non-power behavior. If it was all in arch/powerpc, I wouldn't mind. Right, I wasn't too comfortable either. I'll resend the pull request after the merge window is open. Cheers, Ben. >Linus > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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 in the merge branch. Quite frankly, I'll prefer to not merge it now, and then 3.13 will get it from stable, when it does things like this. Partly because it fixes a power-only bug, but potentially changes non-power behavior. If it was all in arch/powerpc, I wouldn't mind. Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
On Wed, Jan 15, 2014 at 12:01 PM, Benjamin Herrenschmidt b...@kernel.crashing.org 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 in the merge branch. Quite frankly, I'll prefer to not merge it now, and then 3.13 will get it from stable, when it does things like this. Partly because it fixes a power-only bug, but potentially changes non-power behavior. If it was all in arch/powerpc, I wouldn't mind. Linus -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
On Wed, 2014-01-15 at 15:05 +0700, Linus Torvalds wrote: On Wed, Jan 15, 2014 at 12:01 PM, Benjamin Herrenschmidt b...@kernel.crashing.org 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 in the merge branch. Quite frankly, I'll prefer to not merge it now, and then 3.13 will get it from stable, when it does things like this. Partly because it fixes a power-only bug, but potentially changes non-power behavior. If it was all in arch/powerpc, I wouldn't mind. Right, I wasn't too comfortable either. I'll resend the pull request after the merge window is open. Cheers, Ben. Linus -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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 rebased *minutes* before sending it, as far as I can tell. Why? It was *created* shortly before sending it: Basically I put that thing together as a patchwork bundle which I grew over this week. Today I just applied them to my git, ran my build testers, booted a machine to dbl check and sent. I tend to not let things linger long in git when it's just fixes like that. > And it has a pointless merge that you must have created with "--no-ff" > for no apparent good reason. Oh that's my fault. I thought you preferred that way to keep track of cases where I pull from somebody since then the patch don't have my s-o-b... my bad for misunderstanding that part of the process. > WTF? What the hell happened here, and why? As mentioned, it's in my > tree, but I was *this* close to just unpulling and saying "fuck that" > when I started looking at it. Heh sorry. Cheers, Ben. > > Linus > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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 pointless merge that you must have created with "--no-ff" for no apparent good reason. WTF? What the hell happened here, and why? As mentioned, it's in my tree, but I was *this* close to just unpulling and saying "fuck that" when I started looking at it. Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
On Mon, Dec 9, 2013 at 5:57 PM, Benjamin Herrenschmidt b...@kernel.crashing.org 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 pointless merge that you must have created with --no-ff for no apparent good reason. WTF? What the hell happened here, and why? As mentioned, it's in my tree, but I was *this* close to just unpulling and saying fuck that when I started looking at it. Linus -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
On Mon, 2013-12-09 at 19:58 -0800, Linus Torvalds wrote: On Mon, Dec 9, 2013 at 5:57 PM, Benjamin Herrenschmidt b...@kernel.crashing.org 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? It was *created* shortly before sending it: Basically I put that thing together as a patchwork bundle which I grew over this week. Today I just applied them to my git, ran my build testers, booted a machine to dbl check and sent. I tend to not let things linger long in git when it's just fixes like that. And it has a pointless merge that you must have created with --no-ff for no apparent good reason. Oh that's my fault. I thought you preferred that way to keep track of cases where I pull from somebody since then the patch don't have my s-o-b... my bad for misunderstanding that part of the process. WTF? What the hell happened here, and why? As mentioned, it's in my tree, but I was *this* close to just unpulling and saying fuck that when I started looking at it. Heh sorry. Cheers, Ben. Linus -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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 see that it even works with old patches. Thanks. Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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 2013 15:42:54 +1000 ... for all your data-mining needs. Cheers, Jeremy -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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 peoples patches, it's probably better to use git log --pretty=%cD --committer=Torvalds instead. Interestingly, that shows a different pattern than my "authorship" statistics, which are mainly pull requests. It turns out I commit patches much more in the afternoon. The reason is probably simple: in the mornings, I have pull requests waiting from overnight, so a fair number of pull requests where I am author at 9-11. But my biggest source of patches tends to be Andrew Morton, who sends the patches in the afternoon, so suddenly the commit counts skew towards being between 3pm-8pm when you take all my commits into accoint. Doing git log --since=6.months --pretty=%aD --grep=Signed.*Andrew.Morton backs that up: most of the commits that have sign-offs by Andrew are sent in the afternoon. I just find details like that really interesting, where you can actually mine for the workpatterns of people. Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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 that's *interesting*. Gathering statistics like whether people are generally doing 9-5 Mon-Fri is actually interesting data. You can do things like this: git log --since=6.months --pretty=%aD --author=Torvalds | cut -c1-3 | sort | uniq -c | sort -n and see (for example) that I do slow down on weekends. Same goes for things like what time of day ends up being most productive. You can do the statistics for me, and see that I tend to do the bulk of my pulls in the mornings (peak between 9-11) and that I'm not a night-owl (*big* drop-off after 8PM - that's what kids do to you). You can see a few really early-morning cases, but I suspect they were when I was jetlagged. So the date data is actually meaningful data. It's not just random noise. And to do these kinds of things, you absolutely have to have local-time with proper timezone information. Anything that screws that up is *broken*. git gets this right, unlike a lot of other broken SCM's. Git gets it right for a reason. Yeah, yeah, when people forward other peoples patches they often drop the date field, and the date of the patch ends up being the time that the last version of the patch got sent rather than anything else, so many of the statistics aren't valid. But a _tool_ that actively corrupts the date and time of a patch is just broken. Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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. The date very much is a local time WITH A TIMEZONE. And it does matter. > $ wget -qO - http://patchwork.ozlabs.org/patch/249598/mbox/ | grep ^Date > Date: Fri, 07 Jun 2013 05:42:54 - No. The date from the email was Date: Fri, 7 Jun 2013 15:42:54 +1000 and we want *that* date. Not some random date that patchwork makes up that has no relevance. I know you have that date, because it shows up when asking for the headers in patchwork. Just use the right one, don't make up incorrect ones. Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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 - > > thing which is apparently how you got the wrong timestamp to begin with. We keep all patch dates in UTC, but were generating the Date header incorrectly. Now fixed: $ wget -qO - http://patchwork.ozlabs.org/patch/249598/mbox/ | grep ^Date Date: Fri, 07 Jun 2013 05:42:54 - Commit is at: http://git.ozlabs.org/?p=patchwork;a=commitdiff;h=e7353352 Cheers, Jeremy -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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 soon as possible. > > > > Mostly regressions, and stuff I judged could/should still go in at > > this stage. > > Not pulled, because your hamster smells of eldeberries. > > 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 apparently happen with irqs disabled and will thus potentially > result in new warnings that just make things unreadable. Ah right, brown paper bag for Anton and I :( I shouldn't have put that one in, it was a last minute bad decision after spending time tracking another stupid sigill in userspace (this time FSL CPUs not implementing some optional instructions that Fedora compiler seems configured to generate nowadays). > I'm f*cking tired of people having problems understanding "we're past > rc5". If it's not something you would call stable material, you > shouldn't send it to me. I've taken out that commit and the rename of the PMU interrupt (which while trivial probably wasn't important enough). Everything else is regressions/stable material. That does mean I rebased, but normally nobody bases on that merge branch so it should be fine. I'll send a new pull request. Cheers, Ben. > Linus > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
[ 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 apparently happen with irqs disabled and will thus potentially > result in new warnings that just make things unreadable. Looking at that particular commit, I also notice that the commit itself is buggered in other ways too. It says: Date: Thu Jun 6 19:42:54 2013 + which surprised me due to the odd timezone, and it turns out it is pure and utter crap. Google finds the patch in patchwork, and "Show headers" there shows the expected timezone Date: Fri, 7 Jun 2013 15:42:54 +1000 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 - thing which is apparently how you got the wrong timestamp to begin with. That odd time doesn't even make any sense that I can see, because those two times have absolutely nothing in common afaik. Unless timezones work differently down under. It looks like some west-coast local time, but then it says "-" which is code for "I have no f*cking clue what I'm doing". Just to make things extra exciting, patchwork actually shows yet *another* date string when you just look at the patch in the web interface: Date June 7, 2013, 5:42 a.m. and that actually seems to be the *correct* UTC version of that original email date. I have no idea what that "Thu, 06 Jun 2013 19:42:54 -" date is, and where it came from. But it is utter shite. Can somebody please make sure that patchwork doesn't destroy timezone/date information? I'm assuming this has been going on forever, and I just noticed because I looked at that particular commit for other reasons, and went "Is Anton in Europe now?". Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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/should still go in at > this stage. Not pulled, because your hamster smells of eldeberries. 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 apparently happen with irqs disabled and will thus potentially result in new warnings that just make things unreadable. I'm f*cking tired of people having problems understanding "we're past rc5". If it's not something you would call stable material, you shouldn't send it to me. Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
On Sun, Jun 9, 2013 at 12:56 AM, Benjamin Herrenschmidt b...@kernel.crashing.org 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/should still go in at this stage. Not pulled, because your hamster smells of eldeberries. 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 apparently happen with irqs disabled and will thus potentially result in new warnings that just make things unreadable. I'm f*cking tired of people having problems understanding we're past rc5. If it's not something you would call stable material, you shouldn't send it to me. Linus -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
[ 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 torva...@linux-foundation.org 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 apparently happen with irqs disabled and will thus potentially result in new warnings that just make things unreadable. Looking at that particular commit, I also notice that the commit itself is buggered in other ways too. It says: Date: Thu Jun 6 19:42:54 2013 + which surprised me due to the odd timezone, and it turns out it is pure and utter crap. Google finds the patch in patchwork, and Show headers there shows the expected timezone Date: Fri, 7 Jun 2013 15:42:54 +1000 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 - thing which is apparently how you got the wrong timestamp to begin with. That odd time doesn't even make any sense that I can see, because those two times have absolutely nothing in common afaik. Unless timezones work differently down under. It looks like some west-coast local time, but then it says - which is code for I have no f*cking clue what I'm doing. Just to make things extra exciting, patchwork actually shows yet *another* date string when you just look at the patch in the web interface: Date June 7, 2013, 5:42 a.m. and that actually seems to be the *correct* UTC version of that original email date. I have no idea what that Thu, 06 Jun 2013 19:42:54 - date is, and where it came from. But it is utter shite. Can somebody please make sure that patchwork doesn't destroy timezone/date information? I'm assuming this has been going on forever, and I just noticed because I looked at that particular commit for other reasons, and went Is Anton in Europe now?. Linus -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
On Sun, 2013-06-09 at 14:33 -0700, Linus Torvalds wrote: On Sun, Jun 9, 2013 at 12:56 AM, Benjamin Herrenschmidt b...@kernel.crashing.org 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/should still go in at this stage. Not pulled, because your hamster smells of eldeberries. 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 apparently happen with irqs disabled and will thus potentially result in new warnings that just make things unreadable. Ah right, brown paper bag for Anton and I :( I shouldn't have put that one in, it was a last minute bad decision after spending time tracking another stupid sigill in userspace (this time FSL CPUs not implementing some optional instructions that Fedora compiler seems configured to generate nowadays). I'm f*cking tired of people having problems understanding we're past rc5. If it's not something you would call stable material, you shouldn't send it to me. I've taken out that commit and the rename of the PMU interrupt (which while trivial probably wasn't important enough). Everything else is regressions/stable material. That does mean I rebased, but normally nobody bases on that merge branch so it should be fine. I'll send a new pull request. Cheers, Ben. Linus -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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 - thing which is apparently how you got the wrong timestamp to begin with. We keep all patch dates in UTC, but were generating the Date header incorrectly. Now fixed: $ wget -qO - http://patchwork.ozlabs.org/patch/249598/mbox/ | grep ^Date Date: Fri, 07 Jun 2013 05:42:54 - Commit is at: http://git.ozlabs.org/?p=patchwork;a=commitdiff;h=e7353352 Cheers, Jeremy -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
On Sun, Jun 9, 2013 at 7:44 PM, Jeremy Kerr j...@ozlabs.org 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. The date very much is a local time WITH A TIMEZONE. And it does matter. $ wget -qO - http://patchwork.ozlabs.org/patch/249598/mbox/ | grep ^Date Date: Fri, 07 Jun 2013 05:42:54 - No. The date from the email was Date: Fri, 7 Jun 2013 15:42:54 +1000 and we want *that* date. Not some random date that patchwork makes up that has no relevance. I know you have that date, because it shows up when asking for the headers in patchwork. Just use the right one, don't make up incorrect ones. Linus -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
On Sun, Jun 9, 2013 at 8:06 PM, Linus Torvalds torva...@linux-foundation.org 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 that's *interesting*. Gathering statistics like whether people are generally doing 9-5 Mon-Fri is actually interesting data. You can do things like this: git log --since=6.months --pretty=%aD --author=Torvalds | cut -c1-3 | sort | uniq -c | sort -n and see (for example) that I do slow down on weekends. Same goes for things like what time of day ends up being most productive. You can do the statistics for me, and see that I tend to do the bulk of my pulls in the mornings (peak between 9-11) and that I'm not a night-owl (*big* drop-off after 8PM - that's what kids do to you). You can see a few really early-morning cases, but I suspect they were when I was jetlagged. So the date data is actually meaningful data. It's not just random noise. And to do these kinds of things, you absolutely have to have local-time with proper timezone information. Anything that screws that up is *broken*. git gets this right, unlike a lot of other broken SCM's. Git gets it right for a reason. Yeah, yeah, when people forward other peoples patches they often drop the date field, and the date of the patch ends up being the time that the last version of the patch got sent rather than anything else, so many of the statistics aren't valid. But a _tool_ that actively corrupts the date and time of a patch is just broken. Linus -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
On Sun, Jun 9, 2013 at 8:20 PM, Linus Torvalds torva...@linux-foundation.org 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 peoples patches, it's probably better to use git log --pretty=%cD --committer=Torvalds instead. Interestingly, that shows a different pattern than my authorship statistics, which are mainly pull requests. It turns out I commit patches much more in the afternoon. The reason is probably simple: in the mornings, I have pull requests waiting from overnight, so a fair number of pull requests where I am author at 9-11. But my biggest source of patches tends to be Andrew Morton, who sends the patches in the afternoon, so suddenly the commit counts skew towards being between 3pm-8pm when you take all my commits into accoint. Doing git log --since=6.months --pretty=%aD --grep=Signed.*Andrew.Morton backs that up: most of the commits that have sign-offs by Andrew are sent in the afternoon. I just find details like that really interesting, where you can actually mine for the workpatterns of people. Linus -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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 2013 15:42:54 +1000 ... for all your data-mining needs. Cheers, Jeremy -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
On Sun, Jun 9, 2013 at 9:20 PM, Jeremy Kerr j...@ozlabs.org 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 see that it even works with old patches. Thanks. Linus -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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, some last minute fixes for new P8 features such > as transactional memory,... > > There's also one powerpc KVM patch that I requested that adds two > missing functions to our in-kernel interrupt controller support which > is itself a new 3.10 feature. These are defined by the base hypervisor > specification. We didn't implement them originally because Linux doesn't > use them but they are simple and I'm not comfortable having a > half-implemented interface in 3.10 and having to deal with versionning > etc... later when something starts needing those calls. They cannot be > emulated in qemu when using in-kernel interrupt controller (not enough > shared state). Just added a last minute patch to fix a typo introducing a breakage in our cputable for Power7+ processors, sorry about that, but the regression it fixes just hurt me :-) Sorry about that.. Cheers, Ben. The following changes since commit 58f8bbd2e39c3732c55698494338ee19a92c53a0: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (2013-05-28 10:11:34 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge for you to fetch changes up to badec11b645e21acbc2411d7759e3efa559af443: powerpc/cputable: Fix typo on P7+ cputable entry (2013-06-01 09:30:03 +1000) Aneesh Kumar K.V (1): powerpc/mm: Always invalidate tlb on hpte invalidate and update Kevin Hao (2): powerpc/pci: Remove the stale comments of pci_process_bridge_OF_ranges powerpc/pci: Remove the unused variables in pci_process_bridge_OF_ranges Michael Ellerman (2): powerpc/perf: Revert to original NO_SIPR logic powerpc/perf: Add missing SIER support Michael Neuling (7): powerpc/tm: Make room for hypervisor in abort cause codes powerpc/tm: Update cause codes documentation powerpc/tm: Abort on emulation and alignment faults powerpc/tm: Move TM abort cause codes to uapi powerpc/tm: Fix userspace stack corruption on signal delivery for active transactions powerpc/pseries: Kill all prefetch streams on context switch powerpc/pseries: Improve stream generation comments in copypage/user Nishanth Aravamudan (1): powerpc/cputable: Fix oprofile_cpu_type on power8 Paul Mackerras (1): powerpc/kvm/book3s: Add support for H_IPOLL and H_XIRR_X in XICS emulation Priyanka Jain (1): powerpc/32bit:Store temporary result in r0 instead of r8 Srivatsa S. Bhat (1): powerpc/pseries: Always enable CONFIG_HOTPLUG_CPU on PSERIES SMP Will Schmidt (1): powerpc/cputable: Fix typo on P7+ cputable entry chenhui zhao (1): powerpc/mpic: Fix irq distribution problem when MPIC_SINGLE_DEST_CPU Documentation/powerpc/transactional_memory.txt | 27 +- arch/powerpc/include/asm/hvcall.h |1 + arch/powerpc/include/asm/ppc_asm.h | 11 arch/powerpc/include/asm/processor.h | 13 ++--- arch/powerpc/include/asm/reg.h | 11 arch/powerpc/include/asm/signal.h |3 ++ arch/powerpc/include/asm/tm.h |2 + arch/powerpc/include/uapi/asm/Kbuild |1 + arch/powerpc/include/uapi/asm/tm.h | 18 +++ arch/powerpc/kernel/cputable.c |6 +-- arch/powerpc/kernel/entry_32.S |2 +- arch/powerpc/kernel/entry_64.S |7 +++ arch/powerpc/kernel/pci-common.c | 14 + arch/powerpc/kernel/signal.c | 40 +- arch/powerpc/kernel/signal.h |2 +- arch/powerpc/kernel/signal_32.c| 10 +--- arch/powerpc/kernel/signal_64.c| 23 +++- arch/powerpc/kernel/traps.c| 29 ++ arch/powerpc/kvm/book3s_hv.c |2 + arch/powerpc/kvm/book3s_pr_papr.c |2 + arch/powerpc/kvm/book3s_xics.c | 29 ++ arch/powerpc/lib/copypage_power7.S | 19 --- arch/powerpc/lib/copyuser_power7.S | 12 +++-- arch/powerpc/mm/hash_native_64.c | 30 --- arch/powerpc/perf/core-book3s.c| 67 +++- arch/powerpc/platforms/pseries/Kconfig |2 + arch/powerpc/sysdev/mpic.c |4 +- 27 files changed, 262 insertions(+), 125 deletions(-) create mode 100644 arch/powerpc/include/uapi/asm/tm.h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More
Re: [git pull] Please pull powerpc.git merge branch
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, some last minute fixes for new P8 features such as transactional memory,... There's also one powerpc KVM patch that I requested that adds two missing functions to our in-kernel interrupt controller support which is itself a new 3.10 feature. These are defined by the base hypervisor specification. We didn't implement them originally because Linux doesn't use them but they are simple and I'm not comfortable having a half-implemented interface in 3.10 and having to deal with versionning etc... later when something starts needing those calls. They cannot be emulated in qemu when using in-kernel interrupt controller (not enough shared state). Just added a last minute patch to fix a typo introducing a breakage in our cputable for Power7+ processors, sorry about that, but the regression it fixes just hurt me :-) Sorry about that.. Cheers, Ben. The following changes since commit 58f8bbd2e39c3732c55698494338ee19a92c53a0: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (2013-05-28 10:11:34 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge for you to fetch changes up to badec11b645e21acbc2411d7759e3efa559af443: powerpc/cputable: Fix typo on P7+ cputable entry (2013-06-01 09:30:03 +1000) Aneesh Kumar K.V (1): powerpc/mm: Always invalidate tlb on hpte invalidate and update Kevin Hao (2): powerpc/pci: Remove the stale comments of pci_process_bridge_OF_ranges powerpc/pci: Remove the unused variables in pci_process_bridge_OF_ranges Michael Ellerman (2): powerpc/perf: Revert to original NO_SIPR logic powerpc/perf: Add missing SIER support Michael Neuling (7): powerpc/tm: Make room for hypervisor in abort cause codes powerpc/tm: Update cause codes documentation powerpc/tm: Abort on emulation and alignment faults powerpc/tm: Move TM abort cause codes to uapi powerpc/tm: Fix userspace stack corruption on signal delivery for active transactions powerpc/pseries: Kill all prefetch streams on context switch powerpc/pseries: Improve stream generation comments in copypage/user Nishanth Aravamudan (1): powerpc/cputable: Fix oprofile_cpu_type on power8 Paul Mackerras (1): powerpc/kvm/book3s: Add support for H_IPOLL and H_XIRR_X in XICS emulation Priyanka Jain (1): powerpc/32bit:Store temporary result in r0 instead of r8 Srivatsa S. Bhat (1): powerpc/pseries: Always enable CONFIG_HOTPLUG_CPU on PSERIES SMP Will Schmidt (1): powerpc/cputable: Fix typo on P7+ cputable entry chenhui zhao (1): powerpc/mpic: Fix irq distribution problem when MPIC_SINGLE_DEST_CPU Documentation/powerpc/transactional_memory.txt | 27 +- arch/powerpc/include/asm/hvcall.h |1 + arch/powerpc/include/asm/ppc_asm.h | 11 arch/powerpc/include/asm/processor.h | 13 ++--- arch/powerpc/include/asm/reg.h | 11 arch/powerpc/include/asm/signal.h |3 ++ arch/powerpc/include/asm/tm.h |2 + arch/powerpc/include/uapi/asm/Kbuild |1 + arch/powerpc/include/uapi/asm/tm.h | 18 +++ arch/powerpc/kernel/cputable.c |6 +-- arch/powerpc/kernel/entry_32.S |2 +- arch/powerpc/kernel/entry_64.S |7 +++ arch/powerpc/kernel/pci-common.c | 14 + arch/powerpc/kernel/signal.c | 40 +- arch/powerpc/kernel/signal.h |2 +- arch/powerpc/kernel/signal_32.c| 10 +--- arch/powerpc/kernel/signal_64.c| 23 +++- arch/powerpc/kernel/traps.c| 29 ++ arch/powerpc/kvm/book3s_hv.c |2 + arch/powerpc/kvm/book3s_pr_papr.c |2 + arch/powerpc/kvm/book3s_xics.c | 29 ++ arch/powerpc/lib/copypage_power7.S | 19 --- arch/powerpc/lib/copyuser_power7.S | 12 +++-- arch/powerpc/mm/hash_native_64.c | 30 --- arch/powerpc/perf/core-book3s.c| 67 +++- arch/powerpc/platforms/pseries/Kconfig |2 + arch/powerpc/sysdev/mpic.c |4 +- 27 files changed, 262 insertions(+), 125 deletions(-) create mode 100644 arch/powerpc/include/uapi/asm/tm.h -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at
Re: [git pull] Please pull powerpc.git merge branch
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 "snarky", sorry about that...
Sharky? Sorry, couldn't resist.
Gr{oetje,eeting}s,
Poor Geert without sun, dives, and sharks
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
On Tue, Jan 29, 2013 at 1:09 AM, Benjamin Herrenschmidt
b...@kernel.crashing.org 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 snarky, sorry about that...
Sharky? Sorry, couldn't resist.
Gr{oetje,eeting}s,
Poor Geert without sun, dives, and sharks
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say programmer or something like that.
-- Linus Torvalds
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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. > > > git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git > > Nothing there. Forgot to push? Or some unnamed branch/tag? My usual problem with git request-pull when the mirror haven't caught up yet. Branch is "merge". > (And I _am_ leaving for the airport soon, so I may not get to it for a > while unless you reply asap) Have a good trip ! Cheers, Ben. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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). 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. At least not for a few days. > git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git Nothing there. Forgot to push? Or some unnamed branch/tag? (And I _am_ leaving for the airport soon, so I may not get to it for a while unless you reply asap) Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
On Mon, Jan 28, 2013 at 3:42 PM, Benjamin Herrenschmidt b...@kernel.crashing.org 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). 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. At least not for a few days. git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git Nothing there. Forgot to push? Or some unnamed branch/tag? (And I _am_ leaving for the airport soon, so I may not get to it for a while unless you reply asap) Linus -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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. git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git Nothing there. Forgot to push? Or some unnamed branch/tag? My usual problem with git request-pull when the mirror haven't caught up yet. Branch is merge. (And I _am_ leaving for the airport soon, so I may not get to it for a while unless you reply asap) Have a good trip ! Cheers, Ben. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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 the branch name right for when the mirrors haven't caught up... It's git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge Cheers, Ben. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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 the branch name right for when the mirrors haven't caught up... It's git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge Cheers, Ben. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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. > > The following changes since commit d6dc24613c222f9057131ccbd5264a10bcba9f97: > > Merge remote-tracking branch 'agust/merge' into merge (2012-11-21 13:24:49 > +1100) > > are available in the git repository at: > > > git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git And the branch is "merge". Cheers, Ben. > > for you to fetch changes up to bb4618823a3389086f157fafb2a0d97cade8d89f: > > powerpc/pseries: Fix oops with MSIs when missing EEH PEs (2012-11-23 > 13:26:05 +1100) > > > Alexey Kardashevskiy (1): > powerpc/pseries: Fix oops with MSIs when missing EEH PEs > > arch/powerpc/platforms/pseries/msi.c |3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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 (potential oops on some > > PCI setups when configuring MSIs). I've just added a second fix for EEH (Gavin found another issue) which is trivial enough (and tested) so it should still go in. Updated pull request: The following changes since commit d6dc24613c222f9057131ccbd5264a10bcba9f97: Merge remote-tracking branch 'agust/merge' into merge (2012-11-21 13:24:49 +1100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge for you to fetch changes up to e716e014384688d1a50d1aa5213ee74748c6d4e0: powerpc/eeh: Do not invalidate PE properly (2012-11-26 09:14:16 +1100) Alexey Kardashevskiy (1): powerpc/pseries: Fix oops with MSIs when missing EEH PEs Gavin Shan (1): powerpc/eeh: Do not invalidate PE properly arch/powerpc/platforms/pseries/eeh_pe.c |2 +- arch/powerpc/platforms/pseries/msi.c|3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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 (potential oops on some PCI setups when configuring MSIs). I've just added a second fix for EEH (Gavin found another issue) which is trivial enough (and tested) so it should still go in. Updated pull request: The following changes since commit d6dc24613c222f9057131ccbd5264a10bcba9f97: Merge remote-tracking branch 'agust/merge' into merge (2012-11-21 13:24:49 +1100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge for you to fetch changes up to e716e014384688d1a50d1aa5213ee74748c6d4e0: powerpc/eeh: Do not invalidate PE properly (2012-11-26 09:14:16 +1100) Alexey Kardashevskiy (1): powerpc/pseries: Fix oops with MSIs when missing EEH PEs Gavin Shan (1): powerpc/eeh: Do not invalidate PE properly arch/powerpc/platforms/pseries/eeh_pe.c |2 +- arch/powerpc/platforms/pseries/msi.c|3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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. The following changes since commit d6dc24613c222f9057131ccbd5264a10bcba9f97: Merge remote-tracking branch 'agust/merge' into merge (2012-11-21 13:24:49 +1100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git And the branch is merge. Cheers, Ben. for you to fetch changes up to bb4618823a3389086f157fafb2a0d97cade8d89f: powerpc/pseries: Fix oops with MSIs when missing EEH PEs (2012-11-23 13:26:05 +1100) Alexey Kardashevskiy (1): powerpc/pseries: Fix oops with MSIs when missing EEH PEs arch/powerpc/platforms/pseries/msi.c |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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. Since I was probably too tired for thinking straight, I forgot that and forgot to put the proper branch name in the email subject as well... argh :-) It's in my next branch. Mirrors should be good by now, it's at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git next Sorry for the misshap. Cheers, Ben. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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 changed since that original point", and > to get the diff for the merge you actually have to do the merge and > check the end result. git-request-pull doesn't do that, it just > assumes it's the simple case of some single common point. That was more/less my guess. Thanks. > The fact that you haven't seen it until now just means that you've > generally done a good job at keeping your powerpc tree "clean" from > other trees, and containing only your own work. Heh, yeah I try to :-) In this specific case, this was a topic branch from Bjorn which some pre-requisite patches to the generic PCI code that Gavin did to allow us to get rid of some custom resource allocation crap, so the "getting rid of" had a dependency on that topic branch. Unfortunately, Bjorn had also based that branch on top of some larger cleanup patch so I ended up pulling that as well from him, which tripped the whole thing. Cheers, Ben. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git Hmm. There's nothing there. Did you mean for me to pull some branch/tag you didn't mention? Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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 > that touches any of them. 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 changed since that original point", and to get the diff for the merge you actually have to do the merge and check the end result. git-request-pull doesn't do that, it just assumes it's the simple case of some single common point. The fact that you haven't seen it until now just means that you've generally done a good job at keeping your powerpc tree "clean" from other trees, and containing only your own work. Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
On Thu, Oct 4, 2012 at 1:38 AM, Benjamin Herrenschmidt b...@kernel.crashing.org 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 that touches any of them. 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 changed since that original point, and to get the diff for the merge you actually have to do the merge and check the end result. git-request-pull doesn't do that, it just assumes it's the simple case of some single common point. The fact that you haven't seen it until now just means that you've generally done a good job at keeping your powerpc tree clean from other trees, and containing only your own work. Linus -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
On Thu, Oct 4, 2012 at 1:38 AM, Benjamin Herrenschmidt b...@kernel.crashing.org 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.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git Hmm. There's nothing there. Did you mean for me to pull some branch/tag you didn't mention? Linus -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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 changed since that original point, and to get the diff for the merge you actually have to do the merge and check the end result. git-request-pull doesn't do that, it just assumes it's the simple case of some single common point. That was more/less my guess. Thanks. The fact that you haven't seen it until now just means that you've generally done a good job at keeping your powerpc tree clean from other trees, and containing only your own work. Heh, yeah I try to :-) In this specific case, this was a topic branch from Bjorn which some pre-requisite patches to the generic PCI code that Gavin did to allow us to get rid of some custom resource allocation crap, so the getting rid of had a dependency on that topic branch. Unfortunately, Bjorn had also based that branch on top of some larger cleanup patch so I ended up pulling that as well from him, which tripped the whole thing. Cheers, Ben. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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. Since I was probably too tired for thinking straight, I forgot that and forgot to put the proper branch name in the email subject as well... argh :-) It's in my next branch. Mirrors should be good by now, it's at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git next Sorry for the misshap. Cheers, Ben. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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: > > > git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git Little glitch, the mirrors hadn't caught up yet when I use git request-pull so it didn't append the branch name. It's "merge" as the subject implies. Cheers, Ben. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git pull] Please pull powerpc.git merge branch
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: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git Little glitch, the mirrors hadn't caught up yet when I use git request-pull so it didn't append the branch name. It's merge as the subject implies. Cheers, Ben. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
