Double commits in i2c/for-next branch?

Double commits in i2c/for-next branch?

[Masahiro Yamada]

Hi Wolfram,

I noticed my patch was applied twice in the next branch
with different commit IDs.



[1] commit 6a62974b667f3976ec44e255bed31746cca1ff51
Author: Masahiro Yamada <yamada.masahiro@socionext.com>
Date:   Fri Oct 23 19:52:00 2015 +0900

    i2c: uniphier_f: add UniPhier FIFO-builtin I2C driver


[2] commit f496cf367b613c94e40893e07e1b20470deb9363
Author: Masahiro Yamada <yamada.masahiro@socionext.com>
Date:   Fri Oct 23 19:52:00 2015 +0900

    i2c: uniphier_f: add UniPhier FIFO-builtin I2C driver



Please let me confirm if I correctly understood
the branch strategy of this subsystem.



[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.


[2] was directly applied to i2c/for-next and
won't be pulled into the mainline.  It will only
remain in linux-next.



Is this correct?





-- 
Best Regards
Masahiro Yamada

Re: Double commits in i2c/for-next branch?

[Wolfram Sang]

[-- 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 --]

Re: Double commits in i2c/for-next branch?

[Masahiro Yamada]

Hi Wolfram,

2015-11-02 14:50 GMT+09:00 Wolfram Sang <wsa@the-dreams.de>:
>
>> [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,

Understood.

Thanks!




-- 
Best Regards
Masahiro Yamada