public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Linus <torvalds@linux-foundation•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	James Morris <jmorris@namei•org>
Subject: linux-next: unneeded merge in the security tree
Date: Tue, 12 Mar 2013 10:09:50 +1100	[thread overview]
Message-ID: <20130312100950.e45ef0e721492ff0d5fd7c8d@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 715 bytes --]

Hi all,

[James, I am not picking on you, just using your tree to illustrate a
point.]

The top commit in the security tree today is a merge of v3.9-rc2.  This
is a completely unnecessary merge as the tree before the merge was a
subset of v3.9-rc1 and so if the merge had been done using anything but
the tag, it would have just been a fast forward.  I know that this is now
deliberate behaviour on git's behalf, but isn't there some way we can
make this easier on maintainers who are just really just trying to pick a
new starting point for their trees after a release?  (at least I assume
that is what James was trying to do)

-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2013-03-11 23:10 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-11 23:09 Stephen Rothwell [this message]
2013-03-12  4:10 ` linux-next: unneeded merge in the security tree James Morris
2013-03-12  4:16   ` Theodore Ts'o
2013-03-12  5:18     ` Stephen Rothwell
2013-03-12 13:25       ` Theodore Ts'o
2013-03-12 20:43       ` Junio C Hamano
2013-03-12  9:29     ` Sedat Dilek
2013-03-12 17:13     ` Linus Torvalds
2013-03-12 17:51       ` Geert Uytterhoeven
2013-03-12 19:49       ` Junio C Hamano
2013-03-12 20:02         ` Junio C Hamano
2013-03-12 21:20       ` Theodore Ts'o
2013-03-12 21:28         ` Linus Torvalds
2013-03-12 21:47           ` Junio C Hamano
2013-03-12 21:54             ` Linus Torvalds
2013-03-12 22:00               ` Junio C Hamano
2013-03-13  2:30           ` Theodore Ts'o
2013-03-13  3:17             ` Junio C Hamano
2013-03-12 21:30         ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130312100950.e45ef0e721492ff0d5fd7c8d@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=jmorris@namei$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=torvalds@linux-foundation$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox