From: Wolfram Sang <wsa@the-dreams.de>
To: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: linux-i2c@vger.kernel.org
Subject: Re: Double commits in i2c/for-next branch?
Date: Mon, 2 Nov 2015 06:50:52 +0100 [thread overview]
Message-ID: <20151102055051.GA1065@tetsubishi> (raw)
In-Reply-To: <CAK7LNATkMPJOBABg9TH69Z2gEfudvk_jQHkE-j5QZLevdzBW9A@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 524 bytes --]
> [1] was applied to i2c/for-4.4 and then merged
> into i2c/for-next. It is supposed to be pulled
> into the mainline in this merge window.
Yes.
> [2] was directly applied to i2c/for-next and
> won't be pulled into the mainline. It will only
> remain in linux-next.
Unfortunately, I had to rebase for-4.4 this time :( I try to avoid it,
but sometimes this happens. When I merge that rebased version into
for-next, double commits happen. Linus will get the pull request for
for-4.4 only.
Hope that helps,
Wolfram
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2015-11-02 5:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-02 2:44 Double commits in i2c/for-next branch? Masahiro Yamada
2015-11-02 5:50 ` Wolfram Sang [this message]
2015-11-02 5:54 ` Masahiro Yamada
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=20151102055051.GA1065@tetsubishi \
--to=wsa@the-dreams.de \
--cc=linux-i2c@vger.kernel.org \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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