| Message ID | 20130930154208.GG31178@titan.lakedaemon.net |
|---|---|
| State | New |
| Headers | show |
On Mon, Sep 30, 2013 at 11:42:08AM -0400, Jason Cooper wrote: > Guys, > > These are the SoC changes that didn't make it during the last merge > window. As with mvebu/drivers, these have been in -next since 3.12-rc1 > without issue. I should have looked closer at this before I commented on the PCI branch. > Sebastian Hesselbarth (2): > ARM: dove: switch to DT probed mbus address windows > ARM: dove: remove legacy pcie and clock init It looks to me like this second patch will need to be based on the PCI branch, or you will have broken PCI if this is applied and not the drivers/pci patches, right? If so, you need to base this branch on top of the other one, not send them separately -- otherwise a git bisect that lands between these two will result in a non-booting kernel. This also explains why you need the PCI patches through arm-soc, so I answered my own question. :-) -Olof
On Mon, Oct 07, 2013 at 10:06:40AM -0700, Olof Johansson wrote: > On Mon, Sep 30, 2013 at 11:42:08AM -0400, Jason Cooper wrote: > > Guys, > > > > These are the SoC changes that didn't make it during the last merge > > window. As with mvebu/drivers, these have been in -next since 3.12-rc1 > > without issue. > > I should have looked closer at this before I commented on the PCI branch. No problem. :) > > Sebastian Hesselbarth (2): > > ARM: dove: switch to DT probed mbus address windows > > ARM: dove: remove legacy pcie and clock init > > It looks to me like this second patch will need to be based on the PCI branch, > or you will have broken PCI if this is applied and not the drivers/pci patches, > right? If so, you need to base this branch on top of the other one, not send > them separately -- otherwise a git bisect that lands between these two will > result in a non-booting kernel. Hmm, I'd like to avoid the branch dependency if possible. I'll just move the patch over from mvebu/soc to mvebu/drivers. There might be a trivial merge conflict later on, but I seriously doubt it. v2 on it's way... thx, Jason.
On Mon, Oct 07, 2013 at 10:06:40AM -0700, Olof Johansson wrote: > On Mon, Sep 30, 2013 at 11:42:08AM -0400, Jason Cooper wrote: > > Guys, > > > > These are the SoC changes that didn't make it during the last merge > > window. As with mvebu/drivers, these have been in -next since 3.12-rc1 > > without issue. > > I should have looked closer at this before I commented on the PCI branch. > > > Sebastian Hesselbarth (2): > > ARM: dove: switch to DT probed mbus address windows > > ARM: dove: remove legacy pcie and clock init > > It looks to me like this second patch will need to be based on the PCI branch, > or you will have broken PCI if this is applied and not the drivers/pci patches, > right? If so, you need to base this branch on top of the other one, not send > them separately -- otherwise a git bisect that lands between these two will > result in a non-booting kernel. I've moved both patches over to mvebu/drivers. This leaves one patch in mvebu/soc. I'll hold off on the pull request for it until I have some more (looks like there's some stuff pending). thx, Jason.
Jason Cooper <jason@lakedaemon.net> writes: > On Mon, Oct 07, 2013 at 10:06:40AM -0700, Olof Johansson wrote: >> On Mon, Sep 30, 2013 at 11:42:08AM -0400, Jason Cooper wrote: >> > Guys, >> > >> > These are the SoC changes that didn't make it during the last merge >> > window. As with mvebu/drivers, these have been in -next since 3.12-rc1 >> > without issue. >> >> I should have looked closer at this before I commented on the PCI branch. >> >> > Sebastian Hesselbarth (2): >> > ARM: dove: switch to DT probed mbus address windows >> > ARM: dove: remove legacy pcie and clock init >> >> It looks to me like this second patch will need to be based on the PCI branch, >> or you will have broken PCI if this is applied and not the drivers/pci patches, >> right? If so, you need to base this branch on top of the other one, not send >> them separately -- otherwise a git bisect that lands between these two will >> result in a non-booting kernel. > > I've moved both patches over to mvebu/drivers. This leaves one patch in > mvebu/soc. I'll hold off on the pull request for it until I have some > more (looks like there's some stuff pending). OK, ignoring the soc branch for now. Kevin
Guys, These are the SoC changes that didn't make it during the last merge window. As with mvebu/drivers, these have been in -next since 3.12-rc1 without issue. thx, Jason. The following changes since commit 272b98c6455f00884f0350f775c5342358ebb73f: Linux 3.12-rc1 (2013-09-16 16:17:51 -0400) are available in the git repository at: git://git.infradead.org/linux-mvebu.git tags/soc-3.13 for you to fetch changes up to ffe195c369656b5e4d3b5c21376483c23589be30: ARM: dove: remove legacy pcie and clock init (2013-09-30 15:01:51 +0000) ---------------------------------------------------------------- mvebu soc changes for v3.13 - dove - use DT for mbus windows - use DT for pcie and clock init ---------------------------------------------------------------- Sebastian Hesselbarth (2): ARM: dove: switch to DT probed mbus address windows ARM: dove: remove legacy pcie and clock init arch/arm/mach-dove/board-dt.c | 39 +-------------------------------------- 1 file changed, 1 insertion(+), 38 deletions(-)