Messages in this thread | | | Date | Tue, 7 Apr 2015 09:54:29 -0700 | Subject | Re: linux-next: manual merge of the net-next tree with the net tree | From | Cong Wang <> |
| |
On Mon, Apr 6, 2015 at 8:21 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in > net/core/fib_rules.c between commit 419df12fb5fa ("net: move > fib_rules_unregister() under rtnl lock") from the net tree and commit > efd7ef1c1929 ("net: Kill hold_net release_net") from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). >
Looks correct to me.
Thanks!
| |