Messages in this thread | | | Date | Mon, 3 Dec 2012 12:04:29 +1100 | 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 3ea160b3e8f0 ("target: Fix handling of aborted commands") from Linus' tree and commit 019c4ca62148 ("target: kill dev->dev_task_attr_type") from the target-updates tree.
I just use the target-updates tree version 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] | |