Messages in this thread | | | Date | Wed, 13 Mar 2013 14:03:28 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the trivial tree with the virtio tree |
| |
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in Documentation/virtual/virtio-spec.txt between commit 29266e2e29f1 ("Remove Documentation/virtual/virtio-spec.txt") from the virtio tree and commit d097ddaf529f ("doc: virtual: Fix typos in virtio-spec.txt") from the trivial tree.
The former removed the file, so I did 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] | |