2009-11-26 03:10:58

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: manual merge of the net tree with the wireless-current tree

Hi all,

Today's linux-next merge of the net tree got a conflict in
net/wireless/wext.c between commit
9fed059667d35fca9288460106e92dbb8ba35ea1 ("WE: Fix set events not
propagated") from the tree and commit
3d23e349d807177eaf519d444677cee86b1a04cf ("wext: refactor") from the net
tree.

The latter deleted the file that the former modified. I just ignored the
wireless-current change and removed the file (which seems to have been
done in the latter change anyway).
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/

Attachments:
(No filename) (571.00 B)
 (No filename) (198.00 B)
 Download all attachments

2009-11-26 09:33:49

by Johannes Berg

[permalink] [raw]
Subject: Re: linux-next: manual merge of the net tree with the wireless-current tree

On Thu, 2009-11-26 at 14:10 +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net tree got a conflict in
> net/wireless/wext.c between commit
> 9fed059667d35fca9288460106e92dbb8ba35ea1 ("WE: Fix set events not
> propagated") from the tree and commit
> 3d23e349d807177eaf519d444677cee86b1a04cf ("wext: refactor") from the net
> tree.
>
> The latter deleted the file that the former modified. I just ignored the
> wireless-current change and removed the file (which seems to have been
> done in the latter change anyway).

The fix should probably have gone to wext-core.c instead?

johannes

Attachments:
signature.asc (801.00 B)
This is a digitally signed message part

2009-11-26 12:58:18

by John W. Linville

[permalink] [raw]
Subject: Re: linux-next: manual merge of the net tree with the wireless-current tree

On Thu, Nov 26, 2009 at 10:33:09AM +0100, Johannes Berg wrote:
> On Thu, 2009-11-26 at 14:10 +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the net tree got a conflict in
> > net/wireless/wext.c between commit
> > 9fed059667d35fca9288460106e92dbb8ba35ea1 ("WE: Fix set events not
> > propagated") from the tree and commit
> > 3d23e349d807177eaf519d444677cee86b1a04cf ("wext: refactor") from the net
> > tree.
> >
> > The latter deleted the file that the former modified. I just ignored the
> > wireless-current change and removed the file (which seems to have been
> > done in the latter change anyway).
>
> The fix should probably have gone to wext-core.c instead?

Yes. That's the way I did it in the merge-test branch of wireless-next-2.6.

Thanks,

John
--
John W. Linville
[email protected]

2009-11-30 17:01:02

by Jean Tourrilhes

[permalink] [raw]
Subject: Re: linux-next: manual merge of the net tree with the wireless-current tree

On Thu, Nov 26, 2009 at 08:01:53AM -0500, John W. Linville wrote:
> On Thu, Nov 26, 2009 at 10:33:09AM +0100, Johannes Berg wrote:
> > On Thu, 2009-11-26 at 14:10 +1100, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > Today's linux-next merge of the net tree got a conflict in
> > > net/wireless/wext.c between commit
> > > 9fed059667d35fca9288460106e92dbb8ba35ea1 ("WE: Fix set events not
> > > propagated") from the tree and commit
> > > 3d23e349d807177eaf519d444677cee86b1a04cf ("wext: refactor") from the net
> > > tree.
> > >
> > > The latter deleted the file that the former modified. I just ignored the
> > > wireless-current change and removed the file (which seems to have been
> > > done in the latter change anyway).
> >
> > The fix should probably have gone to wext-core.c instead?
>
> Yes. That's the way I did it in the merge-test branch of wireless-next-2.6.
>
> Thanks,
>
> John

Thanks for fixing that while I was busy in vacation ;-)
Have fun...

Jean