~apw/ubuntu/+source/linux/+git/s390x:master

Last commit made on 2015-07-22
Get this branch:
git clone -b master https://git.launchpad.net/~apw/ubuntu/+source/linux/+git/s390x
Only Andy Whitcroft can upload to this branch. If you are Andy Whitcroft please log in for upload directions.

Branch merges

Branch information

Name:
master
Repository:
lp:~apw/ubuntu/+source/linux/+git/s390x

Recent commits

fa2b810... by Tim Gardner

UBUNTU: Ubuntu-4.1.0-2.2

Signed-off-by: Tim Gardner <email address hidden>

a92b6e1... by Tim Gardner

UBUNTU: [Config] Add i40e[vf] to d-i

BugLink: http://bugs.launchpad.net/bugs/1476393

Signed-off-by: Tim Gardner <email address hidden>

b069f00... by Tim Gardner

UBUNTU: rebase to v4.1.3

Signed-off-by: Tim Gardner <email address hidden>

bc566d4... by Tim Gardner

UBUNTU: Start new release

Ignore: yes
Signed-off-by: Tim Gardner <email address hidden>

d9e5b22... by Leann Ogasawara

UBUNTU: Ubuntu-4.1.0-1.1

Signed-off-by: Leann Ogasawara <email address hidden>

2c4e37e... by Tim Gardner

UBUNTU: [Config] ACORN_PARTITION=n

BugLink: http://bugs.launchpad.net/bugs/1453117

Commit 50365c57860cd931c2d806057e0987634797e9af ([ARM] Make Acorn
partition types depend on ACORN_PARTITION) fixed some configuration issues,
but also removed the dependency on ARCH_ACORN. The partition detection logic
has been getting false positives on non-Acorn systems, so disable it.

Signed-off-by: Tim Gardner <email address hidden>

d5840d8... by Vaidyanathan Srinivasan <email address hidden>

powerpc/powernv: Fix vma page prot flags in opal-prd driver

BugLink: http://bugs.launchpad.net/bugs/1464560

opal-prd driver will mmap() firmware code/data area as private
mapping to prd user space daemon. Write to this page will
trigger COW faults. The new COW pages are normal kernel RAM
pages accounted by the kernel and are not special.

vma->vm_page_prot value will be used at page fault time
for the new COW pages, while pgprot_t value passed in
remap_pfn_range() is used for the initial page table entry.

Hence:
* Do not add _PAGE_SPECIAL in vma, but only for remap_pfn_range()
* Also remap_pfn_range() will add the _PAGE_SPECIAL flag using
  pte_mkspecial() call, hence no need to specify in the driver

This fix resolves the page accounting warning shown below:
BUG: Bad rss-counter state mm:c0000007d34ac600 idx:1 val:19

The above warning is triggered since _PAGE_SPECIAL was incorrectly
being set for the normal kernel COW pages.

Signed-off-by: Vaidyanathan Srinivasan <email address hidden>
Acked-by: Jeremy Kerr <email address hidden>
Signed-off-by: Michael Ellerman <email address hidden>
(cherry picked from commit d8ea782b56d9d2c46a47b3231cfd16ecfb538c60)
Signed-off-by: Chris J Arges <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>

73f75b9... by Jeremy Kerr

powerpc/include: Add opal-prd to installed uapi headers

BugLink: http://bugs.launchpad.net/bugs/1464560

We'll want to build the opal-prd daemon with the prd headers, so include
this in the uapi headers list.

Signed-off-by: Jeremy Kerr <email address hidden>
Signed-off-by: Michael Ellerman <email address hidden>
(cherry picked from commit cdf2bc1c283066d6f0834cc5dd4fcf5d01e44af9)
Signed-off-by: Chris J Arges <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>

7c7051f... by Jeremy Kerr

powerpc/powernv: fix construction of opal PRD messages

BugLink: http://bugs.launchpad.net/bugs/1464560

We currently have a bug in the PRD code, where the contents of an
incoming message (beyond the header) will be overwritten by the list
item manipulations when adding to to the prd_msg_queue.

This change reorders struct opal_prd_msg_queue_item, so that the
message body doesn't overlap the list_head.

We also clarify the memcpy of the message, as we're copying unnecessary
bytes at the end of the message data.

Signed-off-by: Jeremy Kerr <email address hidden>
Acked-by: Stewart Smith <email address hidden>
Signed-off-by: Michael Ellerman <email address hidden>
(cherry picked from commit 7185795a62589292015484985635b4a38029a2b9)
Signed-off-by: Chris J Arges <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>

dd3d5e6... by Jeremy Kerr

powerpc/powernv: Add opal-prd channel

BugLink: http://bugs.launchpad.net/bugs/1464560

This change adds a char device to access the "PRD" (processor runtime
diagnostics) channel to OPAL firmware.

Includes contributions from Vaidyanathan Srinivasan, Neelesh Gupta &
Vishal Kulkarni.

Signed-off-by: Neelesh Gupta <email address hidden>
Signed-off-by: Jeremy Kerr <email address hidden>
Acked-by: Stewart Smith <email address hidden>
Signed-off-by: Michael Ellerman <email address hidden>
(cherry picked from commit 0d7cd8550d30906c7461ced654306da30f1590e2)
Signed-off-by: Chris J Arges <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>