From: David Miller <davem@davemloft•net>
To: linville@tuxdriver•com
Cc: sfr@canb•auug.org.au, linux-next@vger•kernel.org,
linux-wireless@vger•kernel.org
Subject: Re: linux-next: pending wireless/wireless-current merge conflict
Date: Sat, 28 Jun 2008 01:29:12 -0700 (PDT) [thread overview]
Message-ID: <20080628.012912.03104549.davem@davemloft.net> (raw)
In-Reply-To: <20080625180430.GA13730@tuxdriver.com>
From: "John W. Linville" <linville@tuxdriver•com>
Date: Wed, 25 Jun 2008 14:04:30 -0400
> I just sent a pull request for Dave that will result in nasty-looking
> conflict in iwl4965-base.c. I have a sample merge available here:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 merge-test
>
> The overview of the resolution is to ignore any changes in
> iwl4965-base.c and take drivers/net/wireless/iwlwifi/iwl-scan.c from
> the URL above.
I've just merged net-2.6 into net-next-2.6 and done my best to
resolve that merge.
Thanks for the heads up!
next prev parent reply other threads:[~2008-06-28 8:29 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-13 21:56 linux-next: pending wireless/wireless-current merge conflict John W. Linville
2008-06-14 1:31 ` Stephen Rothwell
2008-06-25 18:04 ` John W. Linville
2008-06-26 2:01 ` Zhu Yi
2008-06-26 3:15 ` Stephen Rothwell
2008-06-26 5:40 ` linux-next: manual merge of the net tree Stephen Rothwell
2008-06-26 5:54 ` David Miller
2008-06-26 6:58 ` Stephen Rothwell
2008-06-26 9:08 ` David Miller
2008-06-28 8:29 ` David Miller [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-05-22 3:20 linux-next: wireless/wireless-current merge conflict Stephen Rothwell
2008-05-22 13:41 ` John W. Linville
2008-05-29 0:42 ` linux-next: pending " John W. Linville
2008-05-29 1:44 ` Stephen Rothwell
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=20080628.012912.03104549.davem@davemloft.net \
--to=davem@davemloft$(echo .)net \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-wireless@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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