From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: Re: [PATCH v3 1/5] hypervisor/arm/keyhandler: Declare struct cpu_user_regs; Date: Fri, 12 Feb 2016 09:06:04 -0500 Message-ID: <20160212140604.GA6596@localhost.localdomain> References: <1455246507-5589-1-git-send-email-konrad.wilk@oracle.com> <1455246507-5589-2-git-send-email-konrad.wilk@oracle.com> <56BDAB2002000078000D1494@prv-mh.provo.novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aUEMU-000857-P1 for xen-devel@lists.xenproject.org; Fri, 12 Feb 2016 14:06:18 +0000 Content-Disposition: inline In-Reply-To: <56BDAB2002000078000D1494@prv-mh.provo.novell.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Jan Beulich Cc: ian.jackson@eu.citrix.com, wei.liu2@citrix.com, stefano.stabellini@citrix.com, ian.campbell@citrix.com, xen-devel@lists.xenproject.org List-Id: xen-devel@lists.xenproject.org On Fri, Feb 12, 2016 at 01:51:28AM -0700, Jan Beulich wrote: > >>> On 12.02.16 at 04:08, wrote: > > in the keyhandler.h file. Otherwise on ARM builds if we > > just use the keyhandler file - the compile will fail. > > > > CC: ian.campbell@citrix.com > > CC: wei.liu2@citrix.com > > CC: stefano.stabellini@citrix.com > > Signed-off-by: Konrad Rzeszutek Wilk > > See commit d1d181328d. Weird. When I did git rebase origin/staging it didn't notice that commit. And it just applied it on top - so I had two 'struct cpu_regs;' in the header file.