Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1216536
| From | Olof Johansson <olof@lixom.net> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [GIT PULL 0/7] ARM: SoC changes for v4.3 |
| Date | 2015-09-01 02:50 +0200 |
| Message-ID | <q3HVT-7oG-3@gated-at.bofh.it> (permalink) |
| References | <q3Hjb-6AN-1@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On Mon, Aug 31, 2015 at 5:07 PM, Olof Johansson <olof@lixom.net> wrote: > We've been able to keep conflicts down this cycle, only a few and none > are hairy. I've described them in the affected pull requests. Grmbl, I just fetched your tree and looked for new conflicts, and it looks like a few more have crept in and diffstats are likely off from the ones in my pull requests. Sorry about that. New conflicts: drivers/clk/ti/Makefike: Looks like an add/remove conflict on nearby lines due to our addition of clk-814x. drivers/pci/host/Kconfig: Bjorn and I picked up different versions of the same fix for a problem that surfaced through the new arm64 dependencies. Go with Bjorn's. drivers/pci/host/pci-iproc.c: Looks like whitespace delta on nearby changes. -Olof -- 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 linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
[GIT PULL 0/7] ARM: SoC changes for v4.3 Olof Johansson <olof@lixom.net> - 2015-09-01 02:10 +0200 [GIT PULL 2/7] ARM: SoC cleanups for v4.3 Olof Johansson <olof@lixom.net> - 2015-09-01 02:10 +0200 [GIT PULL 6/7] ARM: SoC defconfig updates for v4.3 Olof Johansson <olof@lixom.net> - 2015-09-01 02:10 +0200 [GIT PULL 1/7] ARM: SoC non-urgent fixes for 4.3 Olof Johansson <olof@lixom.net> - 2015-09-01 02:10 +0200 [GIT PULL 4/7] ARM: SoC driver updates for v4.3 Olof Johansson <olof@lixom.net> - 2015-09-01 02:10 +0200 [GIT PULL 7/7] ARM: SoC 64-bit changes for v4.3 Olof Johansson <olof@lixom.net> - 2015-09-01 02:10 +0200 [GIT PULL 3/7] ARM: SoC platform updates for v4.3 Olof Johansson <olof@lixom.net> - 2015-09-01 02:10 +0200 Re: [GIT PULL 0/7] ARM: SoC changes for v4.3 Olof Johansson <olof@lixom.net> - 2015-09-01 02:50 +0200
csiph-web