On Fri, Aug 23, 2013 at 3:16 AM, Peter Robinson pbrobinson@fedoraproject.org wrote:
commit c2a5d382a8a063910f661f0368e463b780a4c3e2 Author: Peter Robinson pbrobinson@gmail.com 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
On Fri, Aug 23, 2013 at 12:48 PM, Josh Boyer jwboyer@fedoraproject.orgwrote:
On Fri, Aug 23, 2013 at 3:16 AM, Peter Robinson pbrobinson@fedoraproject.org wrote:
commit c2a5d382a8a063910f661f0368e463b780a4c3e2 Author: Peter Robinson pbrobinson@gmail.com 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.
Hi Josh, my bad, I meant to ask how we were dealing with rawhide/F-20 and I forgot about it all together. It looks like you've now merged them, if so thanks. From my PoV there's nothing ARM related planned that shouldn't hit both.
Peter
On Fri, Aug 23, 2013 at 7:48 AM, Josh Boyer jwboyer@fedoraproject.org wrote:
On Fri, Aug 23, 2013 at 3:16 AM, Peter Robinson pbrobinson@fedoraproject.org wrote:
commit c2a5d382a8a063910f661f0368e463b780a4c3e2 Author: Peter Robinson pbrobinson@gmail.com 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.
And now Dave, with his amazing ability to break things, has broken the FF merges with an update to the info cow. Oh well. Now just use 'git checkout f20; git cherry-pick master' instead I suppose.
josh
kernel@lists.fedoraproject.org