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: <CAJ6Av5OBhpsSRiZNOa1a65yMT04Evaja6j8qPBiSuVM1DPdB1Q@mail.gmail.com> Date: Thu, 6 Dec 2012 16:54:04 -0600 From: Omar Ramirez Luna <omar.ramirez@...itl.com> To: Ohad Ben-Cohen <ohad@...ery.com> Cc: Joerg Roedel <joro@...tes.org>, Stephen Rothwell <sfr@...b.auug.org.au>, Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>, linux-arm <linux-arm-kernel@...ts.infradead.org>, linux-next@...r.kernel.org, "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>, Paul Walmsley <paul@...an.com>, Mike Turquette <mturquette@...com>, Tony Lindgren <tony@...mide.com> Subject: Re: linux-next: manual merge of the arm-soc tree with the iommu tree Hi All, On Tue, Dec 4, 2012 at 5:10 AM, Ohad Ben-Cohen <ohad@...ery.com> wrote: > On Tue, Dec 4, 2012 at 1:06 PM, Joerg Roedel <joro@...tes.org> wrote: >> On Tue, Dec 04, 2012 at 03:42:03PM +1100, Stephen Rothwell wrote: >>> Today's linux-next merge of the arm-soc tree got a conflict in >>> arch/arm/mach-omap2/clock44xx_data.c between commit 298ea44f211d ("ARM: >>> OMAP4: hwmod data: ipu and dsp to use parent clocks instead of leaf >>> clocks") from the iommu tree and commit 13a5b6228679 ("ARM: OMAP44xx: >>> clock: drop obsolete clock data") from the arm-soc tree. >>> >>> I just deleted the file as the latter did and can carry the fix as >>> necessary (no action is required). >> >> Ohad, Omar, any comment on this? > > I'd prefer Omar or Paul to have a look here. Looping in Tony as well. I have checked next-20121206, it's OK to delete that file as the patch from Paul is doing that for common clock framework migration; now the only missing hunk from my original patch should apply to arch/arm/mach-omap2/cclock44xx_data.c which is the file that now has ipu_fck and dsp_fck (unused) clocks, I can send a patch to remove them through linux-omap tree. Cheers, Omar -- 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