How to make a change in both net and net-next

[David Howells]

Hi Dave,

In the fix I just posted, subject:

        [PATCH net] rxrpc: Fix race between recvmsg and sendmsg on immediate
                call failure

there's a change I need to make as part of the patch:

        -       spin_lock_bh(&conn->params.peer->lock);
        -       hlist_del_rcu(&call->error_link);
        -       spin_unlock_bh(&conn->params.peer->lock);
        +       if (!hlist_unhashed(&call->error_link)) {
        +               spin_lock_bh(&call->peer->lock);
        +               hlist_del_rcu(&call->error_link);
        +               spin_unlock_bh(&call->peer->lock);
        +       }

but I also make the same change as part of a set of patches I want to post for
net-next.

Should I just rebase the net-next patches on top of the one I sent you once
you've picked it into net, or is there a better way?

Thanks,
David