lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 3 Jun 2022 09:07:26 +0800 From: Shiyang Ruan <ruansy.fnst@...itsu.com> To: Andrew Morton <akpm@...ux-foundation.org> CC: <linux-kernel@...r.kernel.org>, <linux-xfs@...r.kernel.org>, <nvdimm@...ts.linux.dev>, <linux-mm@...ck.org>, <linux-fsdevel@...r.kernel.org>, <djwong@...nel.org>, <dan.j.williams@...el.com>, <david@...morbit.com>, <hch@...radead.org>, <jane.chu@...cle.com>, <rgoldwyn@...e.de>, <viro@...iv.linux.org.uk>, <willy@...radead.org>, <naoya.horiguchi@....com>, <linmiaohe@...wei.com> Subject: Re: [PATCHSETS] v14 fsdax-rmap + v11 fsdax-reflink 在 2022/6/3 2:56, Andrew Morton 写道: > On Sun, 8 May 2022 22:36:06 +0800 Shiyang Ruan <ruansy.fnst@...itsu.com> wrote: > >> This is a combination of two patchsets: >> 1.fsdax-rmap: https://lore.kernel.org/linux-xfs/20220419045045.1664996-1-ruansy.fnst@fujitsu.com/ >> 2.fsdax-reflink: https://lore.kernel.org/linux-xfs/20210928062311.4012070-1-ruansy.fnst@fujitsu.com/ > > I'm getting lost in conflicts trying to get this merged up. Mainly > memory-failure.c due to patch series "mm, hwpoison: enable 1GB hugepage > support". > > Could you please take a look at what's in the mm-unstable branch at > git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm a few hours from > now? Or the next linux-next. > > And I suggest that converting it all into a single 14-patch series > would be more straightforward. The patchset in this thread is the 14-patch series. I have solved many conflicts. It's an updated / newest version, and a combination of the 2 urls quoted above. In an other word, instead of using this two: >> This is a combination of two patchsets: >> 1.fsdax-rmap: https://... >> 2.fsdax-reflink: https://... you could take this (the url of the current thread): https://lore.kernel.org/linux-xfs/20220508143620.1775214-1-ruansy.fnst@fujitsu.com/ My description misleaded you. Sorry for that. -- Thanks, Ruan. > > Thanks.
Powered by blists - more mailing lists