<p>Ok, I solved the conflicts by splitting commit <code>drivers/pca9685: PWM extension API code removed</code> into separate fixups of the respective commits and squashed these fixups afterwards.</p>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/RIOT-OS/RIOT/pull/10556?email_source=notifications&email_token=ABE7WYGWIESH4ATXSLHYPULQIO7IXA5CNFSM4GIYIQY2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD6E2XQI#issuecomment-529116097">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/ABE7WYDBQLAVSWLAO7J5VXDQIO7IXANCNFSM4GIYIQYQ">mute the thread</a>.<img src="https://github.com/notifications/beacon/ABE7WYFSOQNLGPFFEZJCXYTQIO7IXA5CNFSM4GIYIQY2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD6E2XQI.gif" height="1" width="1" alt="" /></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/RIOT-OS/RIOT/pull/10556?email_source=notifications\u0026email_token=ABE7WYGWIESH4ATXSLHYPULQIO7IXA5CNFSM4GIYIQY2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD6E2XQI#issuecomment-529116097",
"url": "https://github.com/RIOT-OS/RIOT/pull/10556?email_source=notifications\u0026email_token=ABE7WYGWIESH4ATXSLHYPULQIO7IXA5CNFSM4GIYIQY2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD6E2XQI#issuecomment-529116097",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>