Benny Halevy wrote: There are conflicts merging this patch as bldev_read_ap_state is already defined (in "Add complex block layout discovery and mapping daemon") I'm not sure how, but we seem out of sync, maybe I didn't get an earlier patch of yours. My patches are all in your pnfs-nfs-utils-1-2-3-2010-10-08 but are missing after that. I will re-send. % git shortlog --author=rees@umich pnfs-nfs-utils-1-2-3-2010-10-08 Jim Rees (5): Add complex block layout discovery and mapping daemon blkmapd: get rid of config file and instead examine all block devices blkmapd: don't rescan periodically blkmapd: don't use atomicio() where it's not needed blkmapd: don't try to distinguish between active/passive devices % git shortlog --author=rees@umich origin/master Jim Rees (1): Add complex block layout discovery and mapping daemon -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html