public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [GIT] kbuild misc updates for 2.6.38-rc1
@ 2011-01-07 23:04 Michal Marek
  2011-01-07 23:27 ` Uwe Kleine-König
  0 siblings, 1 reply; 5+ messages in thread
From: Michal Marek @ 2011-01-07 23:04 UTC (permalink / raw)
  To: Linus Torvalds
  Cc: ak, akpm, jonas.aberg, julia, u.kleine-koenig, xiyou.wangcong,
	yann.morin.1998, linux-kbuild, linux-kernel

Hi Linus,

remaining patches that fit nowhere else. Like with the other kbuild branches,
it's quite boring this time and it's not a lot of commits. 

Michal

The following changes since commit c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4:

  Linux 2.6.37-rc1 (2010-11-01 07:54:12 -0400)

are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git misc

Américo Wang (1):
      gitignore: add scripts/recordmcount

Andi Kleen (1):
      Kconfig: fix single letter command in scripts/config

Jonas Aaberg (1):
      kbuild: add numeric --set-val option to scripts/config

Julia Lawall (1):
      scripts/coccinelle: update for compatability with Coccinelle 0.2.4

Uwe Kleine-König (1):
      tags: put function prototypes back!

Yann E. MORIN (1):
      Documentation/kbuild: add info that 'choice' can have a symbol name

akpm@linux-foundation.org (2):
      headers_check: better search for functions in headers
      headers_check: Fix warning text

 Documentation/coccinelle.txt              |    4 +++
 Documentation/kbuild/kconfig-language.txt |    6 +++-
 scripts/.gitignore                        |    1 +
 scripts/coccinelle/misc/doubleinit.cocci  |    6 ++--
 scripts/coccinelle/null/deref_null.cocci  |   39 ++++++++++------------------
 scripts/config                            |   13 +++++++--
 scripts/headers_check.pl                  |    6 ++--
 scripts/tags.sh                           |    2 +-
 8 files changed, 41 insertions(+), 36 deletions(-)

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [GIT] kbuild misc updates for 2.6.38-rc1
  2011-01-07 23:04 [GIT] kbuild misc updates for 2.6.38-rc1 Michal Marek
@ 2011-01-07 23:27 ` Uwe Kleine-König
  2011-01-07 23:35   ` Michal Marek
  0 siblings, 1 reply; 5+ messages in thread
From: Uwe Kleine-König @ 2011-01-07 23:27 UTC (permalink / raw)
  To: Michal Marek
  Cc: Linus Torvalds, ak, akpm, jonas.aberg, julia, xiyou.wangcong,
	yann.morin.1998, linux-kbuild, linux-kernel, Alexey Dobriyan

Hi Michal,

On Sat, Jan 08, 2011 at 12:04:26AM +0100, Michal Marek wrote:
> Uwe Kleine-König (1):
>       tags: put function prototypes back!
this is wrong.  It was Alexey who authored that patch.  I only pinged
and forwarded it a few times.

If you care to fix that:

	git filter-branch --env-filter 'if test "x$GIT_COMMIT" = "x0a18a9386c056028799938960f91be338c4ff349"; then GIT_AUTHOR_NAME="Alexey Dobriyan"; GIT_AUTHOR_EMAIL=adobriyan@gmail.com; export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL; fi' v2.6.37-rc1..misc

.  This is untested though, so you might want to double check the
result.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [GIT] kbuild misc updates for 2.6.38-rc1
  2011-01-07 23:27 ` Uwe Kleine-König
@ 2011-01-07 23:35   ` Michal Marek
  2011-01-08 16:24     ` Uwe Kleine-König
  2011-01-08 16:29     ` Alexey Dobriyan
  0 siblings, 2 replies; 5+ messages in thread
From: Michal Marek @ 2011-01-07 23:35 UTC (permalink / raw)
  To: Uwe Kleine-König
  Cc: Linus Torvalds, ak, akpm, jonas.aberg, julia, xiyou.wangcong,
	yann.morin.1998, linux-kbuild, linux-kernel, Alexey Dobriyan

On 8.1.2011 00:27, Uwe Kleine-König wrote:
> Hi Michal,
> 
> On Sat, Jan 08, 2011 at 12:04:26AM +0100, Michal Marek wrote:
>> Uwe Kleine-König (1):
>>       tags: put function prototypes back!
> this is wrong.  It was Alexey who authored that patch.  I only pinged
> and forwarded it a few times.

Grr. You should added a second From: header to the message body in that
case, git am supports this. Rewinding the branch while Linus is possibly
reviewing it might not be a great idea. Alexey, how much would it hurt
you if the commit stayed as is?

Michal
> 
> If you care to fix that:
> 
> 	git filter-branch --env-filter 'if test "x$GIT_COMMIT" = "x0a18a9386c056028799938960f91be338c4ff349"; then GIT_AUTHOR_NAME="Alexey Dobriyan"; GIT_AUTHOR_EMAIL=adobriyan@gmail.com; export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL; fi' v2.6.37-rc1..misc
> 
> .  This is untested though, so you might want to double check the
> result.
> 
> Best regards
> Uwe
> 


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [GIT] kbuild misc updates for 2.6.38-rc1
  2011-01-07 23:35   ` Michal Marek
@ 2011-01-08 16:24     ` Uwe Kleine-König
  2011-01-08 16:29     ` Alexey Dobriyan
  1 sibling, 0 replies; 5+ messages in thread
From: Uwe Kleine-König @ 2011-01-08 16:24 UTC (permalink / raw)
  To: Michal Marek, Alexey Dobriyan
  Cc: Linus Torvalds, ak, akpm, jonas.aberg, julia, xiyou.wangcong,
	yann.morin.1998, linux-kbuild, linux-kernel

Hi Michal, hi Alexey,

On Sat, Jan 08, 2011 at 12:35:05AM +0100, Michal Marek wrote:
> On 8.1.2011 00:27, Uwe Kleine-König wrote:
> > Hi Michal,
> > 
> > On Sat, Jan 08, 2011 at 12:04:26AM +0100, Michal Marek wrote:
> >> Uwe Kleine-König (1):
> >>       tags: put function prototypes back!
> > this is wrong.  It was Alexey who authored that patch.  I only pinged
> > and forwarded it a few times.
> 
> Grr. You should added a second From: header to the message body in that
> case, git am supports this. Rewinding the branch while Linus is possibly
> reviewing it might not be a great idea. Alexey, how much would it hurt
> you if the commit stayed as is?
hmm, actually I know that, and wonder why send-email didn't add it.

... some research ...  strange, in my repo I'm already the author for
this patch.  So it seems the error is really on my side.  I don't
remember but I guess git-am failed for me and then I commited without
taking care to keep the original author.  @Alexey: sorry for messing
this up.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [GIT] kbuild misc updates for 2.6.38-rc1
  2011-01-07 23:35   ` Michal Marek
  2011-01-08 16:24     ` Uwe Kleine-König
@ 2011-01-08 16:29     ` Alexey Dobriyan
  1 sibling, 0 replies; 5+ messages in thread
From: Alexey Dobriyan @ 2011-01-08 16:29 UTC (permalink / raw)
  To: Michal Marek
  Cc: Uwe Kleine-König, Linus Torvalds, ak, akpm, jonas.aberg,
	julia, xiyou.wangcong, yann.morin.1998, linux-kbuild,
	linux-kernel

On Sat, Jan 08, 2011 at 12:35:05AM +0100, Michal Marek wrote:
> Alexey, how much would it hurt you if the commit stayed as is?

Doesn't matter as long as I can have my prototypes back. :-)

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2011-01-08 16:29 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-07 23:04 [GIT] kbuild misc updates for 2.6.38-rc1 Michal Marek
2011-01-07 23:27 ` Uwe Kleine-König
2011-01-07 23:35   ` Michal Marek
2011-01-08 16:24     ` Uwe Kleine-König
2011-01-08 16:29     ` Alexey Dobriyan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox