[GIT PULL] ARM: mvebu: arm for v4.18 (#1)

[GIT PULL] ARM: mvebu: arm for v4.18 (#1)

[Gregory CLEMENT]

Hi,

Here is the first pull request for arm for mvebu for v4.18.

As I feared, there were (trivial) merge issues due to the defconfig
update in linux-next. The best place to solve them is in your tree, so
as soon as you will pull this, I will remove from my mvebu/for-next
branch.

Gregory

The following changes since commit 60cc43fc888428bb2f18f08997432d426a243338:

  Linux 4.17-rc1 (2018-04-15 18:24:20 -0700)

are available in the Git repository at:

  git://git.infradead.org/linux-mvebu.git tags/mvebu-arm-4.18-1

for you to fetch changes up to 95fbfe2f63d0838fed56d2f93604f205719bc51c:

  ARM: multi_v7_defconfig: Add Marvell NAND controller support (2018-05-16 19:38:34 +0200)

----------------------------------------------------------------
mvebu arm for 4.18 (part 1)

Updating multi_v7_defconfig and adding marvell NAND controller
support.

----------------------------------------------------------------
Gregory CLEMENT (2):
      ARM: multi_v7_defconfig: Update with current configuration
      ARM: multi_v7_defconfig: Add Marvell NAND controller support

 arch/arm/configs/multi_v7_defconfig | 369 +++++++++++++++---------------------
 1 file changed, 153 insertions(+), 216 deletions(-)

[GIT PULL] ARM: mvebu: arm for v4.18 (#1)

[Olof Johansson]

On Thu, May 17, 2018 at 02:59:42PM +0200, Gregory CLEMENT wrote:
> Hi,
> 
> Here is the first pull request for arm for mvebu for v4.18.
> 
> As I feared, there were (trivial) merge issues due to the defconfig
> update in linux-next. The best place to solve them is in your tree, so
> as soon as you will pull this, I will remove from my mvebu/for-next
> branch.

Hmm. Yeah, this is because you took upon yourself to run 'make savedefconfig'
for all platforms on this shared defconfig. This will of course conflict with
everything everywhere, and it doesn't seem like a good idea to do this way.

What you're really doing here is turning on one single option? Just do that.

We can run savedefconfig at the end of a merge window here instead of having
one of the platform maintainers do it.

So, feel free to send just the NAND patch, and I can fix it up when I apply it
if needed.

Thanks!


-Olof

[GIT PULL] ARM: mvebu: arm for v4.18 (#1)

[Gregory CLEMENT]

Hi Olof,
 
 On ven., mai 25 2018, Olof Johansson <olof@lixom.net> wrote:

> On Thu, May 17, 2018 at 02:59:42PM +0200, Gregory CLEMENT wrote:
>> Hi,
>> 
>> Here is the first pull request for arm for mvebu for v4.18.
>> 
>> As I feared, there were (trivial) merge issues due to the defconfig
>> update in linux-next. The best place to solve them is in your tree, so
>> as soon as you will pull this, I will remove from my mvebu/for-next
>> branch.
>
> Hmm. Yeah, this is because you took upon yourself to run 'make savedefconfig'
> for all platforms on this shared defconfig. This will of course conflict with
> everything everywhere, and it doesn't seem like a good idea to do this way.
>
> What you're really doing here is turning on one single option? Just do that.
>
> We can run savedefconfig at the end of a merge window here instead of having
> one of the platform maintainers do it.

Great, so could you do it for this release (I mean 4.18)? Indeed the
multi_v7_defconfig had not been sync since a long time.

>
> So, feel free to send just the NAND patch, and I can fix it up when I apply it
> if needed.

OK I am going to send you this patch rebased on a clean v4.17-rc1.

Gregory

>
> Thanks!
>
>
> -Olof
>

-- 
Gregory Clement, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com