linux-next: manual merge of the paulmck tree with the tip tree

--d9xvjzs+3k37XvK2
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  include/linux/hrtimer.h

between commits:

  d3dc7fabd4c4a ("hrtimer: Move hrtimer_callback_running() to hrtimer_bases=
=2Eh")
  a116c7582d7f7 ("hrtimer: Move hrtimer_update_function() to hrtimer.c")

=66rom the tip tree and commit:

  07abbb755f8e3 ("hrtimer: Apply READ_ONCE() to lockless base->running load=
s")

=66rom the paulmck tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

This only resolves the conflict, the READ_ONCE() got dropped.

diff --cc include/linux/hrtimer.h
index 29072d89e5cb3,b8636e81ca005..0000000000000
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h

--d9xvjzs+3k37XvK2
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmpssisACgkQJNaLcl1U
h9DGewf/XUXmJlybFE28vfRyCXTdizHdbpdV1n7tZwH1u48NU78MK0viTdlQzYV5
TUjDBeQxb2RI56wSe4aqj2HMCnjBgKdN/A5Ro51KcE6AtgCtSNylKYiWg6tP8wIx
yg3Tr+EpSyQIKccOWuJzgSI8lEeKWBonBS3fbIadSWLd6HX1Z1mh6ILgt0dWjVTE
oMN5/LU9GND0VzJu5cFpJuFTanWtdnwZHH6x7ge7WUO4UdFtmBq1sIJy/TzBDD2z
2AVzVN7Hf8S1qJ+b9vwIT3yCKsOvQMJMHZMZgIqFyDYTxeGugcR2dTSZluwacBmR
tx7IC70OXZykss43TuMQ3jhw+8xhiA==
=hW8P
-----END PGP SIGNATURE-----

--d9xvjzs+3k37XvK2--