From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: Re: linux-next: manual merge of the ftrace tree with Linus' tree Date: Thu, 16 May 2019 13:32:30 +1000 Message-ID: <20190516133230.0c894ebf@canb.auug.org.au> References: <20190516110548.0d22d048@canb.auug.org.au> <20190515215305.78e8ef4c@oasis.local.home> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/WGhoO1LbIMcdcEdyFWibU2."; protocol="application/pgp-signature" Return-path: In-Reply-To: <20190515215305.78e8ef4c@oasis.local.home> Sender: linux-kernel-owner@vger.kernel.org To: Steven Rostedt Cc: Linux Next Mailing List , Linux Kernel Mailing List , Josh Poimboeuf , "Peter Zijlstra (Intel)" , Linus Torvalds List-Id: linux-next.vger.kernel.org --Sig_/WGhoO1LbIMcdcEdyFWibU2. Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Steve, On Wed, 15 May 2019 21:53:05 -0400 Steven Rostedt wro= te: > > I mentioned this conflict and the entry_64.S one to Linus when > submitting my pull request. I fixed it up too in my ftrace/conflicts > branch. And he has merged your branch now, so all good. --=20 Cheers, Stephen Rothwell --Sig_/WGhoO1LbIMcdcEdyFWibU2. Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlzc2c4ACgkQAVBC80lX 0Gw8IwgAiRDBQhYFblBSXJd1CdE7An9kwugAGX+Ni1zoYKIkx0rMzleh0jTPJzRO Clwbu+b/yu72fG445AcwUh/re+3coQl9jXuzt8mv9H8WaTSfDA+1lJwQQIESi6Tc f23tmpby0/lNQot2e803/chuvbH9v+MkZziMVVJjjvIxARYYJeiVIEPuGyhHlFbM u//B1OZINLtROYAad3f4OvDmrJ1CwHPXojvCR55uBpQj6Fry18V7tpdOILo4Uw1D h8sC9RL+k8/9pOwiEtclshEBxRRVP3Puv0TE4EvzUa+qVPT7hYm9lqKY5AAiGsAg hRNNvHdK7ytEHMzheHKprjUaPegTnA== =UAnV -----END PGP SIGNATURE----- --Sig_/WGhoO1LbIMcdcEdyFWibU2.--