From: ebiederm@xmission.com (Eric W. Biederman)
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Tom Herbert <therbert@google.com>,
David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>
Subject: Re: linux-next: manual merge of the driver-core tree with the net tree
Date: Thu, 20 May 2010 23:46:22 -0700 [thread overview]
Message-ID: <m1tyq1wy4h.fsf@fess.ebiederm.org> (raw)
In-Reply-To: <20100521162134.6b6326bd.sfr@canb.auug.org.au> (Stephen Rothwell's message of "Fri\, 21 May 2010 16\:21\:34 +1000")
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi Greg,
>
> 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.
It looks right, except perhaps the RPS code looks like it will cause a
build failure with sysfs disabled, but that has nothing to do with your
changes. I don't see any real conflicts here, just two patches passing
very close to each other.
Thanks for the heads up.
Eric
next prev parent reply other threads:[~2010-05-21 6:46 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
2010-05-21 6:46 ` Eric W. Biederman [this message]
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=m1tyq1wy4h.fsf@fess.ebiederm.org \
--to=ebiederm@xmission.com \
--cc=davem@davemloft.net \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=therbert@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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