linux-next: interesting merge in the zonefs tree

[Stephen Rothwell]

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).

-- 
Cheers,
Stephen Rothwell

Attachment: pgpVt4JotbyBd.pgp
Description: OpenPGP digital signature