linux-kernel - Re: [GIT PULL] 9p changes fro merge window

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAOJsxLGQmK7PvdMaKu9ezPDmeHPaKMCSb5izK5p5tTatmLbptg@mail.gmail.com>
Date:	Wed, 26 Oct 2011 16:00:13 +0300
From:	Pekka Enberg <penberg@...helsinki.fi>
To:	Eric Van Hensbergen <ericvh@...il.com>
Cc:	Linus Torvalds <torvalds@...ux-foundation.org>,
	V9FS Developers <v9fs-developer@...ts.sourceforge.net>,
	linux-kernel <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] 9p changes fro merge window

Hi Eric,

On Wed, Oct 26, 2011 at 3:48 PM, Eric Van Hensbergen <ericvh@...il.com> wrote:
> What's the preferred maintainer workflow?  I had been fetching and then rebasing, which
> seemed to keep my shortlog clean of merge commits and the outstanding patches
> towards the top.  Should I just be pulling from upstream and not caring about the merge
> commits?

I don't know if mine is the preferred workflow but what I usually do is:

  1. Send a pull request to Linus in a separate throw-away branch
      that's an exact copy of my "next" branch.

  2. Wait until -rc1 is out and git reset my "next" branch to that.

  3. Apply patches on top of the "next" branch. I never rebase or
      do merges from Linus tree to the branch.

  4. Once the merge window opens, goto 1.

[ Actually, I sometimes have multiple "next" topic branches if there's a risk
  that I need to back out some of the changes from linux-next in the middle
   of the merge cycle. ]

                        Pekka
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/