[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-kernel
Subject:    linux-next: manual merge of the mvebu tree with the arm-soc tree
From:       Stephen Rothwell <sfr () canb ! auug ! org ! au>
Date:       2015-10-31 23:35:55
Message-ID: 20151101103555.2464c0ee () canb ! auug ! org ! au
[Download RAW message or body]

Hi all,

Today's linux-next merge of the mvebu tree got a conflict in:

  arch/arm/mach-mvebu/pmsu.c

between commit:

  9d2ea95a599a ("ARM: mvebu: add broken-idle option")

from the arm-soc tree and commit:

  da6ee32a42c0 ("ARM: mvebu: add broken-idle option")

from the mvebu tree.

I fixed it up (looks like 2 version of the same thing (though different)
so I just used the version from the arm-doc tree) and can carry the fix
as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
[prev in list] [next in list] [prev in thread] [next in thread]