Re: linux-next: interesting merge in the zonefs tree

[Damien Le Moal]

On 2020/07/22 22:58, Stephen Rothwell wrote:
> Hi all,
> 
> It looks an old version of the block tree has been merged into the
> zonefs tree.  Is that deliberate?  Other trees should not be merged unless
> they are guaranteed not to be rebased (which is what has happened here).
> 

I must have done something wrong. Patches for zonefs for 5.9 depend on patches
in Jens tree. So I merged Jens for-next tree into zonefs for-5.9 branch as a
base for the new patches. zonefs for-next branch should contain the same, but I
may have screwed up somewhere... Let me check.


-- 
Damien Le Moal
Western Digital Research