I'm not sure I fully understand what is going on in patch 6 & 7 but we have tested this locally and seems to work properly. These changes make edge cases DFS link targets work, fixes reconnection/failover where there are mixups between netbios/fqdn host from mount call or link targets, and other things (null ptr deref?). So AFAIC you can merge with Reviewed-by: Aurelien Aptel <aaptel@xxxxxxxx> Cheers, -- Aurélien Aptel / SUSE Labs Samba Team GPG: 1839 CB5F 9F5B FB9B AA97 8C99 03C8 A49B 521B D5D3 SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg, DE GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 247165 (AG München)