Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1655880
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | linux-next: upcoming conflict between the target-updates and target-bva trees |
| Date | 2017-06-02 05:40 +0200 |
| Message-ID | <tNLBn-3BC-5@gated-at.bofh.it> (permalink) |
| Organization | linux.* mail to news gateway |
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
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
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
csiph-web