From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Darren Hart <dvhart@infradead•org>, 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>,
Kuppuswamy Sathyanarayanan
<sathyanarayanan.kuppuswamy@linux•intel.com>
Subject: linux-next: manual merge of the drivers-x86 tree with the watchdog tree
Date: Tue, 2 May 2017 14:04:03 +1000 [thread overview]
Message-ID: <20170502140403.24e315cf@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the drivers-x86 tree got a conflict in:
drivers/watchdog/iTCO_wdt.c
between commit:
38a700fa1df9 ("watchdog: iTCO_wdt: cleanup set/unset no_reboot_bit functions")
(which also appears in the drivers-x86 tree as commit f583a884afec)
from the watchdog tree and commit:
140c91b26ebc ("watchdog: iTCO_wdt: Add PMC specific noreboot update api")
from the drivers-x86 tree.
I fixed it up 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-05-02 4:04 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-02 4:04 Stephen Rothwell [this message]
2017-05-02 18:09 ` linux-next: manual merge of the drivers-x86 tree with the watchdog tree Darren Hart
2017-05-02 19:12 ` Guenter Roeck
2017-05-02 20:21 ` Darren Hart
2017-05-02 20:57 ` Andy Shevchenko
2017-05-02 21:30 ` Darren Hart
2017-05-02 21:58 ` Guenter Roeck
2017-05-02 22:35 ` Darren Hart
2017-05-03 14:24 ` Wim Van Sebroeck
2017-05-03 14:43 ` Andy Shevchenko
-- strict thread matches above, loose matches on Subject: below --
2019-03-04 3:37 Stephen Rothwell
2019-03-07 5:27 ` Darren Hart
2019-03-07 5:42 ` Darren Hart
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=20170502140403.24e315cf@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dvhart@infradead$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sathyanarayanan.kuppuswamy@linux$(echo .)intel.com \
--cc=wim@iguana$(echo .)be \
/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