Hello, I'm sorry that I had to do this again, but I had to rebase linux-fcoe.git. There was a patch to Documentation/ that merged during the merge window. The patch was not in the 'features' branch as that branch was based on v3.6. I committed further patches to 'features' but when I went to merge it into 'master' I could not. I had to rebase 'features' beyond the merge window; I chose 3.7-rc8 as it should be pretty stable. I then was able to merge 'features' into 'master' and everything is up to v3.7-rc8+fcoe patches.
Sorry for the inconvenience, I am really trying not to rebase. Thanks, //Rob _______________________________________________ devel mailing list devel@open-fcoe.org https://lists.open-fcoe.org/mailman/listinfo/devel
