Looks like generic-y is mostly going away anyway, so I'm going to skip this to avoid conflicts with the kbuild tree.