From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Jonathan Corbet <corbet@lwn•net>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Tiezhu Yang <yangtiezhu@loongson•cn>
Subject: linux-next: manual merge of the tip tree with the jc_docs tree
Date: Thu, 3 Jun 2021 14:04:11 +1000 [thread overview]
Message-ID: <20210603140411.79f67380@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 832 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
samples/kprobes/kprobe_example.c
between commits:
61fa308f23b5 ("samples/kprobes: Fix typo in handler_fault()")
db1ea668843e ("samples/kprobes: Fix typo in handler_post()")
from the jc_docs tree and commit:
ec6aba3d2be1 ("kprobes: Remove kprobe::fault_handler")
from the tip tree.
I fixed it up (the latter removed some code updated by the former) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-06-03 4:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-03 4:04 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-04-19 1:55 linux-next: manual merge of the tip tree with the jc_docs tree Stephen Rothwell
2020-12-04 4:38 Stephen Rothwell
2018-03-14 2:58 Stephen Rothwell
2017-06-21 4:18 Stephen Rothwell
2017-07-03 1:33 ` 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=20210603140411.79f67380@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=corbet@lwn$(echo .)net \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=yangtiezhu@loongson$(echo .)cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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