linux-next: net-current/net merge conflict

linux-next: net-current/net merge conflict

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 540 bytes --]

Hi Dave, Jeff,

Today's linux-next merge of the net tree got a trivial conflict in
drivers/net/cpmac.c between commit
f917d58031fce6dfd7cea71259ea6a2b663ec813 ("cpmac bugfixes and
enhancements") from the net-current tree and commit
7d2e3cb7000b883a8e489485ac249be572fe17b1 ("[netdrvr] Trim trailing
whitespace for several drivers") from the net tree. The former removed a
comment that the latter made a whitespace fix to.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: linux-next: net-current/net merge conflict

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 26 May 2008 13:32:34 +1000

> Today's linux-next merge of the net tree got a trivial conflict in
> drivers/net/cpmac.c between commit
> f917d58031fce6dfd7cea71259ea6a2b663ec813 ("cpmac bugfixes and
> enhancements") from the net-current tree and commit
> 7d2e3cb7000b883a8e489485ac249be572fe17b1 ("[netdrvr] Trim trailing
> whitespace for several drivers") from the net tree. The former removed a
> comment that the latter made a whitespace fix to.

Thanks Stephen.

I'm trying to do a quick merge of net-2.6 into net-next-2.6
right now and will push the result out to master.kernel.org
after some build sanity tests.

Hopefully that will resolve both of the current merge
conflicts in the networking.

Re: linux-next: net-current/net merge conflict

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 690 bytes --]

Hi Dave,

On Sun, 25 May 2008 23:29:58 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> I'm trying to do a quick merge of net-2.6 into net-next-2.6
> right now and will push the result out to master.kernel.org
> after some build sanity tests.
> 
> Hopefully that will resolve both of the current merge
> conflicts in the networking.

That should work, thanks.  These merge conflict fixups are usually not a
real concern I just report them in case I do the wrong fixup and to keep
everyone informed.  When you do necessary merges, these will just
disappear.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: linux-next: net-current/net merge conflict

[Jeff Garzik]

On Mon, May 26, 2008 at 01:32:34PM +1000, Stephen Rothwell wrote:
> Hi Dave, Jeff,
> 
> Today's linux-next merge of the net tree got a trivial conflict in
> drivers/net/cpmac.c between commit
> f917d58031fce6dfd7cea71259ea6a2b663ec813 ("cpmac bugfixes and
> enhancements") from the net-current tree and commit
> 7d2e3cb7000b883a8e489485ac249be572fe17b1 ("[netdrvr] Trim trailing
> whitespace for several drivers") from the net tree. The former removed a
> comment that the latter made a whitespace fix to.

Please make sure to CC my author email address.  jgarzik@redhat.com is
only for legal sign-offs.

	Jeff

Re: linux-next: net-current/net merge conflict

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

Hi Jeff,

On Mon, 26 May 2008 16:27:36 -0400 Jeff Garzik <jgarzik@redhat.com> wrote:
>
> Please make sure to CC my author email address.  jgarzik@redhat.com is
> only for legal sign-offs.

Sorry about that.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]