On Wed, Sep 08, 2010 at 05:10:50PM +1000, doiggl@velocitynet.com.au wrote:
+ exec rpmbuild -ba --define '_srcdefattr (-,root,root)' --define
'disturl
obs://build.opensuse.org/Kernel:openSUSE-11.3/openSUSE_11.3/40e283318c6c9575ca6420b4a6b8d54e-kernel-vanilla'
/usr/src/packages/SOURCES/kernel-vanilla.spec
error: %changelog not in descending chronological order
Seems like Jiri did a rebase but put the .changes entry on top:
commit 17308ddd77069a8cc65309388e4d7847d6a7c487
Author: Jiri Slaby
AuthorDate: Sun Aug 15 15:01:08 2010 +0200
Commit: Jiri Slaby
CommitDate: Tue Aug 31 15:14:38 2010 +0200
- patches.fixes/ath5k-Fix-TX-RX-padding.patch: ath5k: Fix TX/RX
padding for all frames (bnc#635862).
diff --git a/kernel-source.changes b/kernel-source.changes
index 4d9d346..088764d 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,47 @@
-------------------------------------------------------------------
+Sun Aug 15 15:00:57 CEST 2010 - jslaby@suse.de
^^^^^^
+
+- patches.fixes/ath5k-Fix-TX-RX-padding.patch: ath5k: Fix TX/RX
+ padding for all frames (bnc#635862).
[...]
+
+-------------------------------------------------------------------
Fri Aug 20 19:20:25 CEST 2010 - jeffm@suse.de
^^^^^^
Jiri, we have a script to automatically merge kernel-source.changes
conflicts and properly sort the entries. If you run
scripts/install-git-hooks, it will configure git to use it, otherwise
read the comment in scripts/rpm-changes-merge.pl. I fixed the current
breakage with
$ scripts/rpm-changes-merge.pl -1 kernel-source.changes
Michal
--
To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-kernel+help@opensuse.org