From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mauro Carvalho Chehab <mchehab@osg•samsung.com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linus <torvalds@linux-foundation•org>
Subject: linux-next: unnecessary merge in the v4l-dvb tree
Date: Tue, 13 Feb 2018 08:00:36 +1100 [thread overview]
Message-ID: <20180213080036.3bf3a908@canb.auug.org.au> (raw)
Hi Mauro,
By merging the v4.16-rc1 tag into the v4l-dvb tree, you have created an
unnecessary merge commit. The v4l-dvb tree was already contained in
v4.16-rc1, so a fast forward merge was possible, but explicitly merging
a signed tag will give you a commit instead. In this case, you could
have just reset your branch to v4.16-rc1 or merged v4.16-rc1^0.
Linus, this happens a bit after the merge window, so I am wondering
about the rational of not doing a fast forward merge when merging a
signed tag (I forget the reasoning).
--
Cheers,
Stephen Rothwell
next reply other threads:[~2018-02-12 21:00 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-12 21:00 Stephen Rothwell [this message]
2018-02-12 21:15 ` linux-next: unnecessary merge in the v4l-dvb tree Linus Torvalds
2018-02-12 21:36 ` Mauro Carvalho Chehab
2018-02-12 21:37 ` Linus Torvalds
2018-02-12 21:44 ` Junio C Hamano
2018-02-12 21:59 ` Linus Torvalds
2018-02-12 23:42 ` Junio C Hamano
2018-02-13 0:21 ` Mauro Carvalho Chehab
2018-02-13 17:18 ` Junio C Hamano
2018-02-13 17:33 ` Linus Torvalds
2018-02-14 18:12 ` Junio C Hamano
2018-02-12 21:37 ` Junio C Hamano
2018-02-12 21:27 ` Mauro Carvalho Chehab
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=20180213080036.3bf3a908@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@osg$(echo .)samsung.com \
--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