[GIT PULL] Please pull powerpc/linux.git powerpc-4.7-3 tag

[GIT PULL] Please pull powerpc/linux.git powerpc-4.7-3 tag

[Michael Ellerman]

[-- Attachment #1: Type: text/plain, Size: 3087 bytes --]

Hi Linus,

Please pull some more powerpc fixes for 4.7:

The following changes since commit 1a695a905c18548062509178b98bc91e67510864:

  Linux 4.7-rc1 (2016-05-29 09:29:24 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git tags/powerpc-4.7-3

for you to fetch changes up to 8017ea35d33f9e0950d369773ab48bcb1efb9ba0:

  powerpc/nohash: Fix build break with 64K pages (2016-06-10 13:24:56 +1000)

----------------------------------------------------------------
powerpc fixes for 4.7 #2

 - ptrace: Fix out of bounds array access warning from Khem Raj
 - pseries: Fix PCI config address for DDW from Gavin Shan
 - pseries: Fix IBM_ARCH_VEC_NRCORES_OFFSET since POWER8NVL was added from Michael Ellerman
 - of: fix autoloading due to broken modalias with no 'compatible' from Wolfram Sang
 - radix: Fix always false comparison against MMU_NO_CONTEXT from Aneesh Kumar K.V
 - hash: Compute the segment size correctly for ISA 3.0 from Aneesh Kumar K.V
 - nohash: Fix build break with 64K pages from Michael Ellerman

----------------------------------------------------------------
Aneesh Kumar K.V (5):
      powerpc/mm/radix: Update LPCR only if it is powernv
      powerpc/mm/hash: Fix the reference bit update when handling hash fault
      powerpc/mm/radix: Add missing tlb flush
      powerpc/mm/radix: Fix always false comparison against MMU_NO_CONTEXT
      powerpc/mm/hash: Compute the segment size correctly for ISA 3.0

Gavin Shan (1):
      powerpc/pseries: Fix PCI config address for DDW

Khem Raj (1):
      powerpc/ptrace: Fix out of bounds array access warning

Michael Ellerman (2):
      powerpc/pseries: Fix IBM_ARCH_VEC_NRCORES_OFFSET since POWER8NVL was added
      powerpc/nohash: Fix build break with 64K pages

Russell Currey (2):
      powerpc/pseries/eeh: Handle RTAS delay requests in configure_bridge
      powerpc/pseries/eeh: Refactor the configure_bridge RTAS tokens

Thomas Huth (3):
      powerpc: Fix definition of SIAR and SDAR registers
      powerpc: Use privileged SPR number for MMCR2
      powerpc/pseries: Add POWER8NVL support to ibm,client-architecture-support call

Wolfram Sang (1):
      of: fix autoloading due to broken modalias with no 'compatible'

 arch/powerpc/include/asm/nohash/64/pgalloc.h |  2 +-
 arch/powerpc/include/asm/reg.h               |  6 ++--
 arch/powerpc/kernel/prom_init.c              |  3 +-
 arch/powerpc/kernel/ptrace.c                 |  4 +--
 arch/powerpc/mm/hash_native_64.c             |  6 +++-
 arch/powerpc/mm/hash_utils_64.c              | 22 +++++++++++--
 arch/powerpc/mm/pgtable-book3s64.c           |  5 +--
 arch/powerpc/mm/pgtable-radix.c              | 23 ++++++-------
 arch/powerpc/mm/tlb-radix.c                  |  8 ++---
 arch/powerpc/platforms/pseries/eeh_pseries.c | 49 +++++++++++++++++++---------
 arch/powerpc/platforms/pseries/iommu.c       |  4 +--
 scripts/mod/file2alias.c                     |  2 +-
 12 files changed, 84 insertions(+), 50 deletions(-)

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [GIT PULL] Please pull powerpc/linux.git powerpc-4.7-3 tag

[Linus Torvalds]

On Fri, Jun 10, 2016 at 4:51 AM, Michael Ellerman <mpe@ellerman.id.au> wrote:
>
> powerpc fixes for 4.7 #2

This is actually #3 - and some of the things you describe came in
already through #2.

Do you mind double-checking your descriptions? Which of these are
actually new? I'd like to get my merge message correct, and I suspect
you're partly describing things that already got merged (I know the
shortlog and the diffstat were that way, I don't know if your
description in the tag was)

                 Linus

Re: [GIT PULL] Please pull powerpc/linux.git powerpc-4.7-3 tag

[Linus Torvalds]

On Fri, Jun 10, 2016 at 8:48 AM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Fri, Jun 10, 2016 at 4:51 AM, Michael Ellerman <mpe@ellerman.id.au> wrote:
>>
>> powerpc fixes for 4.7 #2
>
> This is actually #3 - and some of the things you describe came in
> already through #2.
>
> Do you mind double-checking your descriptions?

I double-checked it. Your diffstat and shortlog were out of date (and
your #2 in the tag message was wong), but your individual descriptions
matched the actual new commits.

           Linus

Re: [GIT PULL] Please pull powerpc/linux.git powerpc-4.7-3 tag

[Michael Ellerman]

On Fri, 2016-06-10 at 12:26 -0700, Linus Torvalds wrote:
> On Fri, Jun 10, 2016 at 8:48 AM, Linus Torvalds
> <torvalds@linux-foundation.org> wrote:
> > On Fri, Jun 10, 2016 at 4:51 AM, Michael Ellerman <mpe@ellerman.id.au> wrote:
> > > 
> > > powerpc fixes for 4.7 #2
> > 
> > This is actually #3 - and some of the things you describe came in
> > already through #2.
> > 
> > Do you mind double-checking your descriptions?
> 
> I double-checked it. Your diffstat and shortlog were out of date (and
> your #2 in the tag message was wong), but your individual descriptions
> matched the actual new commits.

Sorry, clearly 21:51 on a Friday is not a good time for me to be sending pull
requests :/

The tag was correct, just the diffstat & shortlog were wrong (again).

The #2 in the tag is "correct", but clearly confusing. The powerpc-4.7-1 tag is
"updates", and -2 is "fixes", and so -3 is "fixes #2". But I'll try and come up
with a different numbering that is less off-by-one.

I checked your merge and it looks right. Thanks.

cheers