falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33069 ) Change subject: trx TCH DL: transmit invalid speech frames instead of dummy FACCH ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: Why is Gerrit showing "Merge Conflict" on my latest patchset 2? The commit I pushed to refs/for/master for PS2 applies directly on top of current master branch tip, how can it be a merge conflict? Would it be possible to get a Gerrit admin to look at this issue? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I78106802a0aa4af39859c75d29fe0e77037899fe Gerrit-Change-Number: 33069 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 29 May 2023 19:08:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment