Message ID | 20200403150550.35045a3a@canb.auug.org.au (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=Dui2=5T=lists.freedesktop.org=dri-devel-bounces@kernel.org> Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AF2AB912 for <patchwork-dri-devel@patchwork.kernel.org>; Fri, 3 Apr 2020 04:06:00 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 86A462078B for <patchwork-dri-devel@patchwork.kernel.org>; Fri, 3 Apr 2020 04:06:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="f4IESQP/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 86A462078B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 989EA6E1B2; Fri, 3 Apr 2020 04:05:56 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 419A66E1B2 for <dri-devel@lists.freedesktop.org>; Fri, 3 Apr 2020 04:05:55 +0000 (UTC) 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 48tmZ84pFxz9sRf; Fri, 3 Apr 2020 15:05:52 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1585886753; bh=+GNIM54E2dog7HMWp41rbgg9rU0MbTHzcNGHx83iCtI=; h=Date:From:To:Cc:Subject:From; b=f4IESQP/wcH/BJBZ1reRJjr8Bp9yj9tX4zrqG0HGeP3Gy9PthjEfOIryb9CanE0/v Fx3gNluJdpNS7cQsOE4E2QX8NGQ82Pk3DcsQa/Z4i9JCH94JAR3H7NpwDNSFPoe1QA NJOkKfHk/IMte281AERurvFWJNbAoSrjTLq7DanaDAXqK7vfc0pX0MTwRaUI1NUM4R LqEOzppfHRyttuHQqRkOm2+7sdiKLF21Mx5UYF7ZFqdu94hcH0g9Yf2k/bd2XA2WPV EHGR321apHqRafsJDe7umk11P1oOx0WHQCR06UcfLfFxGBWZpUgZsej0AZwaHXBqsh ccomdsQwc+jqg== Date: Fri, 3 Apr 2020 15:05:50 +1100 From: Stephen Rothwell <sfr@canb.auug.org.au> To: Andrew Morton <akpm@linux-foundation.org>, Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org> Subject: linux-next: manual merge of the akpm-current tree with the drm tree Message-ID: <20200403150550.35045a3a@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development <dri-devel.lists.freedesktop.org> List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/dri-devel>, <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe> List-Archive: <https://lists.freedesktop.org/archives/dri-devel> List-Post: <mailto:dri-devel@lists.freedesktop.org> List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help> List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/dri-devel>, <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe> Cc: Andrea Arcangeli <aarcange@redhat.com>, "Thomas Hellstrom \(VMware\)" <thomas_os@shipmail.org>, Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org> Content-Type: multipart/mixed; boundary="===============0597334758==" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org> |
Series |
linux-next: manual merge of the akpm-current tree with the drm tree
|
expand
|
diff --cc mm/memory.c index efa59b1b109c,9e75440c79ce..000000000000 --- a/mm/memory.c