Hi all, The following commit is also in the vfs-brauner tree as a different commit (but the same patch): ba859b2e419c ("selftests/nolibc: drop test chmod_net") This is commit 49319832de90 ("selftests/nolibc: drop test chmod_net") in the vfs-brauner tree. This duplication is causing a conflict. -- Cheers, Stephen Rothwell
Attachment:
pgpMuOTcls_Kg.pgp
Description: OpenPGP digital signature