From: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>
To: Joerg Roedel <joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
Cc: Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>,
catalin.marinas-5wv7dgnIgG8@public.gmane.org,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
Andrew Morton
<akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>,
Mel Gorman
<mgorman-3eNAlZScCAx27rWaFMvyedHuzzzSOjJt@public.gmane.org>,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
Subject: Re: [PATCH 1/2] arm64: Workaround renaming of __GFP_WAIT
Date: Wed, 28 Oct 2015 11:01:05 +0000 [thread overview]
Message-ID: <5630AAF1.1050500@arm.com> (raw)
In-Reply-To: <20151028005333.GH27420-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
Hi Joerg,
On 28/10/15 00:53, Joerg Roedel wrote:
> 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?
Andrew has the equivalent of patch 2 as a fixup on top of Mel's series,
which Stephen is currently carrying as a merge resolution in -next. I'm
assuming this will go into the final merge as well, so as long as Linus
takes the IOMMU tree first we should be OK as-is.
Robin.
>
>
> Joerg
>
WARNING: multiple messages have this Message-ID (diff)
From: robin.murphy@arm.com (Robin Murphy)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/2] arm64: Workaround renaming of __GFP_WAIT
Date: Wed, 28 Oct 2015 11:01:05 +0000 [thread overview]
Message-ID: <5630AAF1.1050500@arm.com> (raw)
In-Reply-To: <20151028005333.GH27420@8bytes.org>
Hi Joerg,
On 28/10/15 00:53, Joerg Roedel wrote:
> 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?
Andrew has the equivalent of patch 2 as a fixup on top of Mel's series,
which Stephen is currently carrying as a merge resolution in -next. I'm
assuming this will go into the final merge as well, so as long as Linus
takes the IOMMU tree first we should be OK as-is.
Robin.
>
>
> Joerg
>
next prev parent reply other threads:[~2015-10-28 11:01 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-16 15:33 [PATCH 1/2] arm64: Workaround renaming of __GFP_WAIT Robin Murphy
2015-10-16 15:33 ` Robin Murphy
[not found] ` <ecbbf6550654071f13d1bdc04b86dc4d69ad09b4.1445008695.git.robin.murphy-5wv7dgnIgG8@public.gmane.org>
2015-10-16 15:33 ` [PATCH 2/2] arm64: Use gfpflags_allow_blocking() Robin Murphy
2015-10-16 15:33 ` Robin Murphy
[not found] ` <adf855c7692b1512ab7216579468ad1eef2f25a8.1445008695.git.robin.murphy-5wv7dgnIgG8@public.gmane.org>
2015-10-16 16:20 ` Catalin Marinas
2015-10-16 16:20 ` Catalin Marinas
2015-10-16 20:59 ` Andrew Morton
2015-10-16 20:59 ` Andrew Morton
[not found] ` <20151016135900.bc1e10115a866a301dbb0cd8-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
2015-10-19 12:43 ` Robin Murphy
2015-10-19 12:43 ` Robin Murphy
2015-10-19 13:26 ` Mel Gorman
2015-10-19 13:26 ` Mel Gorman
2015-10-16 16:20 ` [PATCH 1/2] arm64: Workaround renaming of __GFP_WAIT Catalin Marinas
2015-10-16 16:20 ` Catalin Marinas
2015-10-28 0:53 ` Joerg Roedel
2015-10-28 0:53 ` Joerg Roedel
[not found] ` <20151028005333.GH27420-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
2015-10-28 11:01 ` Robin Murphy [this message]
2015-10-28 11:01 ` Robin Murphy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5630AAF1.1050500@arm.com \
--to=robin.murphy-5wv7dgnigg8@public.gmane.org \
--cc=akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org \
--cc=catalin.marinas-5wv7dgnIgG8@public.gmane.org \
--cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
--cc=joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=mgorman-3eNAlZScCAx27rWaFMvyedHuzzzSOjJt@public.gmane.org \
--cc=sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.