linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linuxppc-dev list <linuxppc-dev@ozlabs.org>,
	Linux Kernel list <linux-kernel@vger.kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>
Subject: [git pull] Please pull powerpc.git merge branch
Date: Wed, 15 Jan 2014 16:01:15 +1100	[thread overview]
Message-ID: <1389762075.6933.76.camel@pasglop> (raw)

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(-)



             reply	other threads:[~2014-01-15  5:01 UTC|newest]

Thread overview: 253+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-15  5:01 Benjamin Herrenschmidt [this message]
2014-01-15  8:05 ` [git pull] Please pull powerpc.git merge branch Linus Torvalds
2014-01-15 10:28   ` Benjamin Herrenschmidt
  -- strict thread matches above, loose matches on Subject: below --
2014-07-28  3:46 Benjamin Herrenschmidt
2014-07-23  4:54 Benjamin Herrenschmidt
2014-07-11  5:44 Benjamin Herrenschmidt
2014-06-25  6:13 Benjamin Herrenschmidt
2014-06-16  9:48 Benjamin Herrenschmidt
2014-06-02  0:27 Benjamin Herrenschmidt
2014-05-28  3:29 Benjamin Herrenschmidt
2014-05-20 23:13 Benjamin Herrenschmidt
2014-05-14  5:19 Benjamin Herrenschmidt
2014-04-28  6:52 Benjamin Herrenschmidt
2014-04-09  7:23 Benjamin Herrenschmidt
2014-04-01 23:34 Benjamin Herrenschmidt
2014-04-02  5:27 ` Benjamin Herrenschmidt
2014-03-07 21:04 Benjamin Herrenschmidt
2014-02-28  8:45 Benjamin Herrenschmidt
2014-02-17  1:16 Benjamin Herrenschmidt
2014-02-12  4:34 Benjamin Herrenschmidt
2014-01-28  4:37 Benjamin Herrenschmidt
2014-01-13  1:15 Benjamin Herrenschmidt
2013-12-30  4:37 Benjamin Herrenschmidt
2013-12-16  0:57 Benjamin Herrenschmidt
2013-12-10  1:57 Benjamin Herrenschmidt
2013-12-10  3:58 ` Linus Torvalds
2013-12-10  5:39   ` Benjamin Herrenschmidt
2013-11-27  2:30 Benjamin Herrenschmidt
2013-11-21  0:34 Benjamin Herrenschmidt
2013-11-20 23:10 Benjamin Herrenschmidt
2013-10-03  7:54 Benjamin Herrenschmidt
2013-09-25  4:39 Benjamin Herrenschmidt
2013-09-11  3:22 Benjamin Herrenschmidt
2013-08-27  7:32 Benjamin Herrenschmidt
2013-08-09  8:17 Benjamin Herrenschmidt
2013-08-02 22:28 Benjamin Herrenschmidt
2013-08-01  8:40 Benjamin Herrenschmidt
2013-07-24  7:59 Benjamin Herrenschmidt
2013-06-30  4:42 Benjamin Herrenschmidt
2013-06-29 23:16 Benjamin Herrenschmidt
2013-06-25  7:53 Benjamin Herrenschmidt
2013-06-20  7:01 Benjamin Herrenschmidt
2013-06-15  3:10 Benjamin Herrenschmidt
2013-06-09 22:45 Benjamin Herrenschmidt
2013-06-09  7:56 Benjamin Herrenschmidt
2013-06-09 21:33 ` Linus Torvalds
2013-06-09 21:54   ` Linus Torvalds
2013-06-10  2:44     ` Jeremy Kerr
2013-06-10  3:06       ` Linus Torvalds
2013-06-10  3:20         ` Linus Torvalds
2013-06-10  3:36           ` Linus Torvalds
2013-06-10  4:20         ` Jeremy Kerr
2013-06-10  4:24           ` Linus Torvalds
2013-06-09 22:37   ` Benjamin Herrenschmidt
2013-05-31 23:22 Benjamin Herrenschmidt
2013-05-31 23:32 ` Benjamin Herrenschmidt
2013-05-24  9:41 Benjamin Herrenschmidt
2013-05-14  9:57 Benjamin Herrenschmidt
2013-05-07 10:10 Benjamin Herrenschmidt
2013-03-18  5:17 Benjamin Herrenschmidt
2013-03-05  6:30 Benjamin Herrenschmidt
2013-02-04  4:22 Benjamin Herrenschmidt
2013-01-28 23:42 Benjamin Herrenschmidt
2013-01-29  0:03 ` Linus Torvalds
2013-01-29  0:09   ` Benjamin Herrenschmidt
2013-01-29 14:14     ` Geert Uytterhoeven
2013-01-03  6:13 Benjamin Herrenschmidt
2013-01-03  6:14 ` Benjamin Herrenschmidt
2012-11-25 22:07 Benjamin Herrenschmidt
2012-11-25 22:08 ` Benjamin Herrenschmidt
2012-11-25 22:16   ` Benjamin Herrenschmidt
2012-11-21  4:37 Benjamin Herrenschmidt
2012-10-18  9:23 Benjamin Herrenschmidt
2012-10-04  8:38 Benjamin Herrenschmidt
2012-10-04 16:00 ` Linus Torvalds
2012-10-04 20:10   ` Benjamin Herrenschmidt
2012-10-04 16:02 ` Linus Torvalds
2012-10-04 20:14   ` Benjamin Herrenschmidt
2012-09-05  6:12 Benjamin Herrenschmidt
2012-09-05 21:15 ` Benjamin Herrenschmidt
2012-08-24 10:59 Benjamin Herrenschmidt
2012-07-31  7:33 Benjamin Herrenschmidt
2012-07-27  4:37 Benjamin Herrenschmidt
2012-07-10  9:25 Benjamin Herrenschmidt
2012-07-02  4:57 Benjamin Herrenschmidt
2012-06-29 20:45 Benjamin Herrenschmidt
2012-05-11 23:51 Benjamin Herrenschmidt
2012-05-09  1:12 Benjamin Herrenschmidt
2012-04-30  1:44 Benjamin Herrenschmidt
2012-04-23  2:04 Benjamin Herrenschmidt
2012-04-12  3:38 Benjamin Herrenschmidt
2012-04-02  4:39 Benjamin Herrenschmidt
2012-02-23  4:58 Benjamin Herrenschmidt
2012-02-17 22:36 Benjamin Herrenschmidt
2012-02-14  6:21 Benjamin Herrenschmidt
2012-01-25  3:01 Benjamin Herrenschmidt
2012-01-13  6:21 Benjamin Herrenschmidt
2012-01-16 19:21 ` Kumar Gala
2012-01-16 20:27   ` Benjamin Herrenschmidt
2011-11-25  4:48 Benjamin Herrenschmidt
2011-11-18  3:29 Benjamin Herrenschmidt
2011-11-08  4:21 Benjamin Herrenschmidt
2011-11-08  4:42 ` Benjamin Herrenschmidt
2011-08-31  6:10 Benjamin Herrenschmidt
2011-08-10 15:27 Benjamin Herrenschmidt
2011-08-10 18:07 ` Linus Torvalds
2011-08-10 18:55   ` Benjamin Herrenschmidt
2011-07-12  1:26 Benjamin Herrenschmidt
2011-06-29  8:13 Benjamin Herrenschmidt
2011-06-09 20:45 Benjamin Herrenschmidt
2011-05-27  6:55 Benjamin Herrenschmidt
2011-05-27 12:28 ` Kumar Gala
2011-05-26  5:22 Benjamin Herrenschmidt
2011-05-26 14:02 ` Kumar Gala
2011-05-26 22:20   ` Benjamin Herrenschmidt
2011-05-20  8:06 Benjamin Herrenschmidt
2011-05-19  4:06 Benjamin Herrenschmidt
2011-05-19  4:11 ` Linus Torvalds
2011-05-19  4:16   ` David Miller
2011-05-19  5:28   ` Benjamin Herrenschmidt
2011-05-20 13:23 ` Richard Cochran
2011-05-20 13:58   ` Josh Boyer
2011-05-20 14:32     ` Richard Cochran
2011-05-20 14:46       ` Josh Boyer
2011-05-20 20:13         ` Kumar Gala
2011-05-20 22:21   ` Benjamin Herrenschmidt
2011-04-18  6:35 Benjamin Herrenschmidt
2011-04-05  7:05 Benjamin Herrenschmidt
2011-04-01  5:36 Benjamin Herrenschmidt
2011-03-30  2:08 Benjamin Herrenschmidt
2011-03-21  1:46 Benjamin Herrenschmidt
2011-03-09 23:55 Benjamin Herrenschmidt
2011-03-02  4:54 Benjamin Herrenschmidt
2011-02-07  3:57 Benjamin Herrenschmidt
2011-01-21  4:50 Benjamin Herrenschmidt
2011-01-12  0:16 Benjamin Herrenschmidt
2010-11-30  4:07 Benjamin Herrenschmidt
2010-11-18  5:46 Benjamin Herrenschmidt
2010-08-31  5:56 Benjamin Herrenschmidt
2010-09-02  1:55 ` Benjamin Herrenschmidt
2010-08-24  6:34 Benjamin Herrenschmidt
2010-07-23  4:14 Benjamin Herrenschmidt
2010-07-14  7:22 Benjamin Herrenschmidt
2010-07-08  8:19 Benjamin Herrenschmidt
2010-06-02  8:05 Benjamin Herrenschmidt
2010-05-12  7:46 Benjamin Herrenschmidt
2010-05-12 10:24 ` Kumar Gala
2010-05-12 10:36   ` Benjamin Herrenschmidt
2010-05-13  1:46     ` Benjamin Herrenschmidt
2010-04-27  5:56 Benjamin Herrenschmidt
2010-04-28  7:02 ` Benjamin Herrenschmidt
2010-03-19  7:18 Benjamin Herrenschmidt
2010-03-09  2:33 Benjamin Herrenschmidt
2010-02-10  3:52 Benjamin Herrenschmidt
2010-02-08  6:16 Benjamin Herrenschmidt
2010-01-30 23:34 Benjamin Herrenschmidt
2010-02-01  4:53 ` Benjamin Herrenschmidt
2010-01-18  6:45 Benjamin Herrenschmidt
2010-01-18 12:32 ` Josh Boyer
2010-01-18 21:57   ` Benjamin Herrenschmidt
2009-12-21 23:25 Benjamin Herrenschmidt
2009-11-30 22:46 Benjamin Herrenschmidt
2009-11-11  5:01 Benjamin Herrenschmidt
2009-11-05  7:07 Benjamin Herrenschmidt
2009-10-27  7:10 Benjamin Herrenschmidt
2009-10-27 23:07 ` Benjamin Herrenschmidt
2009-10-29 16:14 ` Linus Torvalds
2009-10-29 23:16   ` Benjamin Herrenschmidt
2009-10-30  4:06   ` Benjamin Herrenschmidt
2009-10-15  6:25 Benjamin Herrenschmidt
2009-09-25  0:15 Benjamin Herrenschmidt
2009-08-27  3:33 Benjamin Herrenschmidt
2009-08-10  6:58 Benjamin Herrenschmidt
2009-07-30 11:13 Benjamin Herrenschmidt
2009-07-16  8:00 Benjamin Herrenschmidt
2009-07-08  6:26 Benjamin Herrenschmidt
2009-06-26  7:19 Benjamin Herrenschmidt
2009-06-19  5:56 Benjamin Herrenschmidt
2009-06-16  3:05 Benjamin Herrenschmidt
2009-06-15  2:08 Benjamin Herrenschmidt
2009-06-15  7:01 ` Benjamin Herrenschmidt
2009-06-02 23:22 Benjamin Herrenschmidt
2009-06-02  1:47 Benjamin Herrenschmidt
2009-05-27  6:40 Benjamin Herrenschmidt
2009-05-26  3:50 Benjamin Herrenschmidt
2009-05-22  6:11 Benjamin Herrenschmidt
2009-05-18  6:34 Benjamin Herrenschmidt
2009-05-15  8:01 Benjamin Herrenschmidt
2009-05-05  4:55 Benjamin Herrenschmidt
2009-05-05  5:16 ` Grant Likely
2009-04-28  5:55 Paul Mackerras
2009-04-22  5:48 Paul Mackerras
2009-04-15  9:29 Paul Mackerras
2009-04-07  6:26 Paul Mackerras
2009-03-30  4:26 Benjamin Herrenschmidt
2009-03-18  4:11 Benjamin Herrenschmidt
2009-03-13  5:19 Benjamin Herrenschmidt
2009-03-10 23:57 Benjamin Herrenschmidt
2009-03-11  9:37 ` Geert Uytterhoeven
2009-03-11 10:57   ` Benjamin Herrenschmidt
2009-03-11 15:36     ` Linus Torvalds
2009-03-11 15:53       ` Geert Uytterhoeven
2009-03-11 19:18         ` Linus Torvalds
2009-03-04  6:40 Benjamin Herrenschmidt
2009-02-26 22:33 Benjamin Herrenschmidt
2009-02-26  4:07 Benjamin Herrenschmidt
2009-02-13 22:12 Benjamin Herrenschmidt
2009-02-11  5:15 Benjamin Herrenschmidt
2009-02-10  5:03 Benjamin Herrenschmidt
2009-01-28  6:41 Benjamin Herrenschmidt
2009-01-16  5:27 Benjamin Herrenschmidt
2009-01-14  2:34 Benjamin Herrenschmidt
2008-12-16  4:43 Paul Mackerras
2008-12-09  4:13 Paul Mackerras
2008-12-03 11:26 Paul Mackerras
2008-12-03 23:22 ` Paul Mackerras
2008-11-30 23:48 Paul Mackerras
2008-11-11 10:22 Paul Mackerras
2008-11-06  2:20 Paul Mackerras
2008-10-31 10:54 Paul Mackerras
2008-10-31 11:46 ` Paul Mackerras
2008-09-18 16:36 Paul Mackerras
2008-09-08 11:56 Paul Mackerras
2008-09-04  0:32 Paul Mackerras
2008-08-26  3:57 Paul Mackerras
2008-08-20  3:50 Paul Mackerras
2008-08-18  5:01 Paul Mackerras
2008-08-11 11:14 Paul Mackerras
2008-08-04  4:49 Paul Mackerras
2008-07-30  6:24 Benjamin Herrenschmidt
2008-07-28  9:58 Benjamin Herrenschmidt
2008-07-28 15:40 ` Linus Torvalds
2008-07-28 15:53   ` Stephen Rothwell
2008-07-28 16:06     ` Linus Torvalds
2008-07-28 16:20       ` Grant Likely
2008-07-28 21:16         ` Benjamin Herrenschmidt
2008-07-28 21:15       ` Benjamin Herrenschmidt
2008-07-28 22:56         ` Grant Likely
2008-07-28 21:14   ` Benjamin Herrenschmidt
2008-07-02 12:41 Paul Mackerras
2008-07-03  0:09 ` Paul Mackerras
2008-06-18 13:17 Paul Mackerras
2008-06-16  5:56 Paul Mackerras
2008-06-16  7:13 ` Benjamin Herrenschmidt
2008-06-16 11:25 ` Paul Mackerras
2008-06-16 12:43   ` Adrian Bunk
2008-06-09 12:10 Paul Mackerras
2008-05-31  8:12 Paul Mackerras
2008-05-23  9:53 Paul Mackerras
2008-05-20 11:06 Paul Mackerras
2008-05-16  0:51 Paul Mackerras
2008-05-12 13:01 Paul Mackerras
2008-05-09 13:19 Paul Mackerras

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1389762075.6933.76.camel@pasglop \
    --to=benh@kernel.crashing.org \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).