Messages in this thread | ![/](/images/icornerl.gif) | | Date | Wed, 29 May 2013 12:33:17 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the trivial tree with the net-next tree |
| |
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in Documentation/networking/netlink_mmap.txt between commit 3dd17edea018 ("doc:networking: Fix typo in documentation/networking") from the net-next tree and commit f884ab15afdc ("doc: fix misspellings with 'codespell' tool") from the trivial tree.
The fix in the net-next tree was a superset of the one in the trivial tree, so I used that 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] | ![\](/images/icornerr.gif) |