From: sshtylyov@mvista.com (Sergei Shtylyov)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] DaVinci features for v3.1
Date: Fri, 08 Jul 2011 14:41:08 +0400 [thread overview]
Message-ID: <4E16DEC4.4070401@mvista.com> (raw)
In-Reply-To: <B85A65D85D7EB246BE421B3FB0FBB593024D9B56E8@dbde02.ent.ti.com>
Hello.
On 08-07-2011 13:13, Nori, Sekhar wrote:
> Please pull the following DaVinci features for v3.1.
> This pull request depends on the patch "davinci: dm6467/T EVM: fix setting
> up of reference clock rate" in clean-up pull request for successful build.
> Pulling this after the earlier clean-up pull request generates this merge
> conflict:
> <<<<<<< HEAD:arch/arm/mach-davinci/include/mach/psc.h
> #define MDSTAT_STATE_MASK 0x1f
> =======
> #define MDSTAT_STATE_MASK 0x1f
> #define MDCTL_FORCE BIT(31)
>>>>>>>> 8bb2c4813c534d26eba3beb7888fbd3cbc931f62:arch/arm/mach-davinci/include/mach/psc.h
> The resolution is:
> #define MDSTAT_STATE_MASK 0x1f
> #define MDCTL_FORCE BIT(31)
BTW, I think I'll send a patch fixing MDSTAT_STATE_MASK to 0x3f today.
WBR, Sergei
next prev parent reply other threads:[~2011-07-08 10:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-08 9:13 [GIT PULL] DaVinci features for v3.1 Nori, Sekhar
2011-07-08 10:41 ` Sergei Shtylyov [this message]
2011-07-08 15:25 ` Arnd Bergmann
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=4E16DEC4.4070401@mvista.com \
--to=sshtylyov@mvista.com \
--cc=linux-arm-kernel@lists.infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.