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 s...@canb.auug.org.au
pgpoD4vPyEh6f.pgp
Description: PGP signature