Messages in this thread | | | Date | Tue, 12 May 2015 11:49:40 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net-next tree with the net tree |
| |
Hi all,
Today's linux-next merge of the net-next tree got a conflict in net/core/sock.c between commit 2e70aedd3d52 ("Revert "net: kernel socket should be released in init_net namespace"") from the net tree and commit affb9792f1d9 ("net: kill sk_change_net and sk_release_kernel") from the net-next tree.
I fixed it up (the latter removed a function updated by the former) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |