On Fri, Aug 23, 2013 at 3:16 AM, Peter Robinson <[email protected]> wrote: > commit c2a5d382a8a063910f661f0368e463b780a4c3e2 > Author: Peter Robinson <[email protected]> > Date: Fri Aug 23 08:16:21 2013 +0100 > > Minor ARM config cleanups, Enable some IOMMU drivers on ARM, Enable some > i.MX sound drivers > > arm-imx-fixsound.patch | 65 > ++++++++++++++++++++++++++++++++++++++++++++++++ > config-arm-generic | 1 + > config-armv7 | 24 +++++++++++++---- > config-armv7-lpae | 2 + > kernel.spec | 8 ++++++ > 5 files changed, 94 insertions(+), 6 deletions(-) > ---
Unless you're making an F21 specific change, please keep both the f20 and master branches in sync. Right now, the easiest way to do that is commit to master, then: git checkout f20; git merge master; It should result in a fast-forward merge and the branches will be identical. I've gone ahead and synced f20 for this change. If you do have an F21-only change, please note it in the commit log. We'll break the ability to do nice FF merges when that happens, but that's bound to happen eventually. josh _______________________________________________ kernel mailing list [email protected] https://admin.fedoraproject.org/mailman/listinfo/kernel
