linux-kernel - Re: [GIT PULL] f2fs update for 4.16-rc1

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20180404004509.4ec40d0d@canb.auug.org.au>
Date:   Wed, 4 Apr 2018 00:45:09 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Tejun Heo <tj@...nel.org>
Cc:     Chris Mason <clm@...com>, Josef Bacik <jbacik@...com>,
        Jaegeuk Kim <jaegeuk@...nel.org>,
        Linus Torvalds <torvalds@...ux-foundation.org>,
        Linux F2FS Dev Mailing List 
        <linux-f2fs-devel@...ts.sourceforge.net>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Yufen Yu <yuyufen@...wei.com>, David Sterba <dsterba@...e.cz>
Subject: Re: [GIT PULL] f2fs update for 4.16-rc1

Hi Tejun,

On Tue, 3 Apr 2018 07:20:29 -0700 Tejun Heo <tj@...nel.org> wrote:
>
> Hello, Stephen.
> 
> On Tue, Apr 03, 2018 at 12:29:19PM +1000, Stephen Rothwell wrote:
> > > I am still applying this to the merge of the btrfs tree every day ...
> > > 
> > > Commit
> > >   578c647879f7 ("f2fs: implement cgroup writeback support")
> > > was merged into Linus' tree on Jan 31.
> > > 
> > > Here is the actual merge fix patch:  
> 
> Yeah, the merge fix looks correct to me.  Depending on the merge
> order, it can go either after the btrfs merge or the f2fs merge, I
> guess.  Stephen, beyond appyling the merge fix afterwards, is there
> somethine else you are concerned about?

The f2fs part of the conflict was merged into Linus' tree on Jan 31,
and I have been applying the conflict resolution patch for a whole
release cycle i.e. the btrfs tree part of the conflict did not get
merged during the last merge window, and has not been updated since
then - in fact the btrfs tree
(git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next)
has not been updated or merged into Linus' tree since last December.

:-(
-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped