* linux-next: upcoming conflict between the target-updates and target-bva trees
@ 2017-06-02 3:39 Stephen Rothwell
2017-06-02 4:03 ` Nicholas A. Bellinger
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2017-06-02 3:39 UTC (permalink / raw)
To: Nicholas A. Bellinger, Bart Van Assche
Cc: Linux Next Mailing List, Linux Kernel Mailing List
Hi all,
Last night the tagret-bva tree was rebased on top of the target-updates
tree. Just now, part of the target-updates tree has been rewritten.
So now I expect to get conflict(s) when I merge these trees since the
commits in the target-updates tree are no longer the same as those that
the target-bva tree was rebased on top of.
Please take a little time to sort out your development process.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: upcoming conflict between the target-updates and target-bva trees
2017-06-02 3:39 linux-next: upcoming conflict between the target-updates and target-bva trees Stephen Rothwell
@ 2017-06-02 4:03 ` Nicholas A. Bellinger
2017-06-02 4:55 ` Bart Van Assche
0 siblings, 1 reply; 3+ messages in thread
From: Nicholas A. Bellinger @ 2017-06-02 4:03 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Bart Van Assche, Linux Next Mailing List,
Linux Kernel Mailing List
On Fri, 2017-06-02 at 13:39 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Last night the tagret-bva tree was rebased on top of the target-updates
> tree. Just now, part of the target-updates tree has been rewritten.
> So now I expect to get conflict(s) when I merge these trees since the
> commits in the target-updates tree are no longer the same as those that
> the target-bva tree was rebased on top of.
>
> Please take a little time to sort out your development process.
>
Unfortunately, this is going to continue to be a problem once these
patches are list reviewed, and included in target-updates.
Bart, can you please drop the patches until they are list reviewed so
there isn't a constant stream of merge conflicts in linux-next for your
un-reviewed code..?
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: upcoming conflict between the target-updates and target-bva trees
2017-06-02 4:03 ` Nicholas A. Bellinger
@ 2017-06-02 4:55 ` Bart Van Assche
0 siblings, 0 replies; 3+ messages in thread
From: Bart Van Assche @ 2017-06-02 4:55 UTC (permalink / raw)
To: Nicholas A. Bellinger, Stephen Rothwell
Cc: Linux Next Mailing List, Linux Kernel Mailing List
On 06/01/17 21:03, Nicholas A. Bellinger wrote:
> On Fri, 2017-06-02 at 13:39 +1000, Stephen Rothwell wrote:
>> Last night the target-bva tree was rebased on top of the target-updates
>> tree. Just now, part of the target-updates tree has been rewritten.
>> So now I expect to get conflict(s) when I merge these trees since the
>> commits in the target-updates tree are no longer the same as those that
>> the target-bva tree was rebased on top of.
>>
>> Please take a little time to sort out your development process.
>
> Unfortunately, this is going to continue to be a problem once these
> patches are list reviewed, and included in target-updates.
>
> Bart, can you please drop the patches?
Hello Stephen and Nic,
I have just reset that branch to v4.12-rc1. Sorry for the inconvenience.
Bart.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-06-02 5:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-02 3:39 linux-next: upcoming conflict between the target-updates and target-bva trees Stephen Rothwell
2017-06-02 4:03 ` Nicholas A. Bellinger
2017-06-02 4:55 ` Bart Van Assche
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox