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,
Tom Herbert <therbert@google•com>,
David Miller <davem@davemloft•net>,
netdev@vger•kernel.org,
"Eric W. Biederman" <ebiederm@xmission•com>
Subject: Re: linux-next: manual merge of the driver-core tree with the net tree
Date: Fri, 21 May 2010 16:38:44 +1000 [thread overview]
Message-ID: <20100521163844.c702a2b4.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20100521162134.6b6326bd.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 943 bytes --]
Hi Greg,
On Fri, 21 May 2010 16:21:34 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the driver-core tree got a conflict in
> net/core/net-sysfs.c between commits
> 0a9627f2649a02bea165cfd529d7bcb625c2fcad ("rps: Receive Packet Steering")
> and fec5e652e58fa6017b2c9e06466cb2a6538de5b4 ("rfs: Receive Flow
> Steering") from the net tree and commits
> bc28c84244da26bafb0d3bce95ef45212b31c6b8 ("net/sysfs: Fix the bitrot in
> network device kobject namespace support") and
> 83dc0fbf37495691219d019ec16b40d8592d2956 ("net: Expose all network
> devices in a namespaces in sysfs") from the driver-core tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary.
The net tree has been merged by Linus, so this should be fixable in the
driver-core tree now.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next prev parent reply other threads:[~2010-05-21 6:38 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-21 6:21 linux-next: manual merge of the driver-core tree with the net tree Stephen Rothwell
2010-05-21 6:38 ` Stephen Rothwell [this message]
2010-05-21 6:46 ` Eric W. Biederman
2010-05-21 6:49 ` Stephen Rothwell
2010-05-21 6:50 ` David Miller
2010-05-21 7:43 ` Eric W. Biederman
2010-05-21 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=20100521163844.c702a2b4.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=ebiederm@xmission$(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=therbert@google$(echo .)com \
/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