linux-kernel - Re: [GIT] Networking

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: <20110310.163434.260095615.davem@davemloft.net>
Date:	Thu, 10 Mar 2011 16:34:34 -0800 (PST)
From:	David Miller <davem@...emloft.net>
To:	torvalds@...ux-foundation.org
Cc:	akpm@...ux-foundation.org, netdev@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: Re: [GIT] Networking

From: Linus Torvalds <torvalds@...ux-foundation.org>
Date: Thu, 10 Mar 2011 16:29:30 -0800

> On Thu, Mar 10, 2011 at 3:55 PM, David Miller <davem@...emloft.net> wrote:
>> I should have put:
>>
>>        Merge to get commit 8909c9ad8ff03611c9c96c9a92656213e4bb495b
>>        ("net: don't allow CAP_NET_ADMIN to load non-netdev kernel modules")
>>        so that we can add Stephen Hemminger's fix to handle ip6 tunnels
>>        as well, which uses the MODULE_ALIAS_NETDEV() macro created by
>>        that change.
> 
> Yeah, that would have explained it. That said, if you are merging for
> something like that, may I suggest actually starting off with
> 
>    git merge 8909c9ad8ff03611c9c96c9a92656213e4bb495b
> 
> that then actually makes the history itself also show the relationship
> (you'd still have to write the commit message explaining why,
> otherwise git will try to be "helpful" by making the merge commit
> message be
> 
>    Merge commit '8909c9ad8ff03611c9c96c9a92656213e4bb495b'
> 
> which while _technically_ more useful and indicative of what you
> wanted to do isn't actually any more readable than the one you have
> now.
> 
> But the reason it would have been better is that it would literally
> have made the git commit parenthood point to the commit you actually
> care about.

So, this is like a cherry-pick of sorts that doesn't create new commits?
It just makes the merge commit, and that's where I explain why I need this
particular change in my tree.

Right?
--
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/