Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1439100 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2016-07-08 06:30 +0200 |
| Last post | 2016-07-08 08:40 +0200 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: please clean up the lightnvm tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-08 06:30 +0200
Re: linux-next: please clean up the lightnvm tree Matias Bjørling <m@bjorling.me> - 2016-07-08 06:40 +0200
Re: linux-next: please clean up the lightnvm tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-08 08:40 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-07-08 06:30 +0200 |
| Subject | linux-next: please clean up the lightnvm tree |
| Message-ID | <rSvAl-8h4-17@gated-at.bofh.it> |
Hi Matias, I noticed that the commits in the lightnvm tree have been applied to the block tree as a series of patches (i.e. effectively rebased). Could you please remove all the duplicate patches from the lightnvm tree (which I think is the whole tree, curretly) before they start causing merge conflicts for me. One way to do this would be to rebase your tree on top of the block tree. -- Cheers, Stephen Rothwell
[toc] | [next] | [standalone]
| From | Matias Bjørling <m@bjorling.me> |
|---|---|
| Date | 2016-07-08 06:40 +0200 |
| Message-ID | <rSvK1-8ka-1@gated-at.bofh.it> |
| In reply to | #1439100 |
On 07/08/2016 06:22 AM, Stephen Rothwell wrote: > Hi Matias, > > I noticed that the commits in the lightnvm tree have been applied > to the block tree as a series of patches (i.e. effectively rebased). > Could you please remove all the duplicate patches from the lightnvm tree > (which I think is the whole tree, curretly) before they start causing > merge conflicts for me. > > One way to do this would be to rebase your tree on top of the block tree. > Thanks Stephen. Updated the for-next. I will make sure they are taken off if applied directly to the block tree in the future.
[toc] | [prev] | [next] | [standalone]
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-07-08 08:40 +0200 |
| Message-ID | <rSxC9-16m-5@gated-at.bofh.it> |
| In reply to | #1439101 |
Hi Matias, On Fri, 8 Jul 2016 06:30:59 +0200 Matias Bjørling <m@bjorling.me> wrote: > > Thanks Stephen. Updated the for-next. I will make sure they are taken > off if applied directly to the block tree in the future. Tnanks. -- Cheers, Stephen Rothwell
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web