From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F3C9C18E5B for ; Tue, 10 Mar 2020 08:02:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6C17624673 for ; Tue, 10 Mar 2020 08:02:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="tu+rIegZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726395AbgCJICS (ORCPT ); Tue, 10 Mar 2020 04:02:18 -0400 Received: from ozlabs.org ([203.11.71.1]:32947 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725919AbgCJICS (ORCPT ); Tue, 10 Mar 2020 04:02:18 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 48c6xy0mz6z9sPF; Tue, 10 Mar 2020 19:02:12 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1583827335; bh=aMJHHEyENsZl87/r2ZJRugO9+TZPdfQT3JlSpCuYIao=; h=Date:From:To:Cc:Subject:From; b=tu+rIegZQ83tGYwnL75Ey+AsxqAhQda2PAhxflEREV/vmvRUDFm+/KbE/0pqohKLE WtoXYt1kAbFGHlw583fd9AjB72I32FW8jnjKklDCmg2kGnu0bFJTJEHgiF3wod33Ea liuG1iUZzdsfpNF9PKeNq/XHUPgzwxZOpp41VoNCcJJaHLx6PtspCnJ2fq/ZI8SmbM BGvpwWEycK4XScRVYK1xiKcUuTnXeSuIe3/EPw+sJiEnGdjDAgTGzwBTydj76ejDMS ootfLtdV9s5dDf9aZLGrG4h6jqZ8FmUSYGVenY+G0bv+sY9ZI9+2YdG+H8CTznqM9+ /62AUuj83YaNQ== Date: Tue, 10 Mar 2020 19:02:05 +1100 From: Stephen Rothwell To: Andrew Morton , "Michael S. Tsirkin" Cc: Linux Next Mailing List , Linux Kernel Mailing List , David Hildenbrand , Alexander Duyck Subject: linux-next: manual merge of the akpm-current tree with the vhost tree Message-ID: <20200310190205.7c152ef9@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/=r6dahv_exMUQNhFiy4ztKK"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/=r6dahv_exMUQNhFiy4ztKK Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: drivers/virtio/virtio_balloon.c between commit: b5769cdc14fc ("virtio-balloon: Switch back to OOM handler for VIRTIO_BALL= OON_F_DEFLATE_ON_OOM") from the vhost tree and commits: b64c4d5bea98 ("virtio-balloon: pull page poisoning config out of free pag= e hinting") 80c03575431c ("virtio-balloon: add support for providing free page report= s to host") from the akpm-current tree. I looked at the conflict for a while but could not easily see how to reconcile it, so I decided to revert the vhost tree commit for today. Some advice would be appreciated. --=20 Cheers, Stephen Rothwell --Sig_/=r6dahv_exMUQNhFiy4ztKK Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl5nSX0ACgkQAVBC80lX 0GzZKggAnGNccWdEzs0YfK/+WMBdNyEPGVl4YCnYaOsyvyMNzLr6BG9Q+q3gylXk DVHqkyioJrrZwuBVWMTGQzCfCKsPC/bHvG29IodU5Hjej8mcL2zCw8PhFq1HXKmb 1cYeTHjMycONT5BQFeocwsC86T6+wZzOKGtwv5wo6XE6xnSPJQMd5uEyeKKouclX 0yIhjthqyH0e0GTC9g2TDALzwbubh9bsJonydHyv8V3scrOZUGtklF/yp1VP3d4c /wwiySsJxQJzabQomAEUu2WvGYp9AKiXBSG1cjhO+Tgp3d8WUJ12Ln846fWdfPN7 PhesQKsNLwMdDmW3eaR3yWbwj7t99A== =tVY+ -----END PGP SIGNATURE----- --Sig_/=r6dahv_exMUQNhFiy4ztKK--