The stuff from merge_pi should now all be in master. Could you try with master + the dts only and see whether this works? The fixes probably have also made the way in there. I had in mind that the issue with the tagged packets was solved, something simple in the port VLAN configuration...
Ah, and use 5.10 kernel on the master.