RE: sdrplay2: Which changes to merge?