Messages in this thread | | | Date | Mon, 17 Sep 2012 13:28:55 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the target-updates tree with Linus' tree |
| |
Hi Nicholas,
Today's linux-next merge of the target-updates tree got a conflict in drivers/target/target_core_transport.c between commit 6138ed2ab879 ("target: move transport_get_sense_data") from Linus' tree and commit 867c8e7dae31 ("target: Simplify fabric sense data length handling") from the target-updates tree.
I just removed the latter version of transport_get_sense_data() (which has been renamed to transport_get_sense_buffer() and changed in Linus' tree) and can carry the fix as necessary - someone should really look at the result when it is available.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |