From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joerg Roedel Subject: Re: [PATCH 1/2] arm64: Workaround renaming of __GFP_WAIT Date: Wed, 28 Oct 2015 01:53:34 +0100 Message-ID: <20151028005333.GH27420@8bytes.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Robin Murphy Cc: catalin.marinas-5wv7dgnIgG8@public.gmane.org, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, Mel Gorman , Andrew Morton , linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org List-Id: iommu@lists.linux-foundation.org Hi Robin, On Fri, Oct 16, 2015 at 04:33:41PM +0100, Robin Murphy wrote: > The imminent renaming of __GFP_WAIT in the mm tree conflicts with its > use in the new IOMMU DMA ops; introduce a temporary local version of > its replacement to smooth over the transition. > > This patch should be reverted at 4.4-rc1. I lost track here, are these two patches required in the iommu tree for the next merge window? Joerg From mboxrd@z Thu Jan 1 00:00:00 1970 From: joro@8bytes.org (Joerg Roedel) Date: Wed, 28 Oct 2015 01:53:34 +0100 Subject: [PATCH 1/2] arm64: Workaround renaming of __GFP_WAIT In-Reply-To: References: Message-ID: <20151028005333.GH27420@8bytes.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Robin, On Fri, Oct 16, 2015 at 04:33:41PM +0100, Robin Murphy wrote: > The imminent renaming of __GFP_WAIT in the mm tree conflicts with its > use in the new IOMMU DMA ops; introduce a temporary local version of > its replacement to smooth over the transition. > > This patch should be reverted at 4.4-rc1. I lost track here, are these two patches required in the iommu tree for the next merge window? Joerg