From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Alexandre Belloni <alexandre.belloni@bootlin•com>,
Tony Lindgren <tony@atomide•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Keerthy <j-keerthy@ti•com>
Subject: linux-next: manual merge of the rtc tree with the omap tree
Date: Tue, 9 Apr 2019 15:22:26 +1000 [thread overview]
Message-ID: <20190409152226.5fecccd1@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 751 bytes --]
Hi all,
Today's linux-next merge of the rtc tree got a conflict in:
drivers/rtc/rtc-omap.c
between commit:
6256f7f7f217 ("rtc: OMAP: Add support for rtc-only mode")
from the omap tree and commit:
35118b7a4ea0 ("rtc: omap: let the core handle range")
from the rtc tree.
I fixed it up (I used the latter resolution around tm2bcd() changes) 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:[~2019-04-09 5:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-09 5:22 Stephen Rothwell [this message]
2019-04-09 13:25 ` linux-next: manual merge of the rtc tree with the omap tree Keerthy
2019-04-09 14:22 ` Tony Lindgren
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=20190409152226.5fecccd1@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alexandre.belloni@bootlin$(echo .)com \
--cc=j-keerthy@ti$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tony@atomide$(echo .)com \
/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