David Miller <davem@xxxxxxxxxxxxx> writes: > There were merge issues so I applied the patches and sorted the > conflicts out one-by-one. > > I hope this doesn't cause major problems. Shucks, I had thought I had tested and verified there would not be merge issues. Oh well. No major problems. To keep it that way I am dropping all but the first two patches from my userns development tree. I have dependencies on the infrastructure bits. A quick merge test reveals that your tree against my full development tree has two minor conflicts that are trivial to resolve. So I don't anticipate Linus will have any problems. Eric _______________________________________________ Containers mailing list Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linuxfoundation.org/mailman/listinfo/containers
