From owner-freebsd-x11@freebsd.org  Tue Dec 29 08:26:30 2015
Return-Path: <owner-freebsd-x11@freebsd.org>
Delivered-To: freebsd-x11@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3310FA52C66
 for <freebsd-x11@mailman.ysv.freebsd.org>;
 Tue, 29 Dec 2015 08:26:30 +0000 (UTC)
 (envelope-from 6yearold@gmail.com)
Received: from mail-wm0-x229.google.com (mail-wm0-x229.google.com
 [IPv6:2a00:1450:400c:c09::229])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id C7C0F1517
 for <freebsd-x11@freebsd.org>; Tue, 29 Dec 2015 08:26:29 +0000 (UTC)
 (envelope-from 6yearold@gmail.com)
Received: by mail-wm0-x229.google.com with SMTP id f206so30848143wmf.0
 for <freebsd-x11@freebsd.org>; Tue, 29 Dec 2015 00:26:29 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:from:date:message-id:subject:to:content-type;
 bh=zRTENp6/JqblctvTabjbJ5T0JiKv443bL3oIN2UCJWI=;
 b=dHBh1St4MwZ6Ptp40jsBEKOQ5qafSJz+syGkTz6e20dCvsr0klvl8MmK82W6Q1OT42
 /PQIQCG12Ju8fKpoYdS8uvTZcROFQNrzF8TYp6LzoCW+ar2f75C8zmoa1Eh0gYM5vfmy
 rDTd4RgYdgpplo+Qa38ZJo4wfeZzE8ImqdiJ7cxiEBRLSwVcugGLG5Stb2pIcZ5XpZir
 vH+2O/jwyg4TiagmmiWJRKrFG1Hgb9nfYKx/DK9tWk5tQ53cDeEurHBCQp85jslufHsP
 lD2zbvzif04hTtVc/sdRaBhrwDa2vUJ4BVmG8CX2blZcYxKkKNGk6/5Ai9mdXH2GAkV0
 XtMg==
X-Received: by 10.28.54.209 with SMTP id y78mr9523143wmh.26.1451377588197;
 Tue, 29 Dec 2015 00:26:28 -0800 (PST)
MIME-Version: 1.0
Received: by 10.28.149.146 with HTTP; Tue, 29 Dec 2015 00:25:58 -0800 (PST)
From: Gleb Popov <6yearold@gmail.com>
Date: Tue, 29 Dec 2015 11:25:58 +0300
Message-ID: <CALH631kyYyKyJGhoLmu+yQJMgWctnVdzgZ93Bi9uSS7bs=QyFw@mail.gmail.com>
Subject: Re: Contributing to the kernel video drivers
To: freebsd-x11@freebsd.org
Content-Type: text/plain; charset=UTF-8
X-Content-Filtered-By: Mailman/MimeDel 2.1.20
X-BeenThere: freebsd-x11@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: X11 on FreeBSD -- maintaining and support <freebsd-x11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-x11>,
 <mailto:freebsd-x11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-x11/>
List-Post: <mailto:freebsd-x11@freebsd.org>
List-Help: <mailto:freebsd-x11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
 <mailto:freebsd-x11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Dec 2015 08:26:30 -0000

My 2 cents about commit-by-commit approach. Because patch composition is an
associative operation (read: because we have rebase functionality), this
workflow can actually be parallelized.

Let LB be the last ported commit from Linux repo and FB the corresponding
commit in FreeBSD repo. The dev picks whatever child commit LCn of LB he is
interested in, ports it and places it (lets name it FCn) somewhere in
FreeBSD repo (let it be an individual branch). Until all LC(n-1) commits
between LB and LCn are also ported (read turn into FC(n-1), FCn remains in
this "detached" state, and when all FC(n-1) are in place we rebase this
chain on top of FB, advancing FB tag to the FCn.

This way we can still have 1:1 history correspondence between Linux and
FreeBSD changes as well as distribute work between developers. I even
imagine some script to keep track of "detached" commits and automatically
rebase them.

What do you think?