diff options
author | Linus Torvalds | 2019-06-02 10:21:04 -0700 |
---|---|---|
committer | Linus Torvalds | 2019-06-02 10:21:04 -0700 |
commit | 460b48a0fefce25beb0fc0139e721c5691d65d7f (patch) | |
tree | 44a1ed9be044a41454712bbe349a261526cf45d6 /.gitattributes | |
parent | b44a1dd3f648a433c525efcdd6ba95ad89d50e27 (diff) | |
parent | 8b909e3548706cbebc0a676067b81aadda57f47e (diff) |
Merge tag 'powerpc-5.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman:
"A minor fix to our IMC PMU code to print a less confusing error
message when the driver can't initialise properly.
A fix for a bug where a user requesting an unsupported branch sampling
filter can corrupt PMU state, preventing the PMU from counting
properly.
And finally a fix for a bug in our support for kexec_file_load(),
which prevented loading a kernel and initramfs. Most versions of kexec
don't yet use kexec_file_load().
Thanks to: Anju T Sudhakar, Dave Young, Madhavan Srinivasan, Ravi
Bangoria, Thiago Jung Bauermann"
* tag 'powerpc-5.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/kexec: Fix loading of kernel + initramfs with kexec_file_load()
powerpc/perf: Fix MMCRA corruption by bhrb_filter
powerpc/powernv: Return for invalid IMC domain
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions