Messages in this thread | | | Date | Thu, 2 Oct 2014 14:16:41 +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 drivers/net/usb/r8152.c between commit 204c87041289 ("r8152: remove clearing bp") from the net tree and commit 8ddfa07778af ("r8152: use usleep_range") from the net-next tree.
I fixed it up (the former removed some of the code updated by the latter) 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] | |