On Wed, Jun 19, 2024 at 8:23 PM Andrew Morton wrote: > On Wed, 19 Jun 2024 16:44:15 +1200 Barry Song <21cnbao@gmail.com> wrote: > > > On Wed, Jun 19, 2024 at 3:48 PM Steve French wrote: > > > > > > tentatively merged into cifs-2.6.git for-next pending testing and any > additional review > > > > Steve, Thanks! I guess you missed an email from mm-commits. > > > > A couple of hours ago, this was pulled into mm-hotfixes-unstable, likely > > for the same purpose. Will this cause any conflicts when both changes hit > > linux-next? > > > > > https://lore.kernel.org/mm-commits/20240618195943.EC07BC3277B@smtp.kernel.org/ > > > > Will we just keep one? > > Either is OK, but I suggest a 6.10-rcX merge while retaining the cc:stable. > I have at least two cifs.ko patches to submit in a few days upstream, so am fine with submitting the patch if it tests out ok tomorrow. git.samba.org - sfrench/cifs-2.6.git/commit -- Thanks, Steve