On 2/28/20 3:32 AM, Pingfan Liu wrote: > The last V4 series: > https://lore.kernel.org/patchwork/project/lkml/list/?series=397950, and be > dropped from mm tree due to conflict with "RFC: switch the remaining > architectures to use generic GUP" [1] > > I rebase it and sent out V5. > V4 -> V5: move around the patched code due to code change. > > [1]: https://lore.kernel.org/linux-mm/20190601074959.14036-1-hch@xxxxxx/ > Hi, This whole series conflicts pretty significantly with the upcoming "track FOLL_PIN pages" patch series that is in mmtom. Can you please try to resolve this a bit more? In other words: The easiest way is to rebase against mmotm and target Linux 5.7, but I'm assuming that since you've based this on today's linux.git (5.6-rc*), you want this to go into 5.6,right? If that's the case, then let's find the minimal fix for 5.6, and put the remaining stuff (name changes, etc) into mmotm where it will have to fit in with the other upcoming changes, please. thanks, -- John Hubbard NVIDIA > Cc: Ira Weiny <ira.weiny@xxxxxxxxx> > Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > Cc: Mike Rapoport <rppt@xxxxxxxxxxxxx> > Cc: Dan Williams <dan.j.williams@xxxxxxxxx> > Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx> > Cc: John Hubbard <jhubbard@xxxxxxxxxx> > Cc: "Aneesh Kumar K.V" <aneesh.kumar@xxxxxxxxxxxxx> > Cc: Keith Busch <keith.busch@xxxxxxxxx> > Cc: Christoph Hellwig <hch@xxxxxxxxxxxxx> > Cc: Shuah Khan <shuah@xxxxxxxxxx> > To: linux-mm@xxxxxxxxx > Cc: linux-kernel@xxxxxxxxxxxxxxx > > --- > Pingfan Liu (3): > mm/gup: rename nr as nr_pinned in get_user_pages_fast() > mm/gup: fix omission of check on FOLL_LONGTERM in gup fast path > mm/gup_benchemark: add LONGTERM_BENCHMARK test in gup fast path > > mm/gup.c | 46 +++++++++++++++++++----------- > mm/gup_benchmark.c | 7 +++++ > tools/testing/selftests/vm/gup_benchmark.c | 6 +++- > 3 files changed, 41 insertions(+), 18 deletions(-) >
