From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Kees Cook <keescook@chromium.org>
Subject: linux-next: manual merge of the char-misc tree with the tip tree
Date: Thu, 2 Nov 2017 15:20:58 +1100 [thread overview]
Message-ID: <20171102152058.4facb497@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in:
drivers/misc/lkdtm_core.c
between commit:
8776fe75dc0e ("lkdtm, kprobes: Convert from jprobes to kprobes")
from the tip tree and commits:
31c5c870a112 ("lkdtm: Convert from jprobe to kprobe")
75f98b7ab748 ("lkdtm: Constify the crashtypes table")
from the char-misc tree.
[8776fe75dc0e and 31c5c870a112 are the same patch]
I fixed it up (I just usted the latter) 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
next reply other threads:[~2017-11-02 4:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-02 4:20 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-09-22 9:56 linux-next: manual merge of the char-misc tree with the tip tree Mark Brown
2025-09-22 12:04 ` Greg KH
2025-09-22 14:59 ` Boqun Feng
2015-08-24 8:22 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171102152058.4facb497@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=hpa@zytor.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox