linux-kernel - Re: [ALSA PATCH] alsa-git merge request

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] [day] [month] [year] [list]

Date:	Sat, 11 Oct 2008 12:21:17 +0200
From:	Takashi Iwai <tiwai@...e.de>
To:	Jaroslav Kysela <perex@...ex.cz>
Cc:	Linus Torvalds <torvalds@...l.org>,
	LKML <linux-kernel@...r.kernel.org>
Subject: Re: [ALSA PATCH] alsa-git merge request

At Fri, 10 Oct 2008 14:12:18 +0200 (CEST),
Jaroslav Kysela wrote:
> 
> Linus, please pull from:
> 
>   git pull git://git.alsa-project.org/alsa-kernel.git for-linus
> 
> gitweb interface:
> 
>   http://git.alsa-project.org/?p=alsa-kernel.git;a=shortlog;h=for-linus
> 
> The GNU patch is available at:
> 
>   ftp://ftp.alsa-project.org/pub/kernel-patches/alsa-git-for-linus-2008-10-10.patch.gz
>   
> The following files will be updated:

[Too bad that we had a power cut over a day long, so I couldn't react
 quickly until now...]

Good to see you send the pull request fast.

As far as I looked at it, some recent commits are missing in this
tree.  And, this tree would give a conflict with the update of Sparc
tree from Dave. 
But, if Linus already pulled it, then it's fine, I'll prepare the next
pull stuff later.

*HOWEVER*: Jaroslav, please change your GIT management style to the
normal one.
You cherry-pick each commit on my git tree into yours,
i.e. effectively rebase and break the whole clean topic branches on my
git tree[*] (and even worse, you rebase at each time you sync, so it
breaks doubly!).

"Divide & conquer" is definitely no good way for GIT.  "Pull & merge"
is the standard way.

So, I sincerely hope you'll switch to that normal style in future.

thanks,

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