Messages in this thread | | | Date | Mon, 28 Apr 2014 12:53:54 +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/ethernet/altera/altera_sgdma.c between commit 37c0ffaad214 ("Altera TSE: Work around unaligned DMA receive packet issue with Altera SGDMA") from the net tree and commit d42f157b3498 ("Altera TSE: Remove unnecessary cast of void pointers") from the net-next tree.
I fixed it up (the former removes the code updated by the latter, 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] | |