From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: please clean up the clockevents tree Date: Thu, 20 Dec 2018 16:15:04 +1100 Message-ID: <20181220161504.5720655d@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/4VGc=Tb_93BTw6nAOYJHflC"; protocol="application/pgp-signature" Return-path: Sender: linux-kernel-owner@vger.kernel.org To: Daniel Lezcano Cc: Linux Next Mailing List , Linux Kernel Mailing List List-Id: linux-next.vger.kernel.org --Sig_/4VGc=Tb_93BTw6nAOYJHflC Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Daniel, It looks like all the changes in the clockevents tree appear as other commits in other tree(s). Could you please reset your tree to somewhere in your upstream tree as it is beginning to produce conflicts. --=20 Cheers, Stephen Rothwell --Sig_/4VGc=Tb_93BTw6nAOYJHflC Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlwbJVgACgkQAVBC80lX 0GysJwf+J8nNuww7oF2nE1vVqf8nTxsXJdGwljrzV5y3w+yGVDgatX9zGqVEp6ma BFzhT6k86jqGCJPoHsUcvD/ay/WY7kK41BEjLC7T3TjJ5tGrKZWo2nDNspz1AJdp SzH//UVkTpxYbzMF2j4HvQ+cGbHi4vd2/CByeC6LCZK8vvRH8dp2ZfqPOcsq2XES ps5igdaKgK34qwCKyX91ibzebUSvp3nsxnP4VCFrQr2gbbrjyQOl6p+MyqIFtGjx 3r0GuEI2goNj+hAWwut+n44aKpc2Iyc1vUtMIIRWXbjK/bDYMD0zwsPNdSUiqVoS MQ5WXiHrGPGJiU8Z5AiqnLy3yR+tww== =6/8l -----END PGP SIGNATURE----- --Sig_/4VGc=Tb_93BTw6nAOYJHflC--