From: David Miller <davem@davemloft•net>
To: sfr@canb•auug.org.au
Cc: linville@tuxdriver•com, linux-next@vger•kernel.org
Subject: Re: linux-next: manual merge of the net tree
Date: Wed, 25 Jun 2008 22:54:39 -0700 (PDT) [thread overview]
Message-ID: <20080625.225439.174795604.davem@davemloft.net> (raw)
In-Reply-To: <20080626154020.b8979c6a.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Thu, 26 Jun 2008 15:40:20 +1000
> Hi John, Dave,
>
> On Wed, 25 Jun 2008 14:04:30 -0400 "John W. Linville" <linville@tuxdriver•com> wrote:
> >
> > 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 have done as instructed. Thanks.
Well, I didn't pull from John's tree yet, so you shouldn't
have needed to do this :-)
next prev parent reply other threads:[~2008-06-26 5:54 UTC|newest]
Thread overview: 83+ 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 [this message]
2008-06-26 6:58 ` Stephen Rothwell
2008-06-26 9:08 ` David Miller
2008-06-28 8:29 ` linux-next: pending wireless/wireless-current merge conflict David Miller
-- strict thread matches above, loose matches on Subject: below --
2008-06-19 3:04 linux-next: manual merge of the net tree Stephen Rothwell
2008-06-19 5:01 ` David Miller
2008-06-19 5:49 ` Stephen Rothwell
2008-07-01 7:11 Stephen Rothwell
2008-07-01 7:19 Stephen Rothwell
2008-07-01 9:33 ` David Miller
2008-07-01 15:09 ` Stephen Rothwell
2008-07-03 3:56 Stephen Rothwell
2008-07-03 4:11 ` Stephen Rothwell
2008-07-03 4:13 ` David Miller
2008-07-03 4:08 Stephen Rothwell
2008-07-03 4:14 ` David Miller
2008-07-08 4:10 Stephen Rothwell
2008-07-08 5:14 ` David Miller
2008-07-08 5:44 ` David Miller
2008-07-08 6:15 ` Stephen Rothwell
2008-07-08 4:16 Stephen Rothwell
2008-07-08 12:22 ` John W. Linville
2008-07-08 13:00 ` Stephen Rothwell
2008-07-08 4:27 Stephen Rothwell
2008-07-08 6:03 ` Tobias Diedrich
2008-07-08 14:23 ` Rafael J. Wysocki
2008-07-10 4:02 Stephen Rothwell
2008-07-10 12:11 ` Patrick McHardy
2008-07-16 6:56 Stephen Rothwell
2008-07-16 7:00 Stephen Rothwell
2008-08-28 3:55 Stephen Rothwell
2008-08-28 8:15 ` David Miller
2008-10-29 3:11 Stephen Rothwell
2008-10-29 4:53 ` David Miller
2008-10-29 12:34 ` John W. Linville
2008-10-29 20:20 ` David Miller
2008-11-07 4:24 Stephen Rothwell
2008-11-07 4:47 ` David Miller
2008-11-07 4:33 Stephen Rothwell
2008-11-10 3:02 Stephen Rothwell
2008-11-11 7:00 ` David Miller
2008-11-11 8:24 ` Stephen Rothwell
2008-11-11 9:21 ` David Miller
2008-11-11 23:17 ` Stephen Rothwell
2008-11-12 2:59 Stephen Rothwell
2008-11-12 3:07 ` John W. Linville
2008-11-18 0:51 Stephen Rothwell
2008-11-20 2:10 Stephen Rothwell
2008-11-21 2:29 Stephen Rothwell
2008-11-21 4:11 ` David Miller
2008-11-21 4:22 ` Stephen Rothwell
2008-11-21 2:33 Stephen Rothwell
2008-11-26 6:34 Stephen Rothwell
2008-11-26 6:42 Stephen Rothwell
2008-11-27 3:40 Stephen Rothwell
2008-11-27 8:03 ` David Miller
2008-12-01 3:16 Stephen Rothwell
2008-12-01 3:26 Stephen Rothwell
2008-12-01 7:20 ` David Miller
2008-12-01 17:06 ` Mike Frysinger
2008-12-08 3:48 Stephen Rothwell
2008-12-08 7:26 ` David Miller
2008-12-29 3:53 ` Stephen Rothwell
2008-12-29 4:00 ` David Miller
2008-12-29 4:14 ` Stephen Rothwell
2008-12-09 2:13 Stephen Rothwell
2008-12-09 2:21 Stephen Rothwell
2008-12-09 22:17 ` J. Bruce Fields
2008-12-09 23:22 ` David Miller
2008-12-09 23:41 ` Stephen Rothwell
2008-12-15 3:44 Stephen Rothwell
2008-12-15 6:59 ` David Miller
2008-12-23 23:15 Stephen Rothwell
2008-12-24 2:16 ` David Miller
2008-12-23 23:19 Stephen Rothwell
2008-12-24 2:15 ` David Miller
2008-12-24 14:41 ` Cyrill Gorcunov
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=20080625.225439.174795604.davem@davemloft.net \
--to=davem@davemloft$(echo .)net \
--cc=linux-next@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