Merge branch 'for-6.16/tsm-mr' into tsm-next

Pick up a couple fixes for issues noticed in linux-next (constification
of bin_attrs and missing 'static').