From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: rtc-linux@googlegroups.com,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [rtc-linux] Re: [GIT PULL] RTC for 4.2
Date: Fri, 26 Jun 2015 09:41:24 +0200 [thread overview]
Message-ID: <20150626074124.GM485@piout.net> (raw)
In-Reply-To: <CA+55aFzyTuindK63-jiYBdq-uB=_WWO0dgPciurgdFALz62iWQ@mail.gmail.com>
On 25/06/2015 at 18:59:48 -0700, Linus Torvalds wrote :
> Looks fine, but:
>
> > Conflicts:
> > drivers/rtc/Makefile
> >
> > Trivial add/add conflicts with the mfd tree, solved in linux-next
> > Resolution: take both sides.
>
> That's not the resolution I took - the re-sorting of the file made for
> more complex.
>
> Can you check my resolution?
>
I've checked and it is correct. Thanks!
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
prev parent reply other threads:[~2015-06-26 7:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-25 19:16 [rtc-linux] [GIT PULL] RTC for 4.2 Alexandre Belloni
2015-06-26 1:59 ` [rtc-linux] " Linus Torvalds
2015-06-26 7:41 ` Alexandre Belloni [this message]
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=20150626074124.GM485@piout.net \
--to=alexandre.belloni@free-electrons.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rtc-linux@googlegroups.com \
--cc=torvalds@linux-foundation.org \
/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