linux-kernel - Re: [GIT PULL] XFS update for 3.4-rc1

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 for Android: free password hash cracker in your pocket

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

Date:	Wed, 21 Mar 2012 15:59:49 -0700
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Ben Myers <bpm@....com>
Cc:	akpm@...ux-foundation.org, linux-kernel@...r.kernel.org,
	xfs@....sgi.com
Subject: Re: [GIT PULL] XFS update for 3.4-rc1

On Wed, Mar 21, 2012 at 3:06 PM, Ben Myers <bpm@....com> wrote:
>
> xfs/master contains scalability improvements for dquots, log grant code
> cleanups, plus bugfixes and cleanups large and small.

Shortlog and diffstat?

> Unfortunately the stuff in:  git://oss.sgi.com/xfs/xfs master
>
> Conflicts with the stuff in:  git://oss.sgi.com/xfs/xfs for-linus

There's still nothng in 'for-linus'.

> I've resolved the conflict here:  git://oss.sgi.com/xfs/xfs for-linus-merged

I actually prefer to merge things myself to see what is up, especially
since everybody else writes horrible merge messages (but also because
I simply want to know what the conflicts are). I appreciate more
complex pull requests that *also* have a "pre-merged" branch just in
case (I tend to use that for verification if there was anything even
remotely questionable going on), but I really do not generally want
pre-merging.

I'm used to resolving conflicts. I'm so used to it, in fact, that
there have been cases where I did it right despite not really knowing
the code and the maintainer did it wrong, just because I know what to
look for.

> I would like to figure out how to
> 1) send important bugfixes upstream after rc1, and
> 2) not hold up development commits to xfs/master, while
> 3) avoiding conflicts like this.

Avoiding conflicts isn't that important. Getting too many of them
implies that there is something odd going on. But a few conflicts due
to upstream bugfixes are basically "normal". Judging by the merge I
see, there wasn't anything complicated going on.

                           Linus
--
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/