#
aafc8a83 |
| 29-Aug-2017 |
Nicholas Piggin <npiggin@gmail.com> |
powerpc/64s: Move IDLE_STATE_ENTER_SEQ[_NORET] into idle_book3s.S
This macro is only used in idle_book3s.S, move it in there and add a more descriptive comment.
Signed-off-by: Nicholas Piggin <npig
powerpc/64s: Move IDLE_STATE_ENTER_SEQ[_NORET] into idle_book3s.S
This macro is only used in idle_book3s.S, move it in there and add a more descriptive comment.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com> [mpe: Split out of larger patch and write change log] Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
show more ...
|
#
82b7fcc0 |
| 29-Aug-2017 |
Michael Ellerman <mpe@ellerman.id.au> |
Merge branch 'topic/ppc-kvm' into next
Merge Nicks commit to rework the KVM thread management, shared with the KVM tree via the ppc-kvm topic branch.
|
#
94a04bc2 |
| 24-Aug-2017 |
Nicholas Piggin <npiggin@gmail.com> |
KVM: PPC: Book3S HV: POWER9 does not require secondary thread management
POWER9 CPUs have independent MMU contexts per thread, so KVM does not need to quiesce secondary threads, so the hwthread_req/
KVM: PPC: Book3S HV: POWER9 does not require secondary thread management
POWER9 CPUs have independent MMU contexts per thread, so KVM does not need to quiesce secondary threads, so the hwthread_req/hwthread_state protocol does not have to be used. So patch it away on POWER9, and patch away the branch from the Linux idle wakeup to kvm_start_guest that is never used.
Add a warning and error out of kvmppc_grab_hwthread in case it is ever called on POWER9.
This avoids a hwsync in the idle wakeup path on POWER9.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Acked-by: Paul Mackerras <paulus@ozlabs.org> [mpe: Use WARN(...) instead of WARN_ON()/pr_err(...)] Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
show more ...
|
#
cd996fb4 |
| 28-Aug-2017 |
Jens Axboe <axboe@kernel.dk> |
Merge tag 'v4.13-rc7' into for-4.14/block-postmerge
Linux 4.13-rc7
Signed-off-by: Jens Axboe <axboe@kernel.dk>
|
#
5ffa70b2 |
| 28-Aug-2017 |
Boris Brezillon <boris.brezillon@free-electrons.com> |
Merge tag 'v4.13-rc7' into mtd/next
Merge v4.13-rc7 back to resolve merge conflicts in drivers/mtd/nand/nandsim.c and include/asm-generic/vmlinux.lds.h.
|
#
8ce04367 |
| 27-Aug-2017 |
Wolfram Sang <wsa@the-dreams.de> |
Merge branch 'i2c-mux/for-next' of https://github.com/peda-r/i2c-mux into i2c/for-4.14
|
#
413d63d7 |
| 26-Aug-2017 |
Ingo Molnar <mingo@kernel.org> |
Merge branch 'linus' into x86/mm to pick up fixes and to fix conflicts
Conflicts: arch/x86/kernel/head64.c arch/x86/mm/mmap.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
#
b7e2672d |
| 25-Aug-2017 |
Mark Brown <broonie@kernel.org> |
Merge tag 'sound-4.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into asoc-rt5677
sound fixes for 4.13-rc7
We're keeping in a good shape, this batch contains just a few small
Merge tag 'sound-4.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into asoc-rt5677
sound fixes for 4.13-rc7
We're keeping in a good shape, this batch contains just a few small fixes (a regression fix for ASoC rt5677 codec, NULL dereference and error-path fixes in firewire, and a corner-case ioctl error fix for user TLV), as well as usual quirks for USB-audio and HD-audio.
show more ...
|
#
15c659ff |
| 23-Aug-2017 |
Michael Ellerman <mpe@ellerman.id.au> |
Merge branch 'fixes' into next
There's a non-trivial dependency between some commits we want to put in next and the KVM prefetch work around that went into fixes. So merge fixes into next.
|
#
4db26f83 |
| 22-Aug-2017 |
Kevin Hilman <khilman@baylibre.com> |
Merge tag 'v4.13-rc4' into v4.14/dt64
Linux 4.13-rc4
|
#
bf9790bc |
| 21-Aug-2017 |
Mark Brown <broonie@kernel.org> |
Merge branch 'topic/const' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-blackfin
|
#
f13db334 |
| 21-Aug-2017 |
Mark Brown <broonie@kernel.org> |
Merge branch 'topic/msm8916' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-const
|
#
6329b1bb |
| 21-Aug-2017 |
Mark Brown <broonie@kernel.org> |
Merge tag 'v4.13-rc6' into asoc-msm8916
Linux 4.13-rc6
|
#
0e8841ec |
| 18-Aug-2017 |
Sean Paul <seanpaul@chromium.org> |
Merge airlied/drm-next into drm-misc-next
Archit requested this backmerge to facilitate merging some patches depending on changes between -rc2 & -rc5
Signed-off-by: Sean Paul <seanpaul@chromium.org>
|
#
2257e268 |
| 17-Aug-2017 |
Ingo Molnar <mingo@kernel.org> |
Merge branch 'linus' into x86/boot, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
#
0c697faf |
| 15-Aug-2017 |
Dave Airlie <airlied@redhat.com> |
Backmerge tag 'v4.13-rc5' into drm-next
Linux 4.13-rc5
There's a really nasty nouveau collision, hopefully someone can take a look once I pushed this out.
|
#
feea4680 |
| 14-Aug-2017 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge 4.13-rc5 into usb-next
This gets the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
#
cf0a1579 |
| 14-Aug-2017 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge 4.13-rc5 into tty-next
We want the fixes in here, and we resolve the merge issue in the 8250_core.c file.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
#
8652892e |
| 14-Aug-2017 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge 4.13-rc5 into staging-next
We need it here for iio fixes.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
#
f75f6ff2 |
| 14-Aug-2017 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge 4.13-rc5 into driver-core-next
We want the fixes in here as well for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
#
d9855246 |
| 14-Aug-2017 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge 4.13-rc5 into char-misc-next
We want the firmware, and other changes, in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
#
1724c7c0 |
| 14-Aug-2017 |
Sean Paul <seanpaul@chromium.org> |
Merge origin/master into drm-misc-fixes
Backmerge 4.13-rc5 into drm-misc-fixes, it was getting a little stale.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
|
#
2f7043a3 |
| 10-Aug-2017 |
David S. Miller <davem@davemloft.net> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
|
#
c002c278 |
| 10-Aug-2017 |
Tony Lindgren <tony@atomide.com> |
Merge tag 'v4.13-rc1' into omap-for-v4.14/mmc-regulator
Linux v4.13-rc1
|
#
636bf358 |
| 10-Aug-2017 |
Ingo Molnar <mingo@kernel.org> |
Merge branch 'linus' into x86/platform, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|