From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753560AbbIJIFP (ORCPT ); Thu, 10 Sep 2015 04:05:15 -0400 Received: from e06smtp12.uk.ibm.com ([195.75.94.108]:38008 "EHLO e06smtp12.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753427AbbIJIFH (ORCPT ); Thu, 10 Sep 2015 04:05:07 -0400 X-Helo: d06dlp01.portsmouth.uk.ibm.com X-MailFrom: borntraeger@de.ibm.com X-RcptTo: linux-next@vger.kernel.org Subject: Re: linux-next: Tree for Sep 10 To: Stephen Rothwell References: <20150910140204.48bf6565@canb.auug.org.au> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, KVM list From: Christian Borntraeger Message-ID: <55F139AD.5060503@de.ibm.com> Date: Thu, 10 Sep 2015 10:05:01 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <20150910140204.48bf6565@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15091008-0009-0000-0000-00000589DFF5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Am 10.09.2015 um 06:02 schrieb Stephen Rothwell: > Hi all, > > Please do not add material for v4.4 until after v4.3-rc1 is out. > [...] > The kvm tree still had its build failure for which I reverted a commit. [..] > Merging kvm/linux-next (2cbd78244fb2 KVM: trace kvm_halt_poll_ns grow/shrink) > CONFLICT (content): Merge conflict in arch/powerpc/kvm/book3s_hv.c > $ git am -3 ../patches/0001-Revert-KVM-trace-kvm_halt_poll_ns-grow-shrink.patch > Applying: Revert "KVM: trace kvm_halt_poll_ns grow/shrink" Can you add kvm@vger.kernel.org for build failures of the kernel tree? Thanks a lot Christian