| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CAOesGMj_Gk8gcbBojzCwGbT6nufNdm0ocH62vVyjh_aMEBsfQg@mail.gmail.com> Date: Mon, 31 Aug 2015 17:48:36 -0700 From: Olof Johansson <olof@...om.net> To: Linus Torvalds <torvalds@...ux-foundation.org> Cc: "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>, "linux-arm-kernel@...ts.infradead.org" <linux-arm-kernel@...ts.infradead.org>, "arm@...nel.org" <arm@...nel.org>, Bjorn Helgaas <bhelgaas@...gle.com> Subject: Re: [GIT PULL 0/7] ARM: SoC changes for v4.3 On Mon, Aug 31, 2015 at 5:07 PM, Olof Johansson <olof@...om.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@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists