Google Groups no longer supports new Usenet posts or subscriptions. Historical content remains viewable.
Dismiss
[git pull] Please pull powerpc.git merge branch
2 views
Skip to first unread message
Benjamin Herrenschmidt
Jan 12, 2014, 8:20:01 PM1/12/14
to
Hi Linus !
Here's one regression fix for 3.13 that I would appreciate if you could still
pull in. It was an "interesting" one to debug, basically it's an old bug that
got somewhat "exposed" by new code breaking the boot on PA Semi boards (yes,
it does appear that some people are still using these !).
Cheers,
Ben.
The following changes since commit f991db1cf1bdca43675b5d2df0af991719727029:
Merge remote-tracking branch 'agust/merge' into merge (2013-12-30 14:48:27 +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 10348f5976830e5d8f74e8abb04a9a057a5e8478:
powerpc: Check return value of instance-to-package OF call (2014-01-13 09:49:17 +1100)
----------------------------------------------------------------
Benjamin Herrenschmidt (1):
powerpc: Check return value of instance-to-package OF call
arch/powerpc/kernel/prom_init.c | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Here's one regression fix for 3.13 that I would appreciate if you could still
pull in. It was an "interesting" one to debug, basically it's an old bug that
got somewhat "exposed" by new code breaking the boot on PA Semi boards (yes,
it does appear that some people are still using these !).
Cheers,
Ben.
The following changes since commit f991db1cf1bdca43675b5d2df0af991719727029:
Merge remote-tracking branch 'agust/merge' into merge (2013-12-30 14:48:27 +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 10348f5976830e5d8f74e8abb04a9a057a5e8478:
powerpc: Check return value of instance-to-package OF call (2014-01-13 09:49:17 +1100)
----------------------------------------------------------------
Benjamin Herrenschmidt (1):
powerpc: Check return value of instance-to-package OF call
arch/powerpc/kernel/prom_init.c | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Benjamin Herrenschmidt
Jan 15, 2014, 12:10:01 AM1/15/14
to
Hi Linus !
So you make the call onto whether taking that one now or waiting for the
merge window. It's a bug fix for a crash in mremap that occurs on
powerpc with THP enabled.
The fix however requires a small change in the generic code. It moves a
condition into a helper we can override from the arch which is harmless,
but it *also* slightly changes the order of the set_pmd and the withdraw
& deposit, which should be fine according to Kirill (who wrote that
code) but I agree -rc8 is a bit late...
It was acked by Kirill and Andrew told me to just merge it via powerpc.
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.
From there, you tell me if you want to take it now, if not, I'll send
you that branch along with my normal next one after you open the merge
window.
Cheers,
Ben.
The following changes since commit a6da83f98267bc8ee4e34aa899169991eb0ceb93:
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (2014-01-13 10:59:05 +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 b3084f4db3aeb991c507ca774337c7e7893ed04f:
powerpc/thp: Fix crash on mremap (2014-01-15 15:46:38 +1100)
----------------------------------------------------------------
Aneesh Kumar K.V (1):
powerpc/thp: Fix crash on mremap
arch/powerpc/include/asm/pgtable-ppc64.h | 14 ++++++++++++++
include/asm-generic/pgtable.h | 12 ++++++++++++
mm/huge_memory.c | 14 +++++---------
3 files changed, 31 insertions(+), 9 deletions(-)
So you make the call onto whether taking that one now or waiting for the
merge window. It's a bug fix for a crash in mremap that occurs on
powerpc with THP enabled.
The fix however requires a small change in the generic code. It moves a
condition into a helper we can override from the arch which is harmless,
but it *also* slightly changes the order of the set_pmd and the withdraw
& deposit, which should be fine according to Kirill (who wrote that
code) but I agree -rc8 is a bit late...
It was acked by Kirill and Andrew told me to just merge it via powerpc.
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.
From there, you tell me if you want to take it now, if not, I'll send
you that branch along with my normal next one after you open the merge
window.
Cheers,
Ben.
The following changes since commit a6da83f98267bc8ee4e34aa899169991eb0ceb93:
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (2014-01-13 10:59:05 +0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge
powerpc/thp: Fix crash on mremap (2014-01-15 15:46:38 +1100)
----------------------------------------------------------------
Aneesh Kumar K.V (1):
powerpc/thp: Fix crash on mremap
arch/powerpc/include/asm/pgtable-ppc64.h | 14 ++++++++++++++
include/asm-generic/pgtable.h | 12 ++++++++++++
mm/huge_memory.c | 14 +++++---------
3 files changed, 31 insertions(+), 9 deletions(-)
Linus Torvalds
Jan 15, 2014, 3:10:02 AM1/15/14
to
On Wed, Jan 15, 2014 at 12:01 PM, Benjamin Herrenschmidt
<be...@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
<be...@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.
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
Benjamin Herrenschmidt
Jan 15, 2014, 5:30:02 AM1/15/14
to
On Wed, 2014-01-15 at 15:05 +0700, Linus Torvalds wrote:
> On Wed, Jan 15, 2014 at 12:01 PM, Benjamin Herrenschmidt
> <be...@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
> On Wed, Jan 15, 2014 at 12:01 PM, Benjamin Herrenschmidt
> <be...@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.
after the merge window is open.
Cheers,
Ben.
0 new messages