[PATCH 0/3 v2] arm64: defconfig updates

Stuart Yoder stuart.yoder at nxp.com
Tue Apr 26 06:52:06 PDT 2016



> -----Original Message-----
> From: Shawn Guo [mailto:shawnguo at kernel.org]
> Sent: Tuesday, April 26, 2016 5:16 AM
> To: Stuart Yoder <stuart.yoder at nxp.com>
> Cc: linux-arm-kernel at lists.infradead.org; catalin.marinas at arm.com; will.deacon at arm.com;
> kernel at pengutronix.de; Yang-Leo Li <leoyang.li at nxp.com>; Scott Wood <scott.wood at nxp.com>;
> marc.zyngier at arm.com; mark.rutland at arm.com
> Subject: Re: [PATCH 0/3 v2] arm64: defconfig updates
> 
> On Wed, Apr 20, 2016 at 10:57:16AM -0500, Stuart Yoder wrote:
> > Stuart Yoder (3):
> >   arm64: defconfig: cleanup the defconfig
> >   arm64: defconfig: enable 48-bit virtual addresses
> 
> Applied these two.
> 
> >   arm64: defconfig: enable freescale/nxp config options
> 
> But this one doesn't apply to v4.6-rc1.

Yes.  There is a patch from Will that went into rc2 that was a major
defconfig update:
   431597b arm64: defconfig: updates for 4.6

...so basing my patch on rc1 would have caused it not to apply to 
later kernels.

The only sane thing I could think of to do was base my patches against
the latest rc, which was 4.6-rc4, which I mentioned in the cover
letter.

I can rebase that patch if needed, but it will most likely produce a merge
conflict later.  The defconfig file really should not be hand edited,
because that will quite likely cause it to get out of sync with what
'make savedefconfig' produces...so I'm trying to avoid someone having
to manually fix a merge conflict.

Thanks,
Stuart



More information about the linux-arm-kernel mailing list