From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Wim Van Sebroeck <wim@iguana.be>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Kees Cook <keescook@chromium.org>,
Christophe Leroy <christophe.leroy@c-s.fr>,
Guenter Roeck <linux@roeck-us.net>
Subject: linux-next: manual merge of the watchdog tree with Linus' tree
Date: Mon, 27 Nov 2017 11:06:48 +1100 [thread overview]
Message-ID: <20171127110648.56946adf@canb.auug.org.au> (raw)
Hi Wim,
Today's linux-next merge of the watchdog tree got a conflict in:
drivers/watchdog/mpc8xxx_wdt.c
between commit:
e99e88a9d2b0 ("treewide: setup_timer() -> timer_setup()")
from Linus' tree and commit:
fbdec655375c ("watchdog: mpc8xxx: use the core worker function")
from the watchdog tree.
I fixed it up (I used the latter which removed the setup_timer call) 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-27 0:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-27 0:06 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-02-25 1:17 linux-next: manual merge of the watchdog tree with Linus' tree Stephen Rothwell
2010-05-26 3:38 Stephen Rothwell
2010-05-26 6:35 ` Wim Van Sebroeck
2010-05-26 7: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=20171127110648.56946adf@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=christophe.leroy@c-s.fr \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=wim@iguana.be \
/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