From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Gleixner Subject: Re: linux-next: manual merge of the kvm tree with Linus' tree Date: Wed, 17 Jan 2018 13:37:10 +0100 (CET) Message-ID: References: <20180117144817.1cba736f@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Return-path: In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: Paolo Bonzini Cc: Stephen Rothwell , =?ISO-8859-2?Q?Radim_Kr=E8m=E1=F8?= , KVM , Linux-Next Mailing List , Linux Kernel Mailing List , David Woodhouse , Ingo Molnar , Brijesh Singh List-Id: linux-next.vger.kernel.org On Wed, 17 Jan 2018, Paolo Bonzini wrote: > On 17/01/2018 13:23, Thomas Gleixner wrote: > > No. Keep it and lets next time coordinate the relevant bits and pieces > > better. I reserve that bit 20 and let Linus sort out the trivial conflict > > when merging the stuff. > > Thank you. In the future we'll make sure to contact you before merging > this kind of change. I didnt pay much attention as I was burried in the melted spectrum ....