From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: Re: linux-next: manual merge of the pidfd tree with Linus' tree Date: Wed, 22 May 2019 17:48:33 +1000 Message-ID: <20190522174725.6bfd51bd@canb.auug.org.au> References: <20190522110115.7350be3e@canb.auug.org.au> <20190522055235.GC13702@kroah.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/lvAN8G0u2K3BD/3rFho2.e2"; protocol="application/pgp-signature" Return-path: In-Reply-To: <20190522055235.GC13702@kroah.com> Sender: linux-kernel-owner@vger.kernel.org To: Greg Kroah-Hartman Cc: Christian Brauner , Linux Next Mailing List , Linux Kernel Mailing List , Thomas Gleixner , "Joel Fernandes (Google)" List-Id: linux-next.vger.kernel.org --Sig_/lvAN8G0u2K3BD/3rFho2.e2 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Greg, On Wed, 22 May 2019 07:52:35 +0200 Greg Kroah-Hartman wrote: > > Sorry, you are going to get a number of these types of minor conflicts > now. That's the problem of touching thousands of files :( Yeah, I expected that one I saw the commits. At least is is just after -rc1, hopefully most maintainers will start their -next branches after today :-) --=20 Cheers, Stephen Rothwell --Sig_/lvAN8G0u2K3BD/3rFho2.e2 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlzk/tEACgkQAVBC80lX 0Gytgwf/bM3rn1I53Z1gozufwkAcj4PNOkJZ+4AxQXyFSR5FeznDmcWBByYIjOmW 7KgoP5dudN5bYcOfhgugtORTjJu54x3P3iSgdDYzoZRvK0Sk8irR/SlfoBd8Brsc iiqBXBicqQQGrus+zTLdtHvr7bXbX0weTxCUV4Xj91jUSa6oD9f+JskwuvGCV1zt fxmo+N8BTmPFZ79PjTKkZR+nAZacDm34fEKBlIIJvrpjpG5BYKlFNwf6c5Q89vb7 lq3DAnLISW/gZ6QfEWMMdczQ24qvrLxZm6LApOLZ1KxMy+SNzTT/i9ejIqvITJxD dm7z1TtvrBzveZnAGVWiXDpbDTJk/w== =MWyJ -----END PGP SIGNATURE----- --Sig_/lvAN8G0u2K3BD/3rFho2.e2--