From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Tosatti Subject: Re: [PATCH 5/9] KVM: MMU: fask check write-protect for direct mmu Date: Fri, 20 Jul 2012 08:45:01 -0300 Message-ID: <20120720114501.GB23285@amt.cnet> References: <50056DB8.7080702@linux.vnet.ibm.com> <50056E59.4090003@linux.vnet.ibm.com> <20120720003917.GA8951@amt.cnet> <5008D477.2020007@linux.vnet.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Avi Kivity , LKML , KVM To: Xiao Guangrong Return-path: Content-Disposition: inline In-Reply-To: <5008D477.2020007@linux.vnet.ibm.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: kvm.vger.kernel.org On Fri, Jul 20, 2012 at 11:45:59AM +0800, Xiao Guangrong wrote: > BTW, they are some bug fix patches on -master branch, but > it is not existed on -next branch: > commit: f411930442e01f9cf1bf4df41ff7e89476575c4d > commit: 85b7059169e128c57a3a8a3e588fb89cb2031da1 > > It causes code conflict if we do the development on -next. See auto-next branch. http://www.linux-kvm.org/page/Kvm-Git-Workflow