From https://gitlab.com/samba-team/samba/-/merge_requests/2363 which was merged into master. I think this is a worthwhile fix to get into 4.15.rcNext at least. Cherry-picked patch from master will follow.
Created attachment 17161 [details] git-am fix for 4.16rcNext. Cherry-picked cleanly from master.
Pushed to autobuild-v4-16-test.
This bug was referenced in samba v4-16-test: a260463481a90812c483195273d7001269570080 692fb63a1ace5d4f2f03445458514fcff1e927a8 3500cb497649b5e5b47b372db2b107310d9dfb1e b48431f4783f30ee9e6f08095545feb688a036d4 4f9bada50afdb5e7276f0aa980b41f5636d8764e d088caa4002cfa26db0298218e4934f4b3803bf7 c0e02d8e8794e54556adb7ff260c7080dda19e2a 9794341b29e68726f6c4c8989b0a1e0db913d815 e8d165da42a89093b629d20fd4064b82100cc9b3 a61a91d427fef0b29fbe4983ee2b9dd4d9f0c074 4cc60cbdb70172e3b996fe55968003320bd10f2c 521178327e4ca5581d741966e8c288253be3d8f3 d44c45cbdbc7e13047ce127ea7ebcac2810a7891 cdc5e9e4dbeb3e63e00db2afc3a8c48152885d40
Closing out bug report. Thanks!
This bug was referenced in samba v4-16-stable (Release samba-4.16.0rc3): a260463481a90812c483195273d7001269570080 692fb63a1ace5d4f2f03445458514fcff1e927a8 3500cb497649b5e5b47b372db2b107310d9dfb1e b48431f4783f30ee9e6f08095545feb688a036d4 4f9bada50afdb5e7276f0aa980b41f5636d8764e d088caa4002cfa26db0298218e4934f4b3803bf7 c0e02d8e8794e54556adb7ff260c7080dda19e2a 9794341b29e68726f6c4c8989b0a1e0db913d815 e8d165da42a89093b629d20fd4064b82100cc9b3 a61a91d427fef0b29fbe4983ee2b9dd4d9f0c074 4cc60cbdb70172e3b996fe55968003320bd10f2c 521178327e4ca5581d741966e8c288253be3d8f3 d44c45cbdbc7e13047ce127ea7ebcac2810a7891 cdc5e9e4dbeb3e63e00db2afc3a8c48152885d40