linux-next: manual merge of the access_once tree with the arm64 tree

[Stephen Rothwell]

Hi Christian,

Today's linux-next merge of the access_once tree got a conflict in:

  arch/arm64/include/asm/barrier.h

between commit:

  4b3dc9679cf7 ("arm64: force CONFIG_SMP=y and remove redundant #ifdefs")

from the arm64 tree and commit:

  76695af20c01 ("locking, arch: use WRITE_ONCE()/READ_ONCE() in smp_store_release()/smp_load_acquire()")

from the access_once tree.

I fixed it up (the former removed the code modified by the latter, so I
just did that) and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/