Hi Andrew, Today's linux-next merge of the akpm-current tree got conflicts in: drivers/block/nbd.c drivers/scsi/iscsi_tcp.c net/core/dev.c net/core/sock.c between commit: 717a94b5fc70 ("sched/core: Remove 'task' parameter and rename tsk_restore_flags() to current_restore_flags()") from the tip tree and commit: 61d5ad5b2e8a ("treewide: convert PF_MEMALLOC manipulations to new helpers") from the akpm-current tree. I fixed it up (the latter is just a superset of the former, so I used that) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. It looks like there may be more instances that the latter patch should update. -- Cheers, Stephen Rothwell -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html