Messages in this thread | | | Date | Mon, 29 Oct 2012 14:21:26 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm-current tree with the staging tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in drivers/staging/rts_pstor/trace.h between commit cd2112220b6b ("Staging: remove rts_pstor driver") from the staging tree and commit 3980a6d4af3e ("staging: rts_pstor: use kbasename()") from the akpm-current tree.
The former removed the file modified by the latter, so I dropped the latter patch.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |