Home
last modified time | relevance | path

Searched hist:d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 (Results 1 – 25 of 178) sorted by relevance

12345678

/linux/tools/testing/selftests/powerpc/switch_endian/
H A D.gitignorediff d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 Thu Apr 16 20:53:32 CEST 2015 Linus Torvalds <torvalds@linux-foundation.org> Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

- Numerous minor fixes, cleanups etc.

- More EEH work from Gavin to remove its dependency on device_nodes.

- Memory hotplug implemented entirely in the kernel from Nathan
Fontenot.

- Removal of redundant CONFIG_PPC_OF by Kevin Hao.

- Rewrite of VPHN parsing logic & tests from Greg Kurz.

- A fix from Nish Aravamudan to reduce memory usage by clamping
nodes_possible_map.

- Support for pstore on powernv from Hari Bathini.

- Removal of old powerpc specific byte swap routines by David Gibson.

- Fix from Vasant Hegde to prevent the flash driver telling you it was
flashing your firmware when it wasn't.

- Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.

- Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
Stancek.

- Some fixes for migration from Tyrel Datwyler.

- A new syscall to switch the cpu endian by Michael Ellerman.

- Large series from Wei Yang to implement SRIOV, reviewed and acked by
Bjorn.

- A fix for the OPAL sensor driver from Cédric Le Goater.

- Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.

- Large series from Daniel Axtens to make our PCI hooks per PHB rather
than per machine.

- Small patch from Sam Bobroff to explicitly abort non-suspended
transactions on syscalls, plus a test to exercise it.

- Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.

- Small patch to enable the hard lockup detector from Anton Blanchard.

- Fix from Dave Olson for missing L2 cache information on some CPUs.

- Some fixes from Michael Ellerman to get Cell machines booting again.

- Freescale updates from Scott: Highlights include BMan device tree
nodes, an MSI erratum workaround, a couple minor performance
improvements, config updates, and misc fixes/cleanup.

* tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
powerpc/powermac: Fix build error seen with powermac smp builds
powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
powerpc/cell: Fix iommu breakage caused by controller_ops change
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
powerpc/pseries: Correct memory hotplug locking
powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
powerpc: Add ppc64 hard lockup detector support
oprofile: Disable oprofile NMI timer on ppc64
powerpc/perf/hv-24x7: Add missing put_cpu_var()
powerpc/perf/hv-24x7: Break up single_24x7_request
powerpc/perf/hv-24x7: Define update_event_count()
powerpc/perf/hv-24x7: Whitespace cleanup
powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
powerpc/perf/hv-24x7: Rename hv_24x7_event_update
powerpc/perf/hv-24x7: Move debug prints to separate function
powerpc/perf/hv-24x7: Drop event_24x7_request()
powerpc/perf/hv-24x7: Use pr_devel() to log message
...

Conflicts:
tools/testing/selftests/powerpc/Makefile
tools/testing/selftests/powerpc/tm/Makefile
H A Dcheck.Sdiff d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 Thu Apr 16 20:53:32 CEST 2015 Linus Torvalds <torvalds@linux-foundation.org> Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

- Numerous minor fixes, cleanups etc.

- More EEH work from Gavin to remove its dependency on device_nodes.

- Memory hotplug implemented entirely in the kernel from Nathan
Fontenot.

- Removal of redundant CONFIG_PPC_OF by Kevin Hao.

- Rewrite of VPHN parsing logic & tests from Greg Kurz.

- A fix from Nish Aravamudan to reduce memory usage by clamping
nodes_possible_map.

- Support for pstore on powernv from Hari Bathini.

- Removal of old powerpc specific byte swap routines by David Gibson.

- Fix from Vasant Hegde to prevent the flash driver telling you it was
flashing your firmware when it wasn't.

- Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.

- Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
Stancek.

- Some fixes for migration from Tyrel Datwyler.

- A new syscall to switch the cpu endian by Michael Ellerman.

- Large series from Wei Yang to implement SRIOV, reviewed and acked by
Bjorn.

- A fix for the OPAL sensor driver from Cédric Le Goater.

- Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.

- Large series from Daniel Axtens to make our PCI hooks per PHB rather
than per machine.

- Small patch from Sam Bobroff to explicitly abort non-suspended
transactions on syscalls, plus a test to exercise it.

- Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.

- Small patch to enable the hard lockup detector from Anton Blanchard.

- Fix from Dave Olson for missing L2 cache information on some CPUs.

- Some fixes from Michael Ellerman to get Cell machines booting again.

- Freescale updates from Scott: Highlights include BMan device tree
nodes, an MSI erratum workaround, a couple minor performance
improvements, config updates, and misc fixes/cleanup.

* tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
powerpc/powermac: Fix build error seen with powermac smp builds
powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
powerpc/cell: Fix iommu breakage caused by controller_ops change
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
powerpc/pseries: Correct memory hotplug locking
powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
powerpc: Add ppc64 hard lockup detector support
oprofile: Disable oprofile NMI timer on ppc64
powerpc/perf/hv-24x7: Add missing put_cpu_var()
powerpc/perf/hv-24x7: Break up single_24x7_request
powerpc/perf/hv-24x7: Define update_event_count()
powerpc/perf/hv-24x7: Whitespace cleanup
powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
powerpc/perf/hv-24x7: Rename hv_24x7_event_update
powerpc/perf/hv-24x7: Move debug prints to separate function
powerpc/perf/hv-24x7: Drop event_24x7_request()
powerpc/perf/hv-24x7: Use pr_devel() to log message
...

Conflicts:
tools/testing/selftests/powerpc/Makefile
tools/testing/selftests/powerpc/tm/Makefile
H A Dcommon.hdiff d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 Thu Apr 16 20:53:32 CEST 2015 Linus Torvalds <torvalds@linux-foundation.org> Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

- Numerous minor fixes, cleanups etc.

- More EEH work from Gavin to remove its dependency on device_nodes.

- Memory hotplug implemented entirely in the kernel from Nathan
Fontenot.

- Removal of redundant CONFIG_PPC_OF by Kevin Hao.

- Rewrite of VPHN parsing logic & tests from Greg Kurz.

- A fix from Nish Aravamudan to reduce memory usage by clamping
nodes_possible_map.

- Support for pstore on powernv from Hari Bathini.

- Removal of old powerpc specific byte swap routines by David Gibson.

- Fix from Vasant Hegde to prevent the flash driver telling you it was
flashing your firmware when it wasn't.

- Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.

- Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
Stancek.

- Some fixes for migration from Tyrel Datwyler.

- A new syscall to switch the cpu endian by Michael Ellerman.

- Large series from Wei Yang to implement SRIOV, reviewed and acked by
Bjorn.

- A fix for the OPAL sensor driver from Cédric Le Goater.

- Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.

- Large series from Daniel Axtens to make our PCI hooks per PHB rather
than per machine.

- Small patch from Sam Bobroff to explicitly abort non-suspended
transactions on syscalls, plus a test to exercise it.

- Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.

- Small patch to enable the hard lockup detector from Anton Blanchard.

- Fix from Dave Olson for missing L2 cache information on some CPUs.

- Some fixes from Michael Ellerman to get Cell machines booting again.

- Freescale updates from Scott: Highlights include BMan device tree
nodes, an MSI erratum workaround, a couple minor performance
improvements, config updates, and misc fixes/cleanup.

* tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
powerpc/powermac: Fix build error seen with powermac smp builds
powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
powerpc/cell: Fix iommu breakage caused by controller_ops change
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
powerpc/pseries: Correct memory hotplug locking
powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
powerpc: Add ppc64 hard lockup detector support
oprofile: Disable oprofile NMI timer on ppc64
powerpc/perf/hv-24x7: Add missing put_cpu_var()
powerpc/perf/hv-24x7: Break up single_24x7_request
powerpc/perf/hv-24x7: Define update_event_count()
powerpc/perf/hv-24x7: Whitespace cleanup
powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
powerpc/perf/hv-24x7: Rename hv_24x7_event_update
powerpc/perf/hv-24x7: Move debug prints to separate function
powerpc/perf/hv-24x7: Drop event_24x7_request()
powerpc/perf/hv-24x7: Use pr_devel() to log message
...

Conflicts:
tools/testing/selftests/powerpc/Makefile
tools/testing/selftests/powerpc/tm/Makefile
H A Dswitch_endian_test.Sdiff d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 Thu Apr 16 20:53:32 CEST 2015 Linus Torvalds <torvalds@linux-foundation.org> Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

- Numerous minor fixes, cleanups etc.

- More EEH work from Gavin to remove its dependency on device_nodes.

- Memory hotplug implemented entirely in the kernel from Nathan
Fontenot.

- Removal of redundant CONFIG_PPC_OF by Kevin Hao.

- Rewrite of VPHN parsing logic & tests from Greg Kurz.

- A fix from Nish Aravamudan to reduce memory usage by clamping
nodes_possible_map.

- Support for pstore on powernv from Hari Bathini.

- Removal of old powerpc specific byte swap routines by David Gibson.

- Fix from Vasant Hegde to prevent the flash driver telling you it was
flashing your firmware when it wasn't.

- Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.

- Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
Stancek.

- Some fixes for migration from Tyrel Datwyler.

- A new syscall to switch the cpu endian by Michael Ellerman.

- Large series from Wei Yang to implement SRIOV, reviewed and acked by
Bjorn.

- A fix for the OPAL sensor driver from Cédric Le Goater.

- Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.

- Large series from Daniel Axtens to make our PCI hooks per PHB rather
than per machine.

- Small patch from Sam Bobroff to explicitly abort non-suspended
transactions on syscalls, plus a test to exercise it.

- Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.

- Small patch to enable the hard lockup detector from Anton Blanchard.

- Fix from Dave Olson for missing L2 cache information on some CPUs.

- Some fixes from Michael Ellerman to get Cell machines booting again.

- Freescale updates from Scott: Highlights include BMan device tree
nodes, an MSI erratum workaround, a couple minor performance
improvements, config updates, and misc fixes/cleanup.

* tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
powerpc/powermac: Fix build error seen with powermac smp builds
powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
powerpc/cell: Fix iommu breakage caused by controller_ops change
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
powerpc/pseries: Correct memory hotplug locking
powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
powerpc: Add ppc64 hard lockup detector support
oprofile: Disable oprofile NMI timer on ppc64
powerpc/perf/hv-24x7: Add missing put_cpu_var()
powerpc/perf/hv-24x7: Break up single_24x7_request
powerpc/perf/hv-24x7: Define update_event_count()
powerpc/perf/hv-24x7: Whitespace cleanup
powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
powerpc/perf/hv-24x7: Rename hv_24x7_event_update
powerpc/perf/hv-24x7: Move debug prints to separate function
powerpc/perf/hv-24x7: Drop event_24x7_request()
powerpc/perf/hv-24x7: Use pr_devel() to log message
...

Conflicts:
tools/testing/selftests/powerpc/Makefile
tools/testing/selftests/powerpc/tm/Makefile
/linux/tools/testing/selftests/powerpc/vphn/
H A D.gitignorediff d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 Thu Apr 16 20:53:32 CEST 2015 Linus Torvalds <torvalds@linux-foundation.org> Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

- Numerous minor fixes, cleanups etc.

- More EEH work from Gavin to remove its dependency on device_nodes.

- Memory hotplug implemented entirely in the kernel from Nathan
Fontenot.

- Removal of redundant CONFIG_PPC_OF by Kevin Hao.

- Rewrite of VPHN parsing logic & tests from Greg Kurz.

- A fix from Nish Aravamudan to reduce memory usage by clamping
nodes_possible_map.

- Support for pstore on powernv from Hari Bathini.

- Removal of old powerpc specific byte swap routines by David Gibson.

- Fix from Vasant Hegde to prevent the flash driver telling you it was
flashing your firmware when it wasn't.

- Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.

- Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
Stancek.

- Some fixes for migration from Tyrel Datwyler.

- A new syscall to switch the cpu endian by Michael Ellerman.

- Large series from Wei Yang to implement SRIOV, reviewed and acked by
Bjorn.

- A fix for the OPAL sensor driver from Cédric Le Goater.

- Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.

- Large series from Daniel Axtens to make our PCI hooks per PHB rather
than per machine.

- Small patch from Sam Bobroff to explicitly abort non-suspended
transactions on syscalls, plus a test to exercise it.

- Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.

- Small patch to enable the hard lockup detector from Anton Blanchard.

- Fix from Dave Olson for missing L2 cache information on some CPUs.

- Some fixes from Michael Ellerman to get Cell machines booting again.

- Freescale updates from Scott: Highlights include BMan device tree
nodes, an MSI erratum workaround, a couple minor performance
improvements, config updates, and misc fixes/cleanup.

* tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
powerpc/powermac: Fix build error seen with powermac smp builds
powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
powerpc/cell: Fix iommu breakage caused by controller_ops change
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
powerpc/pseries: Correct memory hotplug locking
powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
powerpc: Add ppc64 hard lockup detector support
oprofile: Disable oprofile NMI timer on ppc64
powerpc/perf/hv-24x7: Add missing put_cpu_var()
powerpc/perf/hv-24x7: Break up single_24x7_request
powerpc/perf/hv-24x7: Define update_event_count()
powerpc/perf/hv-24x7: Whitespace cleanup
powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
powerpc/perf/hv-24x7: Rename hv_24x7_event_update
powerpc/perf/hv-24x7: Move debug prints to separate function
powerpc/perf/hv-24x7: Drop event_24x7_request()
powerpc/perf/hv-24x7: Use pr_devel() to log message
...

Conflicts:
tools/testing/selftests/powerpc/Makefile
tools/testing/selftests/powerpc/tm/Makefile
H A Dtest-vphn.cdiff d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 Thu Apr 16 20:53:32 CEST 2015 Linus Torvalds <torvalds@linux-foundation.org> Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

- Numerous minor fixes, cleanups etc.

- More EEH work from Gavin to remove its dependency on device_nodes.

- Memory hotplug implemented entirely in the kernel from Nathan
Fontenot.

- Removal of redundant CONFIG_PPC_OF by Kevin Hao.

- Rewrite of VPHN parsing logic & tests from Greg Kurz.

- A fix from Nish Aravamudan to reduce memory usage by clamping
nodes_possible_map.

- Support for pstore on powernv from Hari Bathini.

- Removal of old powerpc specific byte swap routines by David Gibson.

- Fix from Vasant Hegde to prevent the flash driver telling you it was
flashing your firmware when it wasn't.

- Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.

- Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
Stancek.

- Some fixes for migration from Tyrel Datwyler.

- A new syscall to switch the cpu endian by Michael Ellerman.

- Large series from Wei Yang to implement SRIOV, reviewed and acked by
Bjorn.

- A fix for the OPAL sensor driver from Cédric Le Goater.

- Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.

- Large series from Daniel Axtens to make our PCI hooks per PHB rather
than per machine.

- Small patch from Sam Bobroff to explicitly abort non-suspended
transactions on syscalls, plus a test to exercise it.

- Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.

- Small patch to enable the hard lockup detector from Anton Blanchard.

- Fix from Dave Olson for missing L2 cache information on some CPUs.

- Some fixes from Michael Ellerman to get Cell machines booting again.

- Freescale updates from Scott: Highlights include BMan device tree
nodes, an MSI erratum workaround, a couple minor performance
improvements, config updates, and misc fixes/cleanup.

* tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
powerpc/powermac: Fix build error seen with powermac smp builds
powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
powerpc/cell: Fix iommu breakage caused by controller_ops change
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
powerpc/pseries: Correct memory hotplug locking
powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
powerpc: Add ppc64 hard lockup detector support
oprofile: Disable oprofile NMI timer on ppc64
powerpc/perf/hv-24x7: Add missing put_cpu_var()
powerpc/perf/hv-24x7: Break up single_24x7_request
powerpc/perf/hv-24x7: Define update_event_count()
powerpc/perf/hv-24x7: Whitespace cleanup
powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
powerpc/perf/hv-24x7: Rename hv_24x7_event_update
powerpc/perf/hv-24x7: Move debug prints to separate function
powerpc/perf/hv-24x7: Drop event_24x7_request()
powerpc/perf/hv-24x7: Use pr_devel() to log message
...

Conflicts:
tools/testing/selftests/powerpc/Makefile
tools/testing/selftests/powerpc/tm/Makefile
H A DMakefilediff d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 Thu Apr 16 20:53:32 CEST 2015 Linus Torvalds <torvalds@linux-foundation.org> Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

- Numerous minor fixes, cleanups etc.

- More EEH work from Gavin to remove its dependency on device_nodes.

- Memory hotplug implemented entirely in the kernel from Nathan
Fontenot.

- Removal of redundant CONFIG_PPC_OF by Kevin Hao.

- Rewrite of VPHN parsing logic & tests from Greg Kurz.

- A fix from Nish Aravamudan to reduce memory usage by clamping
nodes_possible_map.

- Support for pstore on powernv from Hari Bathini.

- Removal of old powerpc specific byte swap routines by David Gibson.

- Fix from Vasant Hegde to prevent the flash driver telling you it was
flashing your firmware when it wasn't.

- Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.

- Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
Stancek.

- Some fixes for migration from Tyrel Datwyler.

- A new syscall to switch the cpu endian by Michael Ellerman.

- Large series from Wei Yang to implement SRIOV, reviewed and acked by
Bjorn.

- A fix for the OPAL sensor driver from Cédric Le Goater.

- Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.

- Large series from Daniel Axtens to make our PCI hooks per PHB rather
than per machine.

- Small patch from Sam Bobroff to explicitly abort non-suspended
transactions on syscalls, plus a test to exercise it.

- Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.

- Small patch to enable the hard lockup detector from Anton Blanchard.

- Fix from Dave Olson for missing L2 cache information on some CPUs.

- Some fixes from Michael Ellerman to get Cell machines booting again.

- Freescale updates from Scott: Highlights include BMan device tree
nodes, an MSI erratum workaround, a couple minor performance
improvements, config updates, and misc fixes/cleanup.

* tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
powerpc/powermac: Fix build error seen with powermac smp builds
powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
powerpc/cell: Fix iommu breakage caused by controller_ops change
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
powerpc/pseries: Correct memory hotplug locking
powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
powerpc: Add ppc64 hard lockup detector support
oprofile: Disable oprofile NMI timer on ppc64
powerpc/perf/hv-24x7: Add missing put_cpu_var()
powerpc/perf/hv-24x7: Break up single_24x7_request
powerpc/perf/hv-24x7: Define update_event_count()
powerpc/perf/hv-24x7: Whitespace cleanup
powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
powerpc/perf/hv-24x7: Rename hv_24x7_event_update
powerpc/perf/hv-24x7: Move debug prints to separate function
powerpc/perf/hv-24x7: Drop event_24x7_request()
powerpc/perf/hv-24x7: Use pr_devel() to log message
...

Conflicts:
tools/testing/selftests/powerpc/Makefile
tools/testing/selftests/powerpc/tm/Makefile
/linux/arch/powerpc/platforms/cell/
H A Dcell.hdiff d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 Thu Apr 16 20:53:32 CEST 2015 Linus Torvalds <torvalds@linux-foundation.org> Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

- Numerous minor fixes, cleanups etc.

- More EEH work from Gavin to remove its dependency on device_nodes.

- Memory hotplug implemented entirely in the kernel from Nathan
Fontenot.

- Removal of redundant CONFIG_PPC_OF by Kevin Hao.

- Rewrite of VPHN parsing logic & tests from Greg Kurz.

- A fix from Nish Aravamudan to reduce memory usage by clamping
nodes_possible_map.

- Support for pstore on powernv from Hari Bathini.

- Removal of old powerpc specific byte swap routines by David Gibson.

- Fix from Vasant Hegde to prevent the flash driver telling you it was
flashing your firmware when it wasn't.

- Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.

- Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
Stancek.

- Some fixes for migration from Tyrel Datwyler.

- A new syscall to switch the cpu endian by Michael Ellerman.

- Large series from Wei Yang to implement SRIOV, reviewed and acked by
Bjorn.

- A fix for the OPAL sensor driver from Cédric Le Goater.

- Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.

- Large series from Daniel Axtens to make our PCI hooks per PHB rather
than per machine.

- Small patch from Sam Bobroff to explicitly abort non-suspended
transactions on syscalls, plus a test to exercise it.

- Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.

- Small patch to enable the hard lockup detector from Anton Blanchard.

- Fix from Dave Olson for missing L2 cache information on some CPUs.

- Some fixes from Michael Ellerman to get Cell machines booting again.

- Freescale updates from Scott: Highlights include BMan device tree
nodes, an MSI erratum workaround, a couple minor performance
improvements, config updates, and misc fixes/cleanup.

* tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
powerpc/powermac: Fix build error seen with powermac smp builds
powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
powerpc/cell: Fix iommu breakage caused by controller_ops change
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
powerpc/pseries: Correct memory hotplug locking
powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
powerpc: Add ppc64 hard lockup detector support
oprofile: Disable oprofile NMI timer on ppc64
powerpc/perf/hv-24x7: Add missing put_cpu_var()
powerpc/perf/hv-24x7: Break up single_24x7_request
powerpc/perf/hv-24x7: Define update_event_count()
powerpc/perf/hv-24x7: Whitespace cleanup
powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
powerpc/perf/hv-24x7: Rename hv_24x7_event_update
powerpc/perf/hv-24x7: Move debug prints to separate function
powerpc/perf/hv-24x7: Drop event_24x7_request()
powerpc/perf/hv-24x7: Use pr_devel() to log message
...

Conflicts:
tools/testing/selftests/powerpc/Makefile
tools/testing/selftests/powerpc/tm/Makefile
/linux/arch/powerpc/boot/
H A Dplanetcore.cdiff d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 Thu Apr 16 20:53:32 CEST 2015 Linus Torvalds <torvalds@linux-foundation.org> Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

- Numerous minor fixes, cleanups etc.

- More EEH work from Gavin to remove its dependency on device_nodes.

- Memory hotplug implemented entirely in the kernel from Nathan
Fontenot.

- Removal of redundant CONFIG_PPC_OF by Kevin Hao.

- Rewrite of VPHN parsing logic & tests from Greg Kurz.

- A fix from Nish Aravamudan to reduce memory usage by clamping
nodes_possible_map.

- Support for pstore on powernv from Hari Bathini.

- Removal of old powerpc specific byte swap routines by David Gibson.

- Fix from Vasant Hegde to prevent the flash driver telling you it was
flashing your firmware when it wasn't.

- Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.

- Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
Stancek.

- Some fixes for migration from Tyrel Datwyler.

- A new syscall to switch the cpu endian by Michael Ellerman.

- Large series from Wei Yang to implement SRIOV, reviewed and acked by
Bjorn.

- A fix for the OPAL sensor driver from Cédric Le Goater.

- Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.

- Large series from Daniel Axtens to make our PCI hooks per PHB rather
than per machine.

- Small patch from Sam Bobroff to explicitly abort non-suspended
transactions on syscalls, plus a test to exercise it.

- Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.

- Small patch to enable the hard lockup detector from Anton Blanchard.

- Fix from Dave Olson for missing L2 cache information on some CPUs.

- Some fixes from Michael Ellerman to get Cell machines booting again.

- Freescale updates from Scott: Highlights include BMan device tree
nodes, an MSI erratum workaround, a couple minor performance
improvements, config updates, and misc fixes/cleanup.

* tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
powerpc/powermac: Fix build error seen with powermac smp builds
powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
powerpc/cell: Fix iommu breakage caused by controller_ops change
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
powerpc/pseries: Correct memory hotplug locking
powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
powerpc: Add ppc64 hard lockup detector support
oprofile: Disable oprofile NMI timer on ppc64
powerpc/perf/hv-24x7: Add missing put_cpu_var()
powerpc/perf/hv-24x7: Break up single_24x7_request
powerpc/perf/hv-24x7: Define update_event_count()
powerpc/perf/hv-24x7: Whitespace cleanup
powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
powerpc/perf/hv-24x7: Rename hv_24x7_event_update
powerpc/perf/hv-24x7: Move debug prints to separate function
powerpc/perf/hv-24x7: Drop event_24x7_request()
powerpc/perf/hv-24x7: Use pr_devel() to log message
...

Conflicts:
tools/testing/selftests/powerpc/Makefile
tools/testing/selftests/powerpc/tm/Makefile
H A Dplanetcore.hdiff d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 Thu Apr 16 20:53:32 CEST 2015 Linus Torvalds <torvalds@linux-foundation.org> Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

- Numerous minor fixes, cleanups etc.

- More EEH work from Gavin to remove its dependency on device_nodes.

- Memory hotplug implemented entirely in the kernel from Nathan
Fontenot.

- Removal of redundant CONFIG_PPC_OF by Kevin Hao.

- Rewrite of VPHN parsing logic & tests from Greg Kurz.

- A fix from Nish Aravamudan to reduce memory usage by clamping
nodes_possible_map.

- Support for pstore on powernv from Hari Bathini.

- Removal of old powerpc specific byte swap routines by David Gibson.

- Fix from Vasant Hegde to prevent the flash driver telling you it was
flashing your firmware when it wasn't.

- Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.

- Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
Stancek.

- Some fixes for migration from Tyrel Datwyler.

- A new syscall to switch the cpu endian by Michael Ellerman.

- Large series from Wei Yang to implement SRIOV, reviewed and acked by
Bjorn.

- A fix for the OPAL sensor driver from Cédric Le Goater.

- Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.

- Large series from Daniel Axtens to make our PCI hooks per PHB rather
than per machine.

- Small patch from Sam Bobroff to explicitly abort non-suspended
transactions on syscalls, plus a test to exercise it.

- Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.

- Small patch to enable the hard lockup detector from Anton Blanchard.

- Fix from Dave Olson for missing L2 cache information on some CPUs.

- Some fixes from Michael Ellerman to get Cell machines booting again.

- Freescale updates from Scott: Highlights include BMan device tree
nodes, an MSI erratum workaround, a couple minor performance
improvements, config updates, and misc fixes/cleanup.

* tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
powerpc/powermac: Fix build error seen with powermac smp builds
powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
powerpc/cell: Fix iommu breakage caused by controller_ops change
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
powerpc/pseries: Correct memory hotplug locking
powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
powerpc: Add ppc64 hard lockup detector support
oprofile: Disable oprofile NMI timer on ppc64
powerpc/perf/hv-24x7: Add missing put_cpu_var()
powerpc/perf/hv-24x7: Break up single_24x7_request
powerpc/perf/hv-24x7: Define update_event_count()
powerpc/perf/hv-24x7: Whitespace cleanup
powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
powerpc/perf/hv-24x7: Rename hv_24x7_event_update
powerpc/perf/hv-24x7: Move debug prints to separate function
powerpc/perf/hv-24x7: Drop event_24x7_request()
powerpc/perf/hv-24x7: Use pr_devel() to log message
...

Conflicts:
tools/testing/selftests/powerpc/Makefile
tools/testing/selftests/powerpc/tm/Makefile
H A Dlibfdt-wrapper.cdiff d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 Thu Apr 16 20:53:32 CEST 2015 Linus Torvalds <torvalds@linux-foundation.org> Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

- Numerous minor fixes, cleanups etc.

- More EEH work from Gavin to remove its dependency on device_nodes.

- Memory hotplug implemented entirely in the kernel from Nathan
Fontenot.

- Removal of redundant CONFIG_PPC_OF by Kevin Hao.

- Rewrite of VPHN parsing logic & tests from Greg Kurz.

- A fix from Nish Aravamudan to reduce memory usage by clamping
nodes_possible_map.

- Support for pstore on powernv from Hari Bathini.

- Removal of old powerpc specific byte swap routines by David Gibson.

- Fix from Vasant Hegde to prevent the flash driver telling you it was
flashing your firmware when it wasn't.

- Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.

- Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
Stancek.

- Some fixes for migration from Tyrel Datwyler.

- A new syscall to switch the cpu endian by Michael Ellerman.

- Large series from Wei Yang to implement SRIOV, reviewed and acked by
Bjorn.

- A fix for the OPAL sensor driver from Cédric Le Goater.

- Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.

- Large series from Daniel Axtens to make our PCI hooks per PHB rather
than per machine.

- Small patch from Sam Bobroff to explicitly abort non-suspended
transactions on syscalls, plus a test to exercise it.

- Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.

- Small patch to enable the hard lockup detector from Anton Blanchard.

- Fix from Dave Olson for missing L2 cache information on some CPUs.

- Some fixes from Michael Ellerman to get Cell machines booting again.

- Freescale updates from Scott: Highlights include BMan device tree
nodes, an MSI erratum workaround, a couple minor performance
improvements, config updates, and misc fixes/cleanup.

* tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
powerpc/powermac: Fix build error seen with powermac smp builds
powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
powerpc/cell: Fix iommu breakage caused by controller_ops change
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
powerpc/pseries: Correct memory hotplug locking
powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
powerpc: Add ppc64 hard lockup detector support
oprofile: Disable oprofile NMI timer on ppc64
powerpc/perf/hv-24x7: Add missing put_cpu_var()
powerpc/perf/hv-24x7: Break up single_24x7_request
powerpc/perf/hv-24x7: Define update_event_count()
powerpc/perf/hv-24x7: Whitespace cleanup
powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
powerpc/perf/hv-24x7: Rename hv_24x7_event_update
powerpc/perf/hv-24x7: Move debug prints to separate function
powerpc/perf/hv-24x7: Drop event_24x7_request()
powerpc/perf/hv-24x7: Use pr_devel() to log message
...

Conflicts:
tools/testing/selftests/powerpc/Makefile
tools/testing/selftests/powerpc/tm/Makefile
H A Dof.hdiff d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 Thu Apr 16 20:53:32 CEST 2015 Linus Torvalds <torvalds@linux-foundation.org> Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

- Numerous minor fixes, cleanups etc.

- More EEH work from Gavin to remove its dependency on device_nodes.

- Memory hotplug implemented entirely in the kernel from Nathan
Fontenot.

- Removal of redundant CONFIG_PPC_OF by Kevin Hao.

- Rewrite of VPHN parsing logic & tests from Greg Kurz.

- A fix from Nish Aravamudan to reduce memory usage by clamping
nodes_possible_map.

- Support for pstore on powernv from Hari Bathini.

- Removal of old powerpc specific byte swap routines by David Gibson.

- Fix from Vasant Hegde to prevent the flash driver telling you it was
flashing your firmware when it wasn't.

- Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.

- Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
Stancek.

- Some fixes for migration from Tyrel Datwyler.

- A new syscall to switch the cpu endian by Michael Ellerman.

- Large series from Wei Yang to implement SRIOV, reviewed and acked by
Bjorn.

- A fix for the OPAL sensor driver from Cédric Le Goater.

- Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.

- Large series from Daniel Axtens to make our PCI hooks per PHB rather
than per machine.

- Small patch from Sam Bobroff to explicitly abort non-suspended
transactions on syscalls, plus a test to exercise it.

- Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.

- Small patch to enable the hard lockup detector from Anton Blanchard.

- Fix from Dave Olson for missing L2 cache information on some CPUs.

- Some fixes from Michael Ellerman to get Cell machines booting again.

- Freescale updates from Scott: Highlights include BMan device tree
nodes, an MSI erratum workaround, a couple minor performance
improvements, config updates, and misc fixes/cleanup.

* tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
powerpc/powermac: Fix build error seen with powermac smp builds
powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
powerpc/cell: Fix iommu breakage caused by controller_ops change
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
powerpc/pseries: Correct memory hotplug locking
powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
powerpc: Add ppc64 hard lockup detector support
oprofile: Disable oprofile NMI timer on ppc64
powerpc/perf/hv-24x7: Add missing put_cpu_var()
powerpc/perf/hv-24x7: Break up single_24x7_request
powerpc/perf/hv-24x7: Define update_event_count()
powerpc/perf/hv-24x7: Whitespace cleanup
powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
powerpc/perf/hv-24x7: Rename hv_24x7_event_update
powerpc/perf/hv-24x7: Move debug prints to separate function
powerpc/perf/hv-24x7: Drop event_24x7_request()
powerpc/perf/hv-24x7: Use pr_devel() to log message
...

Conflicts:
tools/testing/selftests/powerpc/Makefile
tools/testing/selftests/powerpc/tm/Makefile
/linux/drivers/video/fbdev/nvidia/
H A Dnv_of.cdiff d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 Thu Apr 16 20:53:32 CEST 2015 Linus Torvalds <torvalds@linux-foundation.org> Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

- Numerous minor fixes, cleanups etc.

- More EEH work from Gavin to remove its dependency on device_nodes.

- Memory hotplug implemented entirely in the kernel from Nathan
Fontenot.

- Removal of redundant CONFIG_PPC_OF by Kevin Hao.

- Rewrite of VPHN parsing logic & tests from Greg Kurz.

- A fix from Nish Aravamudan to reduce memory usage by clamping
nodes_possible_map.

- Support for pstore on powernv from Hari Bathini.

- Removal of old powerpc specific byte swap routines by David Gibson.

- Fix from Vasant Hegde to prevent the flash driver telling you it was
flashing your firmware when it wasn't.

- Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.

- Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
Stancek.

- Some fixes for migration from Tyrel Datwyler.

- A new syscall to switch the cpu endian by Michael Ellerman.

- Large series from Wei Yang to implement SRIOV, reviewed and acked by
Bjorn.

- A fix for the OPAL sensor driver from Cédric Le Goater.

- Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.

- Large series from Daniel Axtens to make our PCI hooks per PHB rather
than per machine.

- Small patch from Sam Bobroff to explicitly abort non-suspended
transactions on syscalls, plus a test to exercise it.

- Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.

- Small patch to enable the hard lockup detector from Anton Blanchard.

- Fix from Dave Olson for missing L2 cache information on some CPUs.

- Some fixes from Michael Ellerman to get Cell machines booting again.

- Freescale updates from Scott: Highlights include BMan device tree
nodes, an MSI erratum workaround, a couple minor performance
improvements, config updates, and misc fixes/cleanup.

* tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
powerpc/powermac: Fix build error seen with powermac smp builds
powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
powerpc/cell: Fix iommu breakage caused by controller_ops change
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
powerpc/pseries: Correct memory hotplug locking
powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
powerpc: Add ppc64 hard lockup detector support
oprofile: Disable oprofile NMI timer on ppc64
powerpc/perf/hv-24x7: Add missing put_cpu_var()
powerpc/perf/hv-24x7: Break up single_24x7_request
powerpc/perf/hv-24x7: Define update_event_count()
powerpc/perf/hv-24x7: Whitespace cleanup
powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
powerpc/perf/hv-24x7: Rename hv_24x7_event_update
powerpc/perf/hv-24x7: Move debug prints to separate function
powerpc/perf/hv-24x7: Drop event_24x7_request()
powerpc/perf/hv-24x7: Use pr_devel() to log message
...

Conflicts:
tools/testing/selftests/powerpc/Makefile
tools/testing/selftests/powerpc/tm/Makefile
H A Dnv_proto.hdiff d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 Thu Apr 16 20:53:32 CEST 2015 Linus Torvalds <torvalds@linux-foundation.org> Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

- Numerous minor fixes, cleanups etc.

- More EEH work from Gavin to remove its dependency on device_nodes.

- Memory hotplug implemented entirely in the kernel from Nathan
Fontenot.

- Removal of redundant CONFIG_PPC_OF by Kevin Hao.

- Rewrite of VPHN parsing logic & tests from Greg Kurz.

- A fix from Nish Aravamudan to reduce memory usage by clamping
nodes_possible_map.

- Support for pstore on powernv from Hari Bathini.

- Removal of old powerpc specific byte swap routines by David Gibson.

- Fix from Vasant Hegde to prevent the flash driver telling you it was
flashing your firmware when it wasn't.

- Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.

- Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
Stancek.

- Some fixes for migration from Tyrel Datwyler.

- A new syscall to switch the cpu endian by Michael Ellerman.

- Large series from Wei Yang to implement SRIOV, reviewed and acked by
Bjorn.

- A fix for the OPAL sensor driver from Cédric Le Goater.

- Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.

- Large series from Daniel Axtens to make our PCI hooks per PHB rather
than per machine.

- Small patch from Sam Bobroff to explicitly abort non-suspended
transactions on syscalls, plus a test to exercise it.

- Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.

- Small patch to enable the hard lockup detector from Anton Blanchard.

- Fix from Dave Olson for missing L2 cache information on some CPUs.

- Some fixes from Michael Ellerman to get Cell machines booting again.

- Freescale updates from Scott: Highlights include BMan device tree
nodes, an MSI erratum workaround, a couple minor performance
improvements, config updates, and misc fixes/cleanup.

* tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
powerpc/powermac: Fix build error seen with powermac smp builds
powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
powerpc/cell: Fix iommu breakage caused by controller_ops change
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
powerpc/pseries: Correct memory hotplug locking
powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
powerpc: Add ppc64 hard lockup detector support
oprofile: Disable oprofile NMI timer on ppc64
powerpc/perf/hv-24x7: Add missing put_cpu_var()
powerpc/perf/hv-24x7: Break up single_24x7_request
powerpc/perf/hv-24x7: Define update_event_count()
powerpc/perf/hv-24x7: Whitespace cleanup
powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
powerpc/perf/hv-24x7: Rename hv_24x7_event_update
powerpc/perf/hv-24x7: Move debug prints to separate function
powerpc/perf/hv-24x7: Drop event_24x7_request()
powerpc/perf/hv-24x7: Use pr_devel() to log message
...

Conflicts:
tools/testing/selftests/powerpc/Makefile
tools/testing/selftests/powerpc/tm/Makefile
H A DMakefilediff d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 Thu Apr 16 20:53:32 CEST 2015 Linus Torvalds <torvalds@linux-foundation.org> Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

- Numerous minor fixes, cleanups etc.

- More EEH work from Gavin to remove its dependency on device_nodes.

- Memory hotplug implemented entirely in the kernel from Nathan
Fontenot.

- Removal of redundant CONFIG_PPC_OF by Kevin Hao.

- Rewrite of VPHN parsing logic & tests from Greg Kurz.

- A fix from Nish Aravamudan to reduce memory usage by clamping
nodes_possible_map.

- Support for pstore on powernv from Hari Bathini.

- Removal of old powerpc specific byte swap routines by David Gibson.

- Fix from Vasant Hegde to prevent the flash driver telling you it was
flashing your firmware when it wasn't.

- Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.

- Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
Stancek.

- Some fixes for migration from Tyrel Datwyler.

- A new syscall to switch the cpu endian by Michael Ellerman.

- Large series from Wei Yang to implement SRIOV, reviewed and acked by
Bjorn.

- A fix for the OPAL sensor driver from Cédric Le Goater.

- Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.

- Large series from Daniel Axtens to make our PCI hooks per PHB rather
than per machine.

- Small patch from Sam Bobroff to explicitly abort non-suspended
transactions on syscalls, plus a test to exercise it.

- Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.

- Small patch to enable the hard lockup detector from Anton Blanchard.

- Fix from Dave Olson for missing L2 cache information on some CPUs.

- Some fixes from Michael Ellerman to get Cell machines booting again.

- Freescale updates from Scott: Highlights include BMan device tree
nodes, an MSI erratum workaround, a couple minor performance
improvements, config updates, and misc fixes/cleanup.

* tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
powerpc/powermac: Fix build error seen with powermac smp builds
powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
powerpc/cell: Fix iommu breakage caused by controller_ops change
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
powerpc/pseries: Correct memory hotplug locking
powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
powerpc: Add ppc64 hard lockup detector support
oprofile: Disable oprofile NMI timer on ppc64
powerpc/perf/hv-24x7: Add missing put_cpu_var()
powerpc/perf/hv-24x7: Break up single_24x7_request
powerpc/perf/hv-24x7: Define update_event_count()
powerpc/perf/hv-24x7: Whitespace cleanup
powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
powerpc/perf/hv-24x7: Rename hv_24x7_event_update
powerpc/perf/hv-24x7: Move debug prints to separate function
powerpc/perf/hv-24x7: Drop event_24x7_request()
powerpc/perf/hv-24x7: Use pr_devel() to log message
...

Conflicts:
tools/testing/selftests/powerpc/Makefile
tools/testing/selftests/powerpc/tm/Makefile
/linux/arch/powerpc/include/asm/
H A Dmpc85xx.hdiff d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 Thu Apr 16 20:53:32 CEST 2015 Linus Torvalds <torvalds@linux-foundation.org> Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

- Numerous minor fixes, cleanups etc.

- More EEH work from Gavin to remove its dependency on device_nodes.

- Memory hotplug implemented entirely in the kernel from Nathan
Fontenot.

- Removal of redundant CONFIG_PPC_OF by Kevin Hao.

- Rewrite of VPHN parsing logic & tests from Greg Kurz.

- A fix from Nish Aravamudan to reduce memory usage by clamping
nodes_possible_map.

- Support for pstore on powernv from Hari Bathini.

- Removal of old powerpc specific byte swap routines by David Gibson.

- Fix from Vasant Hegde to prevent the flash driver telling you it was
flashing your firmware when it wasn't.

- Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.

- Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
Stancek.

- Some fixes for migration from Tyrel Datwyler.

- A new syscall to switch the cpu endian by Michael Ellerman.

- Large series from Wei Yang to implement SRIOV, reviewed and acked by
Bjorn.

- A fix for the OPAL sensor driver from Cédric Le Goater.

- Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.

- Large series from Daniel Axtens to make our PCI hooks per PHB rather
than per machine.

- Small patch from Sam Bobroff to explicitly abort non-suspended
transactions on syscalls, plus a test to exercise it.

- Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.

- Small patch to enable the hard lockup detector from Anton Blanchard.

- Fix from Dave Olson for missing L2 cache information on some CPUs.

- Some fixes from Michael Ellerman to get Cell machines booting again.

- Freescale updates from Scott: Highlights include BMan device tree
nodes, an MSI erratum workaround, a couple minor performance
improvements, config updates, and misc fixes/cleanup.

* tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
powerpc/powermac: Fix build error seen with powermac smp builds
powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
powerpc/cell: Fix iommu breakage caused by controller_ops change
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
powerpc/pseries: Correct memory hotplug locking
powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
powerpc: Add ppc64 hard lockup detector support
oprofile: Disable oprofile NMI timer on ppc64
powerpc/perf/hv-24x7: Add missing put_cpu_var()
powerpc/perf/hv-24x7: Break up single_24x7_request
powerpc/perf/hv-24x7: Define update_event_count()
powerpc/perf/hv-24x7: Whitespace cleanup
powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
powerpc/perf/hv-24x7: Rename hv_24x7_event_update
powerpc/perf/hv-24x7: Move debug prints to separate function
powerpc/perf/hv-24x7: Drop event_24x7_request()
powerpc/perf/hv-24x7: Use pr_devel() to log message
...

Conflicts:
tools/testing/selftests/powerpc/Makefile
tools/testing/selftests/powerpc/tm/Makefile
H A Ddbdma.hdiff d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 Thu Apr 16 20:53:32 CEST 2015 Linus Torvalds <torvalds@linux-foundation.org> Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

- Numerous minor fixes, cleanups etc.

- More EEH work from Gavin to remove its dependency on device_nodes.

- Memory hotplug implemented entirely in the kernel from Nathan
Fontenot.

- Removal of redundant CONFIG_PPC_OF by Kevin Hao.

- Rewrite of VPHN parsing logic & tests from Greg Kurz.

- A fix from Nish Aravamudan to reduce memory usage by clamping
nodes_possible_map.

- Support for pstore on powernv from Hari Bathini.

- Removal of old powerpc specific byte swap routines by David Gibson.

- Fix from Vasant Hegde to prevent the flash driver telling you it was
flashing your firmware when it wasn't.

- Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.

- Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
Stancek.

- Some fixes for migration from Tyrel Datwyler.

- A new syscall to switch the cpu endian by Michael Ellerman.

- Large series from Wei Yang to implement SRIOV, reviewed and acked by
Bjorn.

- A fix for the OPAL sensor driver from Cédric Le Goater.

- Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.

- Large series from Daniel Axtens to make our PCI hooks per PHB rather
than per machine.

- Small patch from Sam Bobroff to explicitly abort non-suspended
transactions on syscalls, plus a test to exercise it.

- Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.

- Small patch to enable the hard lockup detector from Anton Blanchard.

- Fix from Dave Olson for missing L2 cache information on some CPUs.

- Some fixes from Michael Ellerman to get Cell machines booting again.

- Freescale updates from Scott: Highlights include BMan device tree
nodes, an MSI erratum workaround, a couple minor performance
improvements, config updates, and misc fixes/cleanup.

* tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
powerpc/powermac: Fix build error seen with powermac smp builds
powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
powerpc/cell: Fix iommu breakage caused by controller_ops change
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
powerpc/pseries: Correct memory hotplug locking
powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
powerpc: Add ppc64 hard lockup detector support
oprofile: Disable oprofile NMI timer on ppc64
powerpc/perf/hv-24x7: Add missing put_cpu_var()
powerpc/perf/hv-24x7: Break up single_24x7_request
powerpc/perf/hv-24x7: Define update_event_count()
powerpc/perf/hv-24x7: Whitespace cleanup
powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
powerpc/perf/hv-24x7: Rename hv_24x7_event_update
powerpc/perf/hv-24x7: Move debug prints to separate function
powerpc/perf/hv-24x7: Drop event_24x7_request()
powerpc/perf/hv-24x7: Use pr_devel() to log message
...

Conflicts:
tools/testing/selftests/powerpc/Makefile
tools/testing/selftests/powerpc/tm/Makefile
H A Dswab.hdiff d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 Thu Apr 16 20:53:32 CEST 2015 Linus Torvalds <torvalds@linux-foundation.org> Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

- Numerous minor fixes, cleanups etc.

- More EEH work from Gavin to remove its dependency on device_nodes.

- Memory hotplug implemented entirely in the kernel from Nathan
Fontenot.

- Removal of redundant CONFIG_PPC_OF by Kevin Hao.

- Rewrite of VPHN parsing logic & tests from Greg Kurz.

- A fix from Nish Aravamudan to reduce memory usage by clamping
nodes_possible_map.

- Support for pstore on powernv from Hari Bathini.

- Removal of old powerpc specific byte swap routines by David Gibson.

- Fix from Vasant Hegde to prevent the flash driver telling you it was
flashing your firmware when it wasn't.

- Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.

- Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
Stancek.

- Some fixes for migration from Tyrel Datwyler.

- A new syscall to switch the cpu endian by Michael Ellerman.

- Large series from Wei Yang to implement SRIOV, reviewed and acked by
Bjorn.

- A fix for the OPAL sensor driver from Cédric Le Goater.

- Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.

- Large series from Daniel Axtens to make our PCI hooks per PHB rather
than per machine.

- Small patch from Sam Bobroff to explicitly abort non-suspended
transactions on syscalls, plus a test to exercise it.

- Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.

- Small patch to enable the hard lockup detector from Anton Blanchard.

- Fix from Dave Olson for missing L2 cache information on some CPUs.

- Some fixes from Michael Ellerman to get Cell machines booting again.

- Freescale updates from Scott: Highlights include BMan device tree
nodes, an MSI erratum workaround, a couple minor performance
improvements, config updates, and misc fixes/cleanup.

* tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
powerpc/powermac: Fix build error seen with powermac smp builds
powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
powerpc/cell: Fix iommu breakage caused by controller_ops change
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
powerpc/pseries: Correct memory hotplug locking
powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
powerpc: Add ppc64 hard lockup detector support
oprofile: Disable oprofile NMI timer on ppc64
powerpc/perf/hv-24x7: Add missing put_cpu_var()
powerpc/perf/hv-24x7: Break up single_24x7_request
powerpc/perf/hv-24x7: Define update_event_count()
powerpc/perf/hv-24x7: Whitespace cleanup
powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
powerpc/perf/hv-24x7: Rename hv_24x7_event_update
powerpc/perf/hv-24x7: Move debug prints to separate function
powerpc/perf/hv-24x7: Drop event_24x7_request()
powerpc/perf/hv-24x7: Use pr_devel() to log message
...

Conflicts:
tools/testing/selftests/powerpc/Makefile
tools/testing/selftests/powerpc/tm/Makefile
/linux/drivers/media/pci/bt8xx/
H A Dbt878.hdiff d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 Thu Apr 16 20:53:32 CEST 2015 Linus Torvalds <torvalds@linux-foundation.org> Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

- Numerous minor fixes, cleanups etc.

- More EEH work from Gavin to remove its dependency on device_nodes.

- Memory hotplug implemented entirely in the kernel from Nathan
Fontenot.

- Removal of redundant CONFIG_PPC_OF by Kevin Hao.

- Rewrite of VPHN parsing logic & tests from Greg Kurz.

- A fix from Nish Aravamudan to reduce memory usage by clamping
nodes_possible_map.

- Support for pstore on powernv from Hari Bathini.

- Removal of old powerpc specific byte swap routines by David Gibson.

- Fix from Vasant Hegde to prevent the flash driver telling you it was
flashing your firmware when it wasn't.

- Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.

- Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
Stancek.

- Some fixes for migration from Tyrel Datwyler.

- A new syscall to switch the cpu endian by Michael Ellerman.

- Large series from Wei Yang to implement SRIOV, reviewed and acked by
Bjorn.

- A fix for the OPAL sensor driver from Cédric Le Goater.

- Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.

- Large series from Daniel Axtens to make our PCI hooks per PHB rather
than per machine.

- Small patch from Sam Bobroff to explicitly abort non-suspended
transactions on syscalls, plus a test to exercise it.

- Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.

- Small patch to enable the hard lockup detector from Anton Blanchard.

- Fix from Dave Olson for missing L2 cache information on some CPUs.

- Some fixes from Michael Ellerman to get Cell machines booting again.

- Freescale updates from Scott: Highlights include BMan device tree
nodes, an MSI erratum workaround, a couple minor performance
improvements, config updates, and misc fixes/cleanup.

* tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
powerpc/powermac: Fix build error seen with powermac smp builds
powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
powerpc/cell: Fix iommu breakage caused by controller_ops change
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
powerpc/pseries: Correct memory hotplug locking
powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
powerpc: Add ppc64 hard lockup detector support
oprofile: Disable oprofile NMI timer on ppc64
powerpc/perf/hv-24x7: Add missing put_cpu_var()
powerpc/perf/hv-24x7: Break up single_24x7_request
powerpc/perf/hv-24x7: Define update_event_count()
powerpc/perf/hv-24x7: Whitespace cleanup
powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
powerpc/perf/hv-24x7: Rename hv_24x7_event_update
powerpc/perf/hv-24x7: Move debug prints to separate function
powerpc/perf/hv-24x7: Drop event_24x7_request()
powerpc/perf/hv-24x7: Use pr_devel() to log message
...

Conflicts:
tools/testing/selftests/powerpc/Makefile
tools/testing/selftests/powerpc/tm/Makefile
/linux/tools/testing/selftests/powerpc/tm/
H A Dtm-syscall-asm.Sdiff d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 Thu Apr 16 20:53:32 CEST 2015 Linus Torvalds <torvalds@linux-foundation.org> Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

- Numerous minor fixes, cleanups etc.

- More EEH work from Gavin to remove its dependency on device_nodes.

- Memory hotplug implemented entirely in the kernel from Nathan
Fontenot.

- Removal of redundant CONFIG_PPC_OF by Kevin Hao.

- Rewrite of VPHN parsing logic & tests from Greg Kurz.

- A fix from Nish Aravamudan to reduce memory usage by clamping
nodes_possible_map.

- Support for pstore on powernv from Hari Bathini.

- Removal of old powerpc specific byte swap routines by David Gibson.

- Fix from Vasant Hegde to prevent the flash driver telling you it was
flashing your firmware when it wasn't.

- Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.

- Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
Stancek.

- Some fixes for migration from Tyrel Datwyler.

- A new syscall to switch the cpu endian by Michael Ellerman.

- Large series from Wei Yang to implement SRIOV, reviewed and acked by
Bjorn.

- A fix for the OPAL sensor driver from Cédric Le Goater.

- Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.

- Large series from Daniel Axtens to make our PCI hooks per PHB rather
than per machine.

- Small patch from Sam Bobroff to explicitly abort non-suspended
transactions on syscalls, plus a test to exercise it.

- Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.

- Small patch to enable the hard lockup detector from Anton Blanchard.

- Fix from Dave Olson for missing L2 cache information on some CPUs.

- Some fixes from Michael Ellerman to get Cell machines booting again.

- Freescale updates from Scott: Highlights include BMan device tree
nodes, an MSI erratum workaround, a couple minor performance
improvements, config updates, and misc fixes/cleanup.

* tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
powerpc/powermac: Fix build error seen with powermac smp builds
powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
powerpc/cell: Fix iommu breakage caused by controller_ops change
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
powerpc/pseries: Correct memory hotplug locking
powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
powerpc: Add ppc64 hard lockup detector support
oprofile: Disable oprofile NMI timer on ppc64
powerpc/perf/hv-24x7: Add missing put_cpu_var()
powerpc/perf/hv-24x7: Break up single_24x7_request
powerpc/perf/hv-24x7: Define update_event_count()
powerpc/perf/hv-24x7: Whitespace cleanup
powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
powerpc/perf/hv-24x7: Rename hv_24x7_event_update
powerpc/perf/hv-24x7: Move debug prints to separate function
powerpc/perf/hv-24x7: Drop event_24x7_request()
powerpc/perf/hv-24x7: Use pr_devel() to log message
...

Conflicts:
tools/testing/selftests/powerpc/Makefile
tools/testing/selftests/powerpc/tm/Makefile
/linux/arch/powerpc/boot/dts/fsl/
H A Dp1023si-post.dtsidiff d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 Thu Apr 16 20:53:32 CEST 2015 Linus Torvalds <torvalds@linux-foundation.org> Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

- Numerous minor fixes, cleanups etc.

- More EEH work from Gavin to remove its dependency on device_nodes.

- Memory hotplug implemented entirely in the kernel from Nathan
Fontenot.

- Removal of redundant CONFIG_PPC_OF by Kevin Hao.

- Rewrite of VPHN parsing logic & tests from Greg Kurz.

- A fix from Nish Aravamudan to reduce memory usage by clamping
nodes_possible_map.

- Support for pstore on powernv from Hari Bathini.

- Removal of old powerpc specific byte swap routines by David Gibson.

- Fix from Vasant Hegde to prevent the flash driver telling you it was
flashing your firmware when it wasn't.

- Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.

- Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
Stancek.

- Some fixes for migration from Tyrel Datwyler.

- A new syscall to switch the cpu endian by Michael Ellerman.

- Large series from Wei Yang to implement SRIOV, reviewed and acked by
Bjorn.

- A fix for the OPAL sensor driver from Cédric Le Goater.

- Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.

- Large series from Daniel Axtens to make our PCI hooks per PHB rather
than per machine.

- Small patch from Sam Bobroff to explicitly abort non-suspended
transactions on syscalls, plus a test to exercise it.

- Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.

- Small patch to enable the hard lockup detector from Anton Blanchard.

- Fix from Dave Olson for missing L2 cache information on some CPUs.

- Some fixes from Michael Ellerman to get Cell machines booting again.

- Freescale updates from Scott: Highlights include BMan device tree
nodes, an MSI erratum workaround, a couple minor performance
improvements, config updates, and misc fixes/cleanup.

* tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
powerpc/powermac: Fix build error seen with powermac smp builds
powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
powerpc/cell: Fix iommu breakage caused by controller_ops change
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
powerpc/pseries: Correct memory hotplug locking
powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
powerpc: Add ppc64 hard lockup detector support
oprofile: Disable oprofile NMI timer on ppc64
powerpc/perf/hv-24x7: Add missing put_cpu_var()
powerpc/perf/hv-24x7: Break up single_24x7_request
powerpc/perf/hv-24x7: Define update_event_count()
powerpc/perf/hv-24x7: Whitespace cleanup
powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
powerpc/perf/hv-24x7: Rename hv_24x7_event_update
powerpc/perf/hv-24x7: Move debug prints to separate function
powerpc/perf/hv-24x7: Drop event_24x7_request()
powerpc/perf/hv-24x7: Use pr_devel() to log message
...

Conflicts:
tools/testing/selftests/powerpc/Makefile
tools/testing/selftests/powerpc/tm/Makefile
H A Db4860si-post.dtsidiff d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 Thu Apr 16 20:53:32 CEST 2015 Linus Torvalds <torvalds@linux-foundation.org> Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

- Numerous minor fixes, cleanups etc.

- More EEH work from Gavin to remove its dependency on device_nodes.

- Memory hotplug implemented entirely in the kernel from Nathan
Fontenot.

- Removal of redundant CONFIG_PPC_OF by Kevin Hao.

- Rewrite of VPHN parsing logic & tests from Greg Kurz.

- A fix from Nish Aravamudan to reduce memory usage by clamping
nodes_possible_map.

- Support for pstore on powernv from Hari Bathini.

- Removal of old powerpc specific byte swap routines by David Gibson.

- Fix from Vasant Hegde to prevent the flash driver telling you it was
flashing your firmware when it wasn't.

- Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.

- Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
Stancek.

- Some fixes for migration from Tyrel Datwyler.

- A new syscall to switch the cpu endian by Michael Ellerman.

- Large series from Wei Yang to implement SRIOV, reviewed and acked by
Bjorn.

- A fix for the OPAL sensor driver from Cédric Le Goater.

- Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.

- Large series from Daniel Axtens to make our PCI hooks per PHB rather
than per machine.

- Small patch from Sam Bobroff to explicitly abort non-suspended
transactions on syscalls, plus a test to exercise it.

- Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.

- Small patch to enable the hard lockup detector from Anton Blanchard.

- Fix from Dave Olson for missing L2 cache information on some CPUs.

- Some fixes from Michael Ellerman to get Cell machines booting again.

- Freescale updates from Scott: Highlights include BMan device tree
nodes, an MSI erratum workaround, a couple minor performance
improvements, config updates, and misc fixes/cleanup.

* tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
powerpc/powermac: Fix build error seen with powermac smp builds
powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
powerpc/cell: Fix iommu breakage caused by controller_ops change
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
powerpc/pseries: Correct memory hotplug locking
powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
powerpc: Add ppc64 hard lockup detector support
oprofile: Disable oprofile NMI timer on ppc64
powerpc/perf/hv-24x7: Add missing put_cpu_var()
powerpc/perf/hv-24x7: Break up single_24x7_request
powerpc/perf/hv-24x7: Define update_event_count()
powerpc/perf/hv-24x7: Whitespace cleanup
powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
powerpc/perf/hv-24x7: Rename hv_24x7_event_update
powerpc/perf/hv-24x7: Move debug prints to separate function
powerpc/perf/hv-24x7: Drop event_24x7_request()
powerpc/perf/hv-24x7: Use pr_devel() to log message
...

Conflicts:
tools/testing/selftests/powerpc/Makefile
tools/testing/selftests/powerpc/tm/Makefile
/linux/tools/testing/selftests/powerpc/pmu/
H A Dlib.hdiff d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 Thu Apr 16 20:53:32 CEST 2015 Linus Torvalds <torvalds@linux-foundation.org> Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

- Numerous minor fixes, cleanups etc.

- More EEH work from Gavin to remove its dependency on device_nodes.

- Memory hotplug implemented entirely in the kernel from Nathan
Fontenot.

- Removal of redundant CONFIG_PPC_OF by Kevin Hao.

- Rewrite of VPHN parsing logic & tests from Greg Kurz.

- A fix from Nish Aravamudan to reduce memory usage by clamping
nodes_possible_map.

- Support for pstore on powernv from Hari Bathini.

- Removal of old powerpc specific byte swap routines by David Gibson.

- Fix from Vasant Hegde to prevent the flash driver telling you it was
flashing your firmware when it wasn't.

- Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.

- Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
Stancek.

- Some fixes for migration from Tyrel Datwyler.

- A new syscall to switch the cpu endian by Michael Ellerman.

- Large series from Wei Yang to implement SRIOV, reviewed and acked by
Bjorn.

- A fix for the OPAL sensor driver from Cédric Le Goater.

- Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.

- Large series from Daniel Axtens to make our PCI hooks per PHB rather
than per machine.

- Small patch from Sam Bobroff to explicitly abort non-suspended
transactions on syscalls, plus a test to exercise it.

- Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.

- Small patch to enable the hard lockup detector from Anton Blanchard.

- Fix from Dave Olson for missing L2 cache information on some CPUs.

- Some fixes from Michael Ellerman to get Cell machines booting again.

- Freescale updates from Scott: Highlights include BMan device tree
nodes, an MSI erratum workaround, a couple minor performance
improvements, config updates, and misc fixes/cleanup.

* tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
powerpc/powermac: Fix build error seen with powermac smp builds
powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
powerpc/cell: Fix iommu breakage caused by controller_ops change
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
powerpc/pseries: Correct memory hotplug locking
powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
powerpc: Add ppc64 hard lockup detector support
oprofile: Disable oprofile NMI timer on ppc64
powerpc/perf/hv-24x7: Add missing put_cpu_var()
powerpc/perf/hv-24x7: Break up single_24x7_request
powerpc/perf/hv-24x7: Define update_event_count()
powerpc/perf/hv-24x7: Whitespace cleanup
powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
powerpc/perf/hv-24x7: Rename hv_24x7_event_update
powerpc/perf/hv-24x7: Move debug prints to separate function
powerpc/perf/hv-24x7: Drop event_24x7_request()
powerpc/perf/hv-24x7: Use pr_devel() to log message
...

Conflicts:
tools/testing/selftests/powerpc/Makefile
tools/testing/selftests/powerpc/tm/Makefile
/linux/arch/powerpc/lib/
H A Dcrtsavres.Sdiff d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 Thu Apr 16 20:53:32 CEST 2015 Linus Torvalds <torvalds@linux-foundation.org> Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

- Numerous minor fixes, cleanups etc.

- More EEH work from Gavin to remove its dependency on device_nodes.

- Memory hotplug implemented entirely in the kernel from Nathan
Fontenot.

- Removal of redundant CONFIG_PPC_OF by Kevin Hao.

- Rewrite of VPHN parsing logic & tests from Greg Kurz.

- A fix from Nish Aravamudan to reduce memory usage by clamping
nodes_possible_map.

- Support for pstore on powernv from Hari Bathini.

- Removal of old powerpc specific byte swap routines by David Gibson.

- Fix from Vasant Hegde to prevent the flash driver telling you it was
flashing your firmware when it wasn't.

- Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.

- Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
Stancek.

- Some fixes for migration from Tyrel Datwyler.

- A new syscall to switch the cpu endian by Michael Ellerman.

- Large series from Wei Yang to implement SRIOV, reviewed and acked by
Bjorn.

- A fix for the OPAL sensor driver from Cédric Le Goater.

- Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.

- Large series from Daniel Axtens to make our PCI hooks per PHB rather
than per machine.

- Small patch from Sam Bobroff to explicitly abort non-suspended
transactions on syscalls, plus a test to exercise it.

- Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.

- Small patch to enable the hard lockup detector from Anton Blanchard.

- Fix from Dave Olson for missing L2 cache information on some CPUs.

- Some fixes from Michael Ellerman to get Cell machines booting again.

- Freescale updates from Scott: Highlights include BMan device tree
nodes, an MSI erratum workaround, a couple minor performance
improvements, config updates, and misc fixes/cleanup.

* tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
powerpc/powermac: Fix build error seen with powermac smp builds
powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
powerpc/cell: Fix iommu breakage caused by controller_ops change
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
powerpc/pseries: Correct memory hotplug locking
powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
powerpc: Add ppc64 hard lockup detector support
oprofile: Disable oprofile NMI timer on ppc64
powerpc/perf/hv-24x7: Add missing put_cpu_var()
powerpc/perf/hv-24x7: Break up single_24x7_request
powerpc/perf/hv-24x7: Define update_event_count()
powerpc/perf/hv-24x7: Whitespace cleanup
powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
powerpc/perf/hv-24x7: Rename hv_24x7_event_update
powerpc/perf/hv-24x7: Move debug prints to separate function
powerpc/perf/hv-24x7: Drop event_24x7_request()
powerpc/perf/hv-24x7: Use pr_devel() to log message
...

Conflicts:
tools/testing/selftests/powerpc/Makefile
tools/testing/selftests/powerpc/tm/Makefile
/linux/drivers/video/fbdev/aty/
H A Dradeon_monitor.cdiff d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 Thu Apr 16 20:53:32 CEST 2015 Linus Torvalds <torvalds@linux-foundation.org> Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

Pull powerpc updates from Michael Ellerman:

- Numerous minor fixes, cleanups etc.

- More EEH work from Gavin to remove its dependency on device_nodes.

- Memory hotplug implemented entirely in the kernel from Nathan
Fontenot.

- Removal of redundant CONFIG_PPC_OF by Kevin Hao.

- Rewrite of VPHN parsing logic & tests from Greg Kurz.

- A fix from Nish Aravamudan to reduce memory usage by clamping
nodes_possible_map.

- Support for pstore on powernv from Hari Bathini.

- Removal of old powerpc specific byte swap routines by David Gibson.

- Fix from Vasant Hegde to prevent the flash driver telling you it was
flashing your firmware when it wasn't.

- Patch from Ben Herrenschmidt to add an OPAL heartbeat driver.

- Fix for an oops causing get/put_cpu_var() imbalance in perf by Jan
Stancek.

- Some fixes for migration from Tyrel Datwyler.

- A new syscall to switch the cpu endian by Michael Ellerman.

- Large series from Wei Yang to implement SRIOV, reviewed and acked by
Bjorn.

- A fix for the OPAL sensor driver from Cédric Le Goater.

- Fixes to get STRICT_MM_TYPECHECKS building again by Michael Ellerman.

- Large series from Daniel Axtens to make our PCI hooks per PHB rather
than per machine.

- Small patch from Sam Bobroff to explicitly abort non-suspended
transactions on syscalls, plus a test to exercise it.

- Numerous reworks and fixes for the 24x7 PMU from Sukadev Bhattiprolu.

- Small patch to enable the hard lockup detector from Anton Blanchard.

- Fix from Dave Olson for missing L2 cache information on some CPUs.

- Some fixes from Michael Ellerman to get Cell machines booting again.

- Freescale updates from Scott: Highlights include BMan device tree
nodes, an MSI erratum workaround, a couple minor performance
improvements, config updates, and misc fixes/cleanup.

* tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (196 commits)
powerpc/powermac: Fix build error seen with powermac smp builds
powerpc/pseries: Fix compile of memory hotplug without CONFIG_MEMORY_HOTREMOVE
powerpc: Remove PPC32 code from pseries specific find_and_init_phbs()
powerpc/cell: Fix iommu breakage caused by controller_ops change
powerpc/eeh: Fix crash in eeh_add_device_early() on Cell
powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
powerpc/perf/hv-24x7: Fail 24x7 initcall if create_events_from_catalog() fails
powerpc/pseries: Correct memory hotplug locking
powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
powerpc: Add ppc64 hard lockup detector support
oprofile: Disable oprofile NMI timer on ppc64
powerpc/perf/hv-24x7: Add missing put_cpu_var()
powerpc/perf/hv-24x7: Break up single_24x7_request
powerpc/perf/hv-24x7: Define update_event_count()
powerpc/perf/hv-24x7: Whitespace cleanup
powerpc/perf/hv-24x7: Define add_event_to_24x7_request()
powerpc/perf/hv-24x7: Rename hv_24x7_event_update
powerpc/perf/hv-24x7: Move debug prints to separate function
powerpc/perf/hv-24x7: Drop event_24x7_request()
powerpc/perf/hv-24x7: Use pr_devel() to log message
...

Conflicts:
tools/testing/selftests/powerpc/Makefile
tools/testing/selftests/powerpc/tm/Makefile

12345678