The automated merge for the spidev locking fixes is going wrong and merging the unlock twice.
Attach a file by drag & drop or click to upload