Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1304200 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2016-01-08 07:00 +0100 |
| Last post | 2016-01-08 08:40 +0100 |
| Articles | 7 — 3 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the akpm-current tree with the vhost tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-08 07:00 +0100
Re: linux-next: manual merge of the akpm-current tree with the vhost tree "Michael S. Tsirkin" <mst@redhat.com> - 2016-01-08 07:50 +0100
Re: linux-next: manual merge of the akpm-current tree with the vhost tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-08 08:00 +0100
Re: linux-next: manual merge of the akpm-current tree with the vhost tree "Michael S. Tsirkin" <mst@redhat.com> - 2016-01-08 08:10 +0100
Re: linux-next: manual merge of the akpm-current tree with the vhost tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-08 08:30 +0100
Re: linux-next: manual merge of the akpm-current tree with the vhost tree Minchan Kim <minchan@kernel.org> - 2016-01-08 08:20 +0100
Re: linux-next: manual merge of the akpm-current tree with the vhost tree "Michael S. Tsirkin" <mst@redhat.com> - 2016-01-08 08:40 +0100
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-01-08 07:00 +0100 |
| Subject | linux-next: manual merge of the akpm-current tree with the vhost tree |
| Message-ID | <qOyfE-2im-3@gated-at.bofh.it> |
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
mm/balloon_compaction.c
between commit:
0b5ffdb4f7c6 ("balloon: fix page list locking")
from the vhost tree and commit:
0c983ec0c078 ("virtio_balloon: fix race between migration and ballooning")
from the akpm-current tree.
I fixed it up (I think that the former is a superset of the latter, so
I used that, completely reversing the latter patch) and can carry the
fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[toc] | [next] | [standalone]
| From | "Michael S. Tsirkin" <mst@redhat.com> |
|---|---|
| Date | 2016-01-08 07:50 +0100 |
| Message-ID | <qOz22-2Tw-1@gated-at.bofh.it> |
| In reply to | #1304200 |
On Fri, Jan 08, 2016 at 04:59:08PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> mm/balloon_compaction.c
>
> between commit:
>
> 0b5ffdb4f7c6 ("balloon: fix page list locking")
>
> from the vhost tree and commit:
>
> 0c983ec0c078 ("virtio_balloon: fix race between migration and ballooning")
>
> from the akpm-current tree.
>
> I fixed it up (I think that the former is a superset of the latter, so
> I used that, completely reversing the latter patch) and can carry the
> fix as necessary (no action is required).
Oops, it isn't.
Andrew, your tree seems to still carry original patch by Minchan Kim:
0c983ec0c078ed5d5c219cf97af06364e7a8e19f
I reported on list that it has a deadlock:
http://article.gmane.org/gmane.linux.kernel.stable/159208
I think it should be reverted and my patch applied - it's in my tree
but if you prefer it in yours instead, please let me know.
Thanks!
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
[toc] | [prev] | [next] | [standalone]
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-01-08 08:00 +0100 |
| Subject | Re: linux-next: manual merge of the akpm-current tree with the vhost tree |
| Message-ID | <qOzbI-2Yr-11@gated-at.bofh.it> |
| In reply to | #1304206 |
Hi Michael,
On Fri, 8 Jan 2016 08:46:15 +0200 "Michael S. Tsirkin" <mst@redhat.com> wrote:
>
> On Fri, Jan 08, 2016 at 04:59:08PM +1100, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the akpm-current tree got a conflict in:
> >
> > mm/balloon_compaction.c
> >
> > between commit:
> >
> > 0b5ffdb4f7c6 ("balloon: fix page list locking")
> >
> > from the vhost tree and commit:
> >
> > 0c983ec0c078 ("virtio_balloon: fix race between migration and ballooning")
> >
> > from the akpm-current tree.
> >
> > I fixed it up (I think that the former is a superset of the latter, so
> > I used that, completely reversing the latter patch) and can carry the
> > fix as necessary (no action is required).
>
> Oops, it isn't.
>
> Andrew, your tree seems to still carry original patch by Minchan Kim:
>
> 0c983ec0c078ed5d5c219cf97af06364e7a8e19f
>
> I reported on list that it has a deadlock:
> http://article.gmane.org/gmane.linux.kernel.stable/159208
>
> I think it should be reverted and my patch applied - it's in my tree
> but if you prefer it in yours instead, please let me know.
That is what I effectively did in today's tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
\
[toc] | [prev] | [next] | [standalone]
| From | "Michael S. Tsirkin" <mst@redhat.com> |
|---|---|
| Date | 2016-01-08 08:10 +0100 |
| Message-ID | <qOzlo-3id-7@gated-at.bofh.it> |
| In reply to | #1304212 |
On Fri, Jan 08, 2016 at 05:50:11PM +1100, Stephen Rothwell wrote:
> Hi Michael,
>
> On Fri, 8 Jan 2016 08:46:15 +0200 "Michael S. Tsirkin" <mst@redhat.com> wrote:
> >
> > On Fri, Jan 08, 2016 at 04:59:08PM +1100, Stephen Rothwell wrote:
> > >
> > > Today's linux-next merge of the akpm-current tree got a conflict in:
> > >
> > > mm/balloon_compaction.c
> > >
> > > between commit:
> > >
> > > 0b5ffdb4f7c6 ("balloon: fix page list locking")
> > >
> > > from the vhost tree and commit:
> > >
> > > 0c983ec0c078 ("virtio_balloon: fix race between migration and ballooning")
> > >
> > > from the akpm-current tree.
> > >
> > > I fixed it up (I think that the former is a superset of the latter, so
> > > I used that, completely reversing the latter patch) and can carry the
> > > fix as necessary (no action is required).
> >
> > Oops, it isn't.
> >
> > Andrew, your tree seems to still carry original patch by Minchan Kim:
> >
> > 0c983ec0c078ed5d5c219cf97af06364e7a8e19f
> >
> > I reported on list that it has a deadlock:
> > http://article.gmane.org/gmane.linux.kernel.stable/159208
> >
> > I think it should be reverted and my patch applied - it's in my tree
> > but if you prefer it in yours instead, please let me know.
>
> That is what I effectively did in today's tree.
Ouch, looks like I can't read. Somehow I misread that and assumed the
reverse, fetched next-20160107 and saw the context there is wrong, but I
did not dig deeper. It seems that I was just hasty, and todays tree
isn't tagged yet.
Thanks!
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> \
[toc] | [prev] | [next] | [standalone]
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-01-08 08:30 +0100 |
| Subject | Re: linux-next: manual merge of the akpm-current tree with the vhost tree |
| Message-ID | <qOzEK-3rg-11@gated-at.bofh.it> |
| In reply to | #1304214 |
Hi Michael, On Fri, 8 Jan 2016 09:05:57 +0200 "Michael S. Tsirkin" <mst@redhat.com> wrote: > > Ouch, looks like I can't read. Somehow I misread that and assumed the > reverse, fetched next-20160107 and saw the context there is wrong, but I > did not dig deeper. It seems that I was just hasty, and todays tree > isn't tagged yet. Should be there now (barring mirroring delays). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
[toc] | [prev] | [next] | [standalone]
| From | Minchan Kim <minchan@kernel.org> |
|---|---|
| Date | 2016-01-08 08:20 +0100 |
| Message-ID | <qOzv3-3m3-7@gated-at.bofh.it> |
| In reply to | #1304206 |
On Fri, Jan 08, 2016 at 08:46:15AM +0200, Michael S. Tsirkin wrote:
> On Fri, Jan 08, 2016 at 04:59:08PM +1100, Stephen Rothwell wrote:
> > Hi Andrew,
> >
> > Today's linux-next merge of the akpm-current tree got a conflict in:
> >
> > mm/balloon_compaction.c
> >
> > between commit:
> >
> > 0b5ffdb4f7c6 ("balloon: fix page list locking")
> >
> > from the vhost tree and commit:
> >
> > 0c983ec0c078 ("virtio_balloon: fix race between migration and ballooning")
> >
> > from the akpm-current tree.
> >
> > I fixed it up (I think that the former is a superset of the latter, so
> > I used that, completely reversing the latter patch) and can carry the
> > fix as necessary (no action is required).
>
> Oops, it isn't.
>
> Andrew, your tree seems to still carry original patch by Minchan Kim:
>
> 0c983ec0c078ed5d5c219cf97af06364e7a8e19f
>
> I reported on list that it has a deadlock:
> http://article.gmane.org/gmane.linux.kernel.stable/159208
And I replied on your comment that it's not a deadlock but it seem
you lost my mail because you didn't reply to me.
Could you expalin why it's deadlock in my reply thread?
[toc] | [prev] | [next] | [standalone]
| From | "Michael S. Tsirkin" <mst@redhat.com> |
|---|---|
| Date | 2016-01-08 08:40 +0100 |
| Message-ID | <qOzOp-3uw-1@gated-at.bofh.it> |
| In reply to | #1304220 |
On Fri, Jan 08, 2016 at 04:17:06PM +0900, Minchan Kim wrote:
> On Fri, Jan 08, 2016 at 08:46:15AM +0200, Michael S. Tsirkin wrote:
> > On Fri, Jan 08, 2016 at 04:59:08PM +1100, Stephen Rothwell wrote:
> > > Hi Andrew,
> > >
> > > Today's linux-next merge of the akpm-current tree got a conflict in:
> > >
> > > mm/balloon_compaction.c
> > >
> > > between commit:
> > >
> > > 0b5ffdb4f7c6 ("balloon: fix page list locking")
> > >
> > > from the vhost tree and commit:
> > >
> > > 0c983ec0c078 ("virtio_balloon: fix race between migration and ballooning")
> > >
> > > from the akpm-current tree.
> > >
> > > I fixed it up (I think that the former is a superset of the latter, so
> > > I used that, completely reversing the latter patch) and can carry the
> > > fix as necessary (no action is required).
> >
> > Oops, it isn't.
> >
> > Andrew, your tree seems to still carry original patch by Minchan Kim:
> >
> > 0c983ec0c078ed5d5c219cf97af06364e7a8e19f
> >
> > I reported on list that it has a deadlock:
> > http://article.gmane.org/gmane.linux.kernel.stable/159208
>
> And I replied on your comment that it's not a deadlock but it seem
> you lost my mail because you didn't reply to me.
> Could you expalin why it's deadlock in my reply thread?
I missed your mail, sorry. I don't remember the details. I'll think
about it some more and reply next week in any case.
Thanks!
--
MST
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web