On 7/9/24 02:08, Stephen Rothwell wrote:
Hi all,
The following commits are also in the kselftest-fixes tree as different
commits (but the same patches):
868680ffba11 ("selftests/vDSO: remove duplicate compiler invocations from Makefile")
7bb79ef48b9d ("selftests/vDSO: remove partially duplicated "all:" target in Makefile")
14cd1a877fc6 ("selftests/vDSO: fix clang build errors and warnings")
These are already causing an unnecessary conflict
:-( Maybe you could just merge the kselftest-fixes tree
(git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes),
but first make sure that it won't be rebased.
They are now in Linus's mainline. :)
thanks,
-- Shuah
