Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1655880 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2017-06-02 05:40 +0200 |
| Last post | 2017-06-02 07:20 +0200 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
linux-next: upcoming conflict between the target-updates and target-bva trees Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-02 05:40 +0200
Re: linux-next: upcoming conflict between the target-updates and target-bva trees "Nicholas A. Bellinger" <nab@linux-iscsi.org> - 2017-06-02 06:10 +0200
Re: linux-next: upcoming conflict between the target-updates and target-bva trees Bart Van Assche <bvanassche@acm.org> - 2017-06-02 07:20 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2017-06-02 05:40 +0200 |
| Subject | linux-next: upcoming conflict between the target-updates and target-bva trees |
| Message-ID | <tNLBn-3BC-5@gated-at.bofh.it> |
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
[toc] | [next] | [standalone]
| From | "Nicholas A. Bellinger" <nab@linux-iscsi.org> |
|---|---|
| Date | 2017-06-02 06:10 +0200 |
| Message-ID | <tNM4q-40b-11@gated-at.bofh.it> |
| In reply to | #1655880 |
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..?
[toc] | [prev] | [next] | [standalone]
| From | Bart Van Assche <bvanassche@acm.org> |
|---|---|
| Date | 2017-06-02 07:20 +0200 |
| Subject | Re: linux-next: upcoming conflict between the target-updates and target-bva trees |
| Message-ID | <tNNaa-4HT-9@gated-at.bofh.it> |
| In reply to | #1655889 |
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.
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web