From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752951AbeAQMxd (ORCPT + 1 other); Wed, 17 Jan 2018 07:53:33 -0500 Received: from Galois.linutronix.de ([146.0.238.70]:45905 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752276AbeAQMxc (ORCPT ); Wed, 17 Jan 2018 07:53:32 -0500 Date: Wed, 17 Jan 2018 13:53:26 +0100 (CET) From: Thomas Gleixner To: Stephen Rothwell cc: Paolo Bonzini , =?ISO-8859-2?Q?Radim_Kr=E8m=E1=F8?= , KVM , Linux-Next Mailing List , Linux Kernel Mailing List , David Woodhouse , Ingo Molnar , Brijesh Singh Subject: Re: linux-next: manual merge of the kvm tree with Linus' tree In-Reply-To: <20180117234326.24a2c0c3@canb.auug.org.au> Message-ID: References: <20180117144817.1cba736f@canb.auug.org.au> <20180117234326.24a2c0c3@canb.auug.org.au> User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: On Wed, 17 Jan 2018, Stephen Rothwell wrote: > On Wed, 17 Jan 2018 13:23:17 +0100 (CET) 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. > > I just picked that bit 20 when resolving the conflict. The original patch used > bit 11, so the resolution could use any other sensible bit. 20 is fine :)