From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751246AbcAHF7M (ORCPT ); Fri, 8 Jan 2016 00:59:12 -0500 Received: from ozlabs.org ([103.22.144.67]:43987 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750851AbcAHF7K (ORCPT ); Fri, 8 Jan 2016 00:59:10 -0500 Date: Fri, 8 Jan 2016 16:59:08 +1100 From: Stephen Rothwell To: Andrew Morton , "Michael S. Tsirkin" Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Minchan Kim Subject: linux-next: manual merge of the akpm-current tree with the vhost tree Message-ID: <20160108165908.2da89bfd@canb.auug.org.au> X-Mailer: Claws Mail 3.13.1 (GTK+ 2.24.29; x86_64-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 Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: mm/balloon_compaction.c between commit: 0b5ffdb4f7c6 ("balloon: fix page list locking") from the vhost tree and commit: 0c983ec0c078 ("virtio_balloon: fix race between migration and ballooning") from the akpm-current tree. I fixed it up (I think that the former is a superset of the latter, so I used that, completely reversing the latter patch) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au