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]
Date:	Thu, 6 Mar 2014 22:47:47 -0500
From:	Jason Cooper <jason@...edaemon.net>
To:	Linus Walleij <linus.walleij@...aro.org>
Cc:	Mark Rutland <mark.rutland@....com>, Andrew Lunn <andrew@...n.ch>,
	Russell King <linux@....linux.org.uk>,
	Pawel Moll <pawel.moll@....com>,
	Ian Campbell <ijc+devicetree@...lion.org.uk>,
	"linux-doc@...r.kernel.org" <linux-doc@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"devicetree@...r.kernel.org" <devicetree@...r.kernel.org>,
	Rob Herring <robh+dt@...nel.org>,
	Rob Landley <rob@...dley.net>,
	Kumar Gala <galak@...eaurora.org>,
	Gregory Clement <gregory.clement@...e-electrons.com>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>,
	Sebastian Hesselbarth <sebastian.hesselbarth@...il.com>
Subject: Re: [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from
 Dove pinctrl

On Thu, Mar 06, 2014 at 09:16:33PM -0500, Jason Cooper wrote:
> On Fri, Mar 07, 2014 at 09:26:48AM +0800, Linus Walleij wrote:
> > On Wed, Feb 26, 2014 at 10:53 PM, Jason Cooper <jason@...edaemon.net> wrote:
...
> > > I'm a little confused by this.  Once you merge the branch into one of
> > > yours, that merge commit is a part of the history.
> > 
> > Yes this has been discussed in the past.
> 
> Would you have a link handy?  My first thought was to create a tag, eg
> "Sent-through: subsystem <maintainer@...mple.com>" that I would add to
> patches as I pull them in.  After all, I know where I'm sending them.
> Or should at any rate.
> 
> > But when a developer bisects down to a certain commit and just looks
> > at it with git log there is no telling which subsystem this thing came
> > from and who actually funnelled it to Torvalds.
> 
> True.
> 
> > I do know you *can* find that out with some git magic, the problem
> > is that it is so magic that most developers don't know it and just
> > look at the signoffs.
> 
> It would be helpful if there were a complement to 'git merge-base', say
> 'git merge-tip' to point to the merge commit that joined the branch
> containing commit X.
> 
> Run in succession, it would yield committers me (I merged pinctrl-dove
> into pinctrl), you, Torvalds.

grrr.  Couldn't let it go.  If you add this alias:

  merged-by-who = log --ancestry-path --reverse --merges --format=\"%h %cD \\\"%cN <%cE>\\\"\"

to you ~/.gitconfig, then

$ git merged-by-who 2c4b229bafcf..pinctrl/for-next
08d4f0c8b131 Sat, 1 Mar 2014 07:03:36 +0000 "Jason Cooper <jason@...edaemon.net>"
7cab36e5eee9 Sat, 1 Mar 2014 07:03:52 +0000 "Jason Cooper <jason@...edaemon.net>"
cdfe3175eb90 Mon, 3 Mar 2014 13:39:20 +0800 "Linus Walleij <linus.walleij@...aro.org>"
a9ea2ed45a22 Mon, 3 Mar 2014 13:40:22 +0800 "Linus Walleij <linus.walleij@...aro.org>"
7bd0df13646d Wed, 5 Mar 2014 17:12:17 +0800 "Linus Walleij <linus.walleij@...aro.org>"

Once it makes it to mainline, one could use origin/master for the bottom
commit.

thx,

Jason.
--
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/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ