lkml.org 
[lkml]   [2015]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the tip tree with the kselftest-fixes tree

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in
> tools/testing/selftests/x86/run_x86_tests.sh between commit
> c1e6e5cb941b ("selftests, x86: Remove useless run_tests rule") from
> the kselftest-fixes tree and commit e22438f8e997 ("x86, selftests:
> Add a test for the "sysret_ss_attrs" bug") from the tip tree.
>
> I fixed it up (I removed the file) and can carry the fix as
> necessary (no action is required).

Thanks Stephen - I've dropped this and the other conflicting commit
from -tip, so both conflicts should go away in tomorrow's integration.

Thanks,

Ingo


\
 
 \ /
  Last update: 2015-05-14 07:21    [W:0.029 / U:0.072 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site