Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1260068 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2015-11-01 00:40 +0100 |
| Last post | 2015-11-01 00:40 +0100 |
| Articles | 1 — 1 participant |
Back to article view | Back to linux.kernel
linux-next: manual merge of the mvebu tree with the arm-soc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-11-01 00:40 +0100
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-11-01 00:40 +0100 |
| Subject | linux-next: manual merge of the mvebu tree with the arm-soc tree |
| Message-ID | <qpNUC-Ku-7@gated-at.bofh.it> |
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/
Back to top | Article view | linux.kernel
csiph-web