From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Eric Dumazet <eric.dumazet@gmail•com>,
David Miller <davem@davemloft•net>,
netdev@vger•kernel.org, Sven Eckelmann <sven.eckelmann@gmx•de>
Subject: linux-next: manual merge of the staging-next tree with the net tree
Date: Fri, 23 Jul 2010 15:03:23 +1000 [thread overview]
Message-ID: <20100723150323.daa04d5f.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 574 bytes --]
Hi Greg,
Today's linux-next merge of the staging-next tree got a conflict in
drivers/staging/batman-adv/hard-interface.c between commit
28172739f0a276eb8d6ca917b3974c2edb036da3 ("net: fix 64 bit counters on 32
bit arches") from the net tree and commit
a1a38cad4c71bc08403b204fbe0ba98b4447f8bf ("Staging: batman-adv: Don't
increment stats of foreign device") from the staging-next tree.
The latter just removes the code fixed by the former, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2010-07-23 5:03 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-23 5:03 Stephen Rothwell [this message]
2010-07-23 7:09 ` linux-next: manual merge of the staging-next tree with the net tree Sven Eckelmann
-- strict thread matches above, loose matches on Subject: below --
2010-05-06 4:05 Stephen Rothwell
2010-05-06 4:20 ` Greg KH
2010-05-06 4:21 ` Stephen Rothwell
2010-05-06 6:21 ` Greg KH
2010-04-27 4:26 Stephen Rothwell
2010-04-27 15:13 ` Greg KH
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=20100723150323.daa04d5f.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=eric.dumazet@gmail$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=sven.eckelmann@gmx$(echo .)de \
/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