Messages in this thread | | | Date | Mon, 6 Jan 2020 07:53:46 +0100 | From | Ingo Molnar <> | Subject | Re: linux-next: manual merge of the tip tree with Linus' tree |
| |
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all, > > Today's linux-next merge of the tip tree got a conflict in: > > init/main.c > > between commit: > > 74f1a299107b ("Revert "fs: remove ksys_dup()"") > > from Linus' tree and commit: > > dfd402a4c4ba ("kcsan: Add Kernel Concurrency Sanitizer infrastructure") > > from the tip tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > -- > Cheers, > Stephen Rothwell > > diff --cc init/main.c > index 2cd736059416,919f65faeb7e..000000000000 > --- a/init/main.c > +++ b/init/main.c > @@@ -93,6 -93,8 +93,7 @@@ > #include <linux/rodata_test.h> > #include <linux/jump_label.h> > #include <linux/mem_encrypt.h> > -#include <linux/file.h> > + #include <linux/kcsan.h>
I've resolved this conflict in -tip as well, so this should go away on the next integration of -next.
Thanks,
Ingo
| |