From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: Re: linux-next: manual merge of the edac-amd tree with Linus' tree Date: Fri, 26 Jun 2015 18:22:56 +1000 Message-ID: <20150626182256.03241d32@canb.auug.org.au> References: <20150626170839.7a0945c5@canb.auug.org.au> <20150626072723.GB14572@pd.tnic> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/W2Cy3MNM1bM6vQrt.sBYl7D"; protocol="application/pgp-signature" Return-path: Received: from ozlabs.org ([103.22.144.67]:57426 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751379AbbFZIXG (ORCPT ); Fri, 26 Jun 2015 04:23:06 -0400 In-Reply-To: <20150626072723.GB14572@pd.tnic> Sender: linux-next-owner@vger.kernel.org List-ID: To: Borislav Petkov Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org --Sig_/W2Cy3MNM1bM6vQrt.sBYl7D Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Borislav, On Fri, 26 Jun 2015 09:27:23 +0200 Borislav Petkov wrote: >=20 > yes, that's the right thing to do. If there's anything I should do to > let you know when to start merging it again, please let me know. I just fetch it every morning, so if you just want to set your for-next branch to somewhere in Linus' tree (so it is effectively empty), then that would be easiest for me. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Sig_/W2Cy3MNM1bM6vQrt.sBYl7D Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVjQvmAAoJEMDTa8Ir7ZwV0WgP/1HHXAlbjIDXtPFp6v6kppCe 4rB8dVkIO2LPoawz46GVUQBpTg5hrLMHDvW2Kz6l0BOTmejnxjqZqtj39hbUhiS+ 4T7zhzyFZ56QnHqTUSHF/6Nj74dQsppkejXL+AZhpRvi9Med2wVpjKsYwfW03iNB /GBjDhlbjIpx6XbDZSajdPRL0zUQlsWTumC7Q0JhmU2eEEsxQ5YeIyGkgggiCcl/ mMHANAkjUwbtw01bSod52qsuaPv11wr2aCADNeTS6wHEzNfmVCA1l/niTJfr130Y rxLRsvlrGUprjfqLTeCC9HpZv5+ClNccDIkhyrrLUTAokIMYd028reZv8NpL0ugp cGqUleSO2hn+4S06/+wMR640Rp9NwOOLftFdoSv+tyKNcs0veqhRQK2xX4dh0+8v YqjNmi83MA/NYHBoWTipElHqnR6N2xZB4H0jdl3FU35Rp/ey76Gnc2reDEA355+k tUzEkQEu6nF8mFYhpi6Grp4NTCUCnzrPYGlBX2jpkE3QtHb+akma7jaeVVmMtjlJ Anl+bnLsRGNrMowdlo1Gj0fqYrykTm8YLuHupqeJA7BXcyf1IuQVzFRa2/dOGtmH rcFOnqrk6gVe/EdOAUo+p2iUi336rFqwEiBOSoOrY6Ydz0ngQnhBuYnvsa+ii8f+ xNXvPJ1XB7PrgkJGsuFJ =Bg3l -----END PGP SIGNATURE----- --Sig_/W2Cy3MNM1bM6vQrt.sBYl7D--