From: Samuel Ortiz <sameo@linux.intel.com>
To: Lee Jones <lee.jones@linaro.org>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL] mfd: Patches due for the v3.12 merge window
Date: Wed, 31 Jul 2013 02:20:23 +0200 [thread overview]
Message-ID: <20130731002022.GA20812@zurbaran> (raw)
In-Reply-To: <CAF2Aj3j2z=Pd-uW_VL6P=JMeEWnkf8aierMHb5Y6bv+y-GDiMw@mail.gmail.com>
Hi Lee,
On Tue, Jul 30, 2013 at 01:28:02PM +0100, Lee Jones wrote:
> The following changes since commit 7b9f21e6a4051bb470d62b0601501376f9fc7db7:
>
> Merge tag 'mfd-3.11-1' of
> git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next into
> mfd-3.11-merge (2013-07-08 23:52:21 +0200)
>
> are available in the git repository at:
>
>
> git://git.linaro.org/people/ljones/mfd.git for-mfd-next
>
> for you to fetch changes up to 50ef27e35c4fd91d40174a8bfd8220881376733e:
>
> mfd: ucb1x00: Explicitely include linux/device.h (2013-07-24 13:28:29 +0100)
I tried to pull those ones on top of a 3.11-rc3 tag and I had a merge
conflict.
So I rebased and applied them on top of 3.11-rc3 instead. Thanks a
bunch.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
prev parent reply other threads:[~2013-07-31 0:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-30 12:28 Lee Jones
2013-07-31 0:20 ` Samuel Ortiz [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=20130731002022.GA20812@zurbaran \
--to=sameo@linux.intel.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.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
all inboxes | Powered by JetHome®