From: Kevin Hilman <khilman@deeprootsystems.com>
To: Benoit Cousson <b-cousson@ti.com>
Cc: paul@pwsan.com, linux-omap@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Rajendra Nayak <rnayak@ti.com>,
"Govindraj.R" <govindraj.raja@ti.com>,
Charulatha V <charu@ti.com>
Subject: Re: [PATCH 1/5] OMAP4: hwmod data: Fix hwmod entries order
Date: Mon, 13 Dec 2010 19:07:32 -0800 [thread overview]
Message-ID: <87d3p52gsr.fsf@deeprootsystems.com> (raw)
In-Reply-To: <1291937615-18571-2-git-send-email-b-cousson@ti.com> (Benoit Cousson's message of "Fri, 10 Dec 2010 00:33:31 +0100")
Benoit Cousson <b-cousson@ti.com> writes:
> The original OMAP4 hwmod data files is fully generated from HW
> database. But since the file is introduced incrementaly along
> with driver that uses the data, it has to be splitted by the driver
> owner and then re-merged by the maintainer.
> Because of the similarity of the data, git is completely lost
> during such merge and thus the data does not look like the original one
> at the end.
>
> Re-order properly the structures to stay in sync with original data set.
>
> Add a comment that does contain all the IPs that can have a hwmod, but
> do not have it in the file for the moment. It gives a good indication
> of the progress.
>
> Signed-off-by: Benoit Cousson <b-cousson@ti.com>
> Cc: Paul Walmsley <paul@pwsan.com>
> Cc: Rajendra Nayak <rnayak@ti.com>
> Cc: Govindraj.R <govindraj.raja@ti.com>
> Cc: Charulatha V <charu@ti.com>
> Cc: Kevin Hilman <khilman@deeprootsystems.com>
Acked-by: Kevin Hilman <khilman@deeprootsystems.com>
My (mostly) blind git merges caused this problem in the first place.
Sorry.
Kevin
WARNING: multiple messages have this Message-ID (diff)
From: khilman@deeprootsystems.com (Kevin Hilman)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/5] OMAP4: hwmod data: Fix hwmod entries order
Date: Mon, 13 Dec 2010 19:07:32 -0800 [thread overview]
Message-ID: <87d3p52gsr.fsf@deeprootsystems.com> (raw)
In-Reply-To: <1291937615-18571-2-git-send-email-b-cousson@ti.com> (Benoit Cousson's message of "Fri, 10 Dec 2010 00:33:31 +0100")
Benoit Cousson <b-cousson@ti.com> writes:
> The original OMAP4 hwmod data files is fully generated from HW
> database. But since the file is introduced incrementaly along
> with driver that uses the data, it has to be splitted by the driver
> owner and then re-merged by the maintainer.
> Because of the similarity of the data, git is completely lost
> during such merge and thus the data does not look like the original one
> at the end.
>
> Re-order properly the structures to stay in sync with original data set.
>
> Add a comment that does contain all the IPs that can have a hwmod, but
> do not have it in the file for the moment. It gives a good indication
> of the progress.
>
> Signed-off-by: Benoit Cousson <b-cousson@ti.com>
> Cc: Paul Walmsley <paul@pwsan.com>
> Cc: Rajendra Nayak <rnayak@ti.com>
> Cc: Govindraj.R <govindraj.raja@ti.com>
> Cc: Charulatha V <charu@ti.com>
> Cc: Kevin Hilman <khilman@deeprootsystems.com>
Acked-by: Kevin Hilman <khilman@deeprootsystems.com>
My (mostly) blind git merges caused this problem in the first place.
Sorry.
Kevin
next prev parent reply other threads:[~2010-12-14 3:07 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-09 23:33 [PATCH 0/5] OMAP4: hwmod data fixes and update Benoit Cousson
2010-12-09 23:33 ` Benoit Cousson
2010-12-09 23:33 ` [PATCH 1/5] OMAP4: hwmod data: Fix hwmod entries order Benoit Cousson
2010-12-09 23:33 ` Benoit Cousson
2010-12-14 3:07 ` Kevin Hilman [this message]
2010-12-14 3:07 ` Kevin Hilman
2010-12-15 1:09 ` Paul Walmsley
2010-12-15 1:09 ` Paul Walmsley
2010-12-15 13:44 ` Cousson, Benoit
2010-12-15 13:44 ` Cousson, Benoit
2010-12-09 23:33 ` [PATCH 2/5] OMAP4: hwmod data: Add SYSS_HAS_RESET_STATUS flag Benoit Cousson
2010-12-09 23:33 ` Benoit Cousson
2010-12-09 23:33 ` [PATCH 3/5] OMAP4: hwmod data: Fix missing address in DMM and EMIF_FW Benoit Cousson
2010-12-09 23:33 ` Benoit Cousson
2010-12-09 23:33 ` [PATCH 4/5] OMAP4: hwmod data: Add IVA and DSP Benoit Cousson
2010-12-09 23:33 ` Benoit Cousson
2010-12-09 23:33 ` [PATCH 5/5] OMAP4: hwmod & clock data: Fix GPIO opt_clks and ocp_if iclk Benoit Cousson
2010-12-09 23:33 ` Benoit Cousson
2010-12-15 1:10 ` Paul Walmsley
2010-12-15 1:10 ` Paul Walmsley
2010-12-10 0:36 ` [PATCH 0/5] OMAP4: hwmod data fixes and update Kevin Hilman
2010-12-10 0:36 ` Kevin Hilman
2010-12-10 7:51 ` Cousson, Benoit
2010-12-10 7:51 ` Cousson, Benoit
2010-12-10 15:54 ` Cousson, Benoit
2010-12-10 15:54 ` Cousson, Benoit
2010-12-15 1:07 ` Paul Walmsley
2010-12-15 1:07 ` Paul Walmsley
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=87d3p52gsr.fsf@deeprootsystems.com \
--to=khilman@deeprootsystems.com \
--cc=b-cousson@ti.com \
--cc=charu@ti.com \
--cc=govindraj.raja@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=paul@pwsan.com \
--cc=rnayak@ti.com \
/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.