How to fix a Canon 16-35mm lens with a stuck focus ring

I was shooting at an air show last week, and all of a sudden, I could not manually focus.  Switching to Auto Focus worked, but I usually shoot manual focus for video.
The focus ring was stuck if I tried to move it manually, no matter how gentle.  What was confusing was the Auto Focus worked just fine but you still couldn't move the focus ring.