On 04/23/2014 08:51 PM, Anna Schumaker wrote: > On 04/23/2014 01:44 PM, Weston Andros Adamson wrote: >> Great news - the merge was pretty easy! >> >> I ended up merging by hand - doing “git am --3way” on each patch so I could ensure >> that they each build cleanly. When there were conflicts, I was able to compare the >> old patch to the newly rebased patch to make sure I didn’t miss anything. >> >> This exercise also helped me find a few problems with my patchset ;) >> >> Now it’s time to test! I’ll share my branch on a public repo and repost my patchset >> soon. > > Great! I'm glad it went smoothly! > > >> >> -dros Cool so I'll wait with the testing for your combined branch Thanks Boaz -- 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
