David Miller <da...@davemloft.net> wrote: > > Is there going to be a merge of net into net-next before the merge > > window opens? Or do you have a sample merge that I can rebase my > > afs-next branch on? > > I'll be doing a net to net-next merge some time today.
Excellent, thanks! David