[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [dm-devel] [git pull] device-mapper changes for 3.11



On Thu, 11 Jul 2013 02:34:48 +0100 Alasdair G Kergon <agk redhat com> wrote:
>
> Please pull from:
>  
>   git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm tags/dm-3.11-changes
> 
> to get the following device-mapper changes for 3.11.

The device-mapper tree exists as a quilt series in linux-next.  The
patches in the above git tree are the same as the ones in linux-next, but
have a different base (and the ones in linux-next were on a different
base from yesterday as well). :-(

Alistair, is there some reason that you cannot maintain some relatively
stable git tree for me to fetch (instead of the quilt series).  Also,
there is not real reason to keep rebasing this stuff (especially just
before sending it to Linus).

If you want to test for conflicts before submission, then, fine, do that
in a test branch by *merging* Linus' tree (git is good for that), but send
Linus your pre merged branch and if there is some complex conflict, then
explain it to him (and me if necessary) or publish your test branch
separately to show your suggested resolution.

-- 
Cheers,
Stephen Rothwell                    sfr canb auug org au

Attachment: pgpb3N1Kmf8mc.pgp
Description: PGP signature


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]