From: "John W. Linville" <linville@tuxdriver.com>
To: Johannes Berg <johannes@sipsolutions.net>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Jean Tourrilhes <jt@hpl.hp.com>
Subject: Re: linux-next: manual merge of the net tree with the wireless-current tree
Date: Thu, 26 Nov 2009 08:01:53 -0500 [thread overview]
Message-ID: <20091126130153.GA3697@tuxdriver.com> (raw)
In-Reply-To: <1259227989.32372.32.camel@johannes.local>
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
linville@tuxdriver.com
next prev parent reply other threads:[~2009-11-26 13:01 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-26 3:10 linux-next: manual merge of the net tree with the wireless-current tree Stephen Rothwell
2009-11-26 9:33 ` Johannes Berg
2009-11-26 13:01 ` John W. Linville [this message]
2009-11-30 16:48 ` Jean Tourrilhes
-- strict thread matches above, loose matches on Subject: below --
2009-12-01 1:31 Stephen Rothwell
2009-12-01 14:06 ` John W. Linville
2009-12-28 22:54 Stephen Rothwell
2009-12-28 23:41 ` John W. Linville
2010-01-06 2:25 Stephen Rothwell
2010-01-07 2:12 Stephen Rothwell
2010-02-09 2:24 Stephen Rothwell
2010-02-09 3:20 ` John W. Linville
2010-02-15 4:20 Stephen Rothwell
2010-02-15 6:22 ` David Miller
2010-02-15 7:16 ` Stephen Rothwell
2010-03-30 2:37 Stephen Rothwell
2010-03-30 13:12 ` John W. Linville
2010-03-30 13:51 ` Stephen Rothwell
2010-05-12 2:15 Stephen Rothwell
2010-05-12 16:15 ` reinette chatre
2010-05-13 1:02 ` Stephen Rothwell
2010-12-02 23:45 Stephen Rothwell
2011-06-28 4:02 Stephen Rothwell
2011-06-28 14:57 ` Guy, Wey-Yi
2011-07-06 2:53 Stephen Rothwell
2011-07-06 11:07 ` Gustavo Padovan
2011-09-27 2:51 Stephen Rothwell
2011-09-27 13:09 ` John W. Linville
2011-09-27 14:41 ` wwguy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091126130153.GA3697@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=davem@davemloft.net \
--cc=johannes@sipsolutions.net \
--cc=jt@hpl.hp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).