The kernel's code of conflict

Posted Mar 9, 2015 18:14 UTC (Mon) by aegl (subscriber, #37581)
In reply to: The kernel's code of conflict by knobunc
Parent article: The kernel's code of conflict

It was pulled by Linus from Greg's git tree - so no opportunity for Linus to change the commit comment.

Linus' merge commit is b0bc65729070b9cbdbb53ff042984a3c545a0e34 and includes some text that I presume was written by Linus:

[ Let's see how this works ]

The fact that Linus pulled this in is an Ack of sorts ... only this one change present, not like it was bundled with a ton of must have stuff the way Congress tries to hide things.

The kernel's code of conflict

Posted Mar 9, 2015 18:41 UTC (Mon) by PaXTeam (guest, #24616) [Link] (1 responses)

> so no opportunity for Linus to change the commit comment.

acks are sent *before* the commit, presumably Linus (and others) had ample opportunity to give theirs in time...

The kernel's code of conflict

Posted Mar 11, 2015 12:28 UTC (Wed) by JoePerches (guest, #101448) [Link]

I find it unfortunate that there was no discussion of this "Code of Conflict" on lkml.

Acks were done atypically.