Hello, Arnd.
On Tue, Sep 27, 2016 at 09:59:32PM +0200, Arnd Bergmann wrote:
> The merge solution seems correct, but this is one of only two trivial
> patches I have queued up for asm-generic this time, so I wonder if we could
> put the _notrace patch into the percpu tree that already has the
> raw
On Tuesday 27 September 2016, Stephen Rothwell wrote:
> diff --cc include/asm-generic/percpu.h
> index 70fefec69e61,40e887068da2..
> --- a/include/asm-generic/percpu.h
> +++ b/include/asm-generic/percpu.h
> @@@ -108,9 -118,9 +118,9 @@@ do {
>
Hi all,
Today's linux-next merge of the percpu tree got a conflict in:
include/asm-generic/percpu.h
between commit:
acbdf0e98066 ("percpu: make this_cpu_generic_read notrace")
from the asm-generic tree and commit:
1b5ca1212742 ("percpu: improve generic percpu modify-return implementatio
3 matches
Mail list logo
