From: David Miller <davem@davemloft.net>
To: geert+renesas@glider.be
Cc: nobuhiro.iwamatsu.yj@renesas.com,
yoshihiro.shimoda.uh@renesas.com, netdev@vger.kernel.org,
linux-sh@vger.kernel.org
Subject: Re: [PATCH] sh_eth: Fix addition of .trscer_err_mask to wrong SoC data
Date: Thu, 15 Jan 2015 19:09:53 +0000 [thread overview]
Message-ID: <20150115.140953.2021061170661876815.davem@davemloft.net> (raw)
In-Reply-To: <1421319139-22655-1-git-send-email-geert+renesas@glider.be>
From: Geert Uytterhoeven <geert+renesas@glider.be>
Date: Thu, 15 Jan 2015 11:52:19 +0100
> commit b284fbe3b3ef9cf8 ("sh_eth: Fix access to TRSCER register") wanted
> to add a .trscer_err_mask value to the R-Car Gen2 family-specific data
> structure (r8a779x_data), but it was accidentally added to the
> SH7724-specific data structure (sh7724_data).
>
> Presumably this happened due to a patch conflict with commit
> d407bc0203539031 ("sh-eth: Set fdr_value of R-Car SoCs"), which added
> another field at the same position.
>
> Move the field setting to fix this.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Fixes: b284fbe3b3ef9cf8 ("sh_eth: Fix access to TRSCER register")
Oops, applied, thanks Geert.
prev parent reply other threads:[~2015-01-15 19:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-15 10:52 [PATCH] sh_eth: Fix addition of .trscer_err_mask to wrong SoC data Geert Uytterhoeven
2015-01-15 19:09 ` David Miller [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=20150115.140953.2021061170661876815.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=geert+renesas@glider.be \
--cc=linux-sh@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nobuhiro.iwamatsu.yj@renesas.com \
--cc=yoshihiro.shimoda.uh@renesas.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).