[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20150115.140953.2021061170661876815.davem@davemloft.net>
Date: Thu, 15 Jan 2015 14:09:53 -0500 (EST)
From: David Miller <davem@...emloft.net>
To: geert+renesas@...der.be
Cc: nobuhiro.iwamatsu.yj@...esas.com, yoshihiro.shimoda.uh@...esas.com,
netdev@...r.kernel.org, linux-sh@...r.kernel.org
Subject: Re: [PATCH] sh_eth: Fix addition of .trscer_err_mask to wrong SoC
data
From: Geert Uytterhoeven <geert+renesas@...der.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@...der.be>
> Fixes: b284fbe3b3ef9cf8 ("sh_eth: Fix access to TRSCER register")
Oops, applied, thanks Geert.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists