David Howells <dhowells@xxxxxxxxxx> wrote: > > However, I was close to unpulling it again. It has a merge commit with > > this merge message: > > > > Merge remote-tracking branch 'net/master' into afs-next > > > > and that simply is not acceptable. > > Apologies - I meant to rebase that away. There was a bug fix to rxrpc in > net/master that didn't get pulled into your tree until Saturday. Actually, waiting for all outstanding fixes to get merged and then rebasing might not be the right thing here. The problem is that there are fixes in both trees: afs fixes go directly into yours whereas rxrpc fixes go via networking and I would prefer to base my patches on both of them for testing purposes. What's the preferred method for dealing with that? Base on a merge of the lastest of those fixes in each tree? David
