From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753572AbbGXD7Z (ORCPT ); Thu, 23 Jul 2015 23:59:25 -0400 Received: from ozlabs.org ([103.22.144.67]:52618 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751910AbbGXD7X (ORCPT ); Thu, 23 Jul 2015 23:59:23 -0400 Date: Fri, 24 Jul 2015 13:59:21 +1000 From: Stephen Rothwell To: "Michael S. Tsirkin" Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Igor Mammedov Subject: linux-next: manual merge of the vhost tree with Linus' tree Message-ID: <20150724135921.0a2c3bef@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.28; i586-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Michael, Today's linux-next merge of the vhost tree got a conflict in: drivers/vhost/vhost.c between commit: 4de7255f7d2b ("vhost: extend memory regions allocation to vmalloc") from Linus' tree and commit: a4883f62470c ("vhost: extend memory regions allocation to vmalloc") from the vhost tree. These are two slightly different versions of the same patch. I used the version from Linus' tree. Please clean your tree up. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au