Re: [PATCH 20/35] openrisc: defconfig: Cleanup from old Kconfig options

From: Stafford Horne
Date: Sat Jun 10 2017 - 19:35:23 EST


On Sat, Jun 10, 2017 at 06:42:27PM +0200, Krzysztof Kozlowski wrote:
> On Sat, Jun 10, 2017 at 05:13:54PM +0900, Stafford Horne wrote:
> > On Thu, Jun 08, 2017 at 06:10:31PM +0200, Krzysztof Kozlowski wrote:
> > > Remove old, dead Kconfig option INET_LRO. It is gone since
> > > commit 7bbf3cae65b6 ("ipv4: Remove inet_lro library").
> > >
> > > Signed-off-by: Krzysztof Kozlowski <krzk@xxxxxxxxxx>
> > > ---
> > > arch/openrisc/configs/or1ksim_defconfig | 1 -
> > > 1 file changed, 1 deletion(-)
> > >
> > > diff --git a/arch/openrisc/configs/or1ksim_defconfig b/arch/openrisc/configs/or1ksim_defconfig
> > > index eb3fc581cf20..a73aa90501be 100644
> > > --- a/arch/openrisc/configs/or1ksim_defconfig
> > > +++ b/arch/openrisc/configs/or1ksim_defconfig
> > > @@ -23,7 +23,6 @@ CONFIG_INET=y
> > > # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
> > > # CONFIG_INET_XFRM_MODE_TUNNEL is not set
> > > # CONFIG_INET_XFRM_MODE_BEET is not set
> > > -# CONFIG_INET_LRO is not set
> > > # CONFIG_INET_DIAG is not set
> > > CONFIG_TCP_CONG_ADVANCED=y
> > > # CONFIG_TCP_CONG_BIC is not set
> >
> > Thanks, please let me know if you want me to take this, but it looks like
> > you plan to push the whole series in via another route.
> >
> > Acked-by: Stafford Horne <shorne@xxxxxxxxx>
>
> Thanks, I did not mention the merging plan in cover letter but I think
> the best way is to merge it through platform maintainers. Less
> conflicts, I guess.
>
> I'll be taking and sendin in pull request only ARM part.
>
> So please go ahead and apply it.

Applied.