From: Jason Gunthorpe <jgg@mellanox.com>
To: Christoph Hellwig <hch@infradead.org>
Cc: Mark Rutland <mark.rutland@arm.com>,
Michal Hocko <mhocko@suse.com>,
"anshuman.khandual@arm.com" <anshuman.khandual@arm.com>,
"catalin.marinas@arm.com" <catalin.marinas@arm.com>,
"will.deacon@arm.com" <will.deacon@arm.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-mm@kvack.org" <linux-mm@kvack.org>,
"akpm@linux-foundation.org" <akpm@linux-foundation.org>,
Robin Murphy <robin.murphy@arm.com>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH v3 0/4] Devmap cleanups + arm64 support
Date: Wed, 26 Jun 2019 15:45:47 +0000 [thread overview]
Message-ID: <20190626154532.GA3088@mellanox.com> (raw)
In-Reply-To: <20190626153829.GA22138@infradead.org>
On Wed, Jun 26, 2019 at 08:38:29AM -0700, Christoph Hellwig wrote:
> On Wed, Jun 26, 2019 at 01:31:40PM +0100, Mark Rutland wrote:
> > On Wed, Jun 26, 2019 at 12:35:33AM -0700, Christoph Hellwig wrote:
> > > Robin, Andrew:
> >
> > As a heads-up, Robin is currently on holiday, so this is all down to
> > Andrew's preference.
> >
> > > I have a series for the hmm tree, which touches the section size
> > > bits, and remove device public memory support.
> > >
> > > It might be best if we include this series in the hmm tree as well
> > > to avoid conflicts. Is it ok to include the rebase version of at least
> > > the cleanup part (which looks like it is not required for the actual
> > > arm64 support) in the hmm tree to avoid conflicts?
> >
> > Per the cover letter, the arm64 patch has a build dependency on the
> > others, so that might require a stable brnach for the common prefix.
>
> I guess we'll just have to live with the merge errors then, as the
> mm tree is a patch series and thus can't easily use a stable base
> tree. That is unlike Andrew wants to pull in the hmm tree as a prep
> patch for the series.
It looks like the first three patches apply cleanly to hmm.git ..
So what we can do is base this 4 patch series off rc6 and pull the
first 3 into hmm and the full 4 into arm.git. We use this workflow often
with rdma and netdev.
Let me know and I can help orchestate this.
Jason
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Jason Gunthorpe <jgg@mellanox.com>
To: Christoph Hellwig <hch@infradead.org>
Cc: Mark Rutland <mark.rutland@arm.com>,
Robin Murphy <robin.murphy@arm.com>,
"linux-mm@kvack.org" <linux-mm@kvack.org>,
"akpm@linux-foundation.org" <akpm@linux-foundation.org>,
"will.deacon@arm.com" <will.deacon@arm.com>,
"catalin.marinas@arm.com" <catalin.marinas@arm.com>,
"anshuman.khandual@arm.com" <anshuman.khandual@arm.com>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Michal Hocko <mhocko@suse.com>
Subject: Re: [PATCH v3 0/4] Devmap cleanups + arm64 support
Date: Wed, 26 Jun 2019 15:45:47 +0000 [thread overview]
Message-ID: <20190626154532.GA3088@mellanox.com> (raw)
In-Reply-To: <20190626153829.GA22138@infradead.org>
On Wed, Jun 26, 2019 at 08:38:29AM -0700, Christoph Hellwig wrote:
> On Wed, Jun 26, 2019 at 01:31:40PM +0100, Mark Rutland wrote:
> > On Wed, Jun 26, 2019 at 12:35:33AM -0700, Christoph Hellwig wrote:
> > > Robin, Andrew:
> >
> > As a heads-up, Robin is currently on holiday, so this is all down to
> > Andrew's preference.
> >
> > > I have a series for the hmm tree, which touches the section size
> > > bits, and remove device public memory support.
> > >
> > > It might be best if we include this series in the hmm tree as well
> > > to avoid conflicts. Is it ok to include the rebase version of at least
> > > the cleanup part (which looks like it is not required for the actual
> > > arm64 support) in the hmm tree to avoid conflicts?
> >
> > Per the cover letter, the arm64 patch has a build dependency on the
> > others, so that might require a stable brnach for the common prefix.
>
> I guess we'll just have to live with the merge errors then, as the
> mm tree is a patch series and thus can't easily use a stable base
> tree. That is unlike Andrew wants to pull in the hmm tree as a prep
> patch for the series.
It looks like the first three patches apply cleanly to hmm.git ..
So what we can do is base this 4 patch series off rc6 and pull the
first 3 into hmm and the full 4 into arm.git. We use this workflow often
with rdma and netdev.
Let me know and I can help orchestate this.
Jason
next prev parent reply other threads:[~2019-06-26 15:45 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-23 15:03 [PATCH v3 0/4] Devmap cleanups + arm64 support Robin Murphy
2019-05-23 15:03 ` Robin Murphy
2019-05-23 15:03 ` [PATCH v3 1/4] mm/memremap: Rename and consolidate SECTION_SIZE Robin Murphy
2019-05-23 15:03 ` Robin Murphy
2019-05-23 15:03 ` [PATCH v3 2/4] mm: clean up is_device_*_page() definitions Robin Murphy
2019-05-23 15:03 ` Robin Murphy
2019-05-23 15:03 ` [PATCH v3 3/4] mm: introduce ARCH_HAS_PTE_DEVMAP Robin Murphy
2019-05-23 15:03 ` Robin Murphy
2019-05-23 15:03 ` Robin Murphy
2019-05-23 15:03 ` [PATCH v3 4/4] arm64: mm: Implement pte_devmap support Robin Murphy
2019-05-23 15:03 ` Robin Murphy
2019-05-24 18:08 ` Will Deacon
2019-05-24 18:08 ` Will Deacon
2019-05-24 18:38 ` Robin Murphy
2019-05-24 18:38 ` Robin Murphy
2019-05-27 6:23 ` Anshuman Khandual
2019-05-27 6:23 ` Anshuman Khandual
2019-05-28 13:46 ` [PATCH v3.1 " Robin Murphy
2019-05-28 13:46 ` Robin Murphy
2019-05-29 10:03 ` Will Deacon
2019-05-29 10:03 ` Will Deacon
2019-06-26 7:35 ` [PATCH v3 0/4] Devmap cleanups + arm64 support Christoph Hellwig
2019-06-26 7:35 ` Christoph Hellwig
2019-06-26 12:31 ` Mark Rutland
2019-06-26 12:31 ` Mark Rutland
2019-06-26 15:38 ` Christoph Hellwig
2019-06-26 15:38 ` Christoph Hellwig
2019-06-26 15:45 ` Jason Gunthorpe [this message]
2019-06-26 15:45 ` Jason Gunthorpe
2019-06-27 3:35 ` Andrew Morton
2019-06-27 3:35 ` Andrew Morton
2019-07-04 18:53 ` Andrew Morton
2019-07-04 18:53 ` Andrew Morton
2019-07-04 19:59 ` Jason Gunthorpe
2019-07-04 19:59 ` Jason Gunthorpe
2019-07-04 20:53 ` Andrew Morton
2019-07-04 20:53 ` Andrew Morton
2019-07-04 21:28 ` Jason Gunthorpe
2019-07-04 21:28 ` Jason Gunthorpe
2019-07-05 15:47 ` Jason Gunthorpe
2019-07-05 15:47 ` Jason Gunthorpe
2019-07-04 20:54 ` Robin Murphy
2019-07-04 20:54 ` Robin Murphy
2019-07-04 21:13 ` Andrew Morton
2019-07-04 21:13 ` Andrew Morton
2019-07-05 11:16 ` Robin Murphy
2019-07-05 11:16 ` Robin Murphy
2019-07-04 23:37 ` Dan Williams
2019-07-04 23:37 ` Dan Williams
2019-07-05 12:32 ` Jason Gunthorpe
2019-07-05 12:32 ` Jason Gunthorpe
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=20190626154532.GA3088@mellanox.com \
--to=jgg@mellanox.com \
--cc=akpm@linux-foundation.org \
--cc=anshuman.khandual@arm.com \
--cc=catalin.marinas@arm.com \
--cc=hch@infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mark.rutland@arm.com \
--cc=mhocko@suse.com \
--cc=robin.murphy@arm.com \
--cc=will.deacon@arm.com \
/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.