From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Guan Xuetao <gxt@mprc.pku.edu.cn>,
Zhang Shu <davidshuzhang@gmail.com>,
Chu Xiaowei <chuxiaowei@mprc.pku.edu.cn>,
Su Yonggang <tonyhook.su@gmail.com>
Subject: Re: linux-next: manual merge of the net tree with the unicore32 tree
Date: Tue, 23 Aug 2011 02:00:48 -0700 [thread overview]
Message-ID: <1314090049.2128.224.camel@jtkirshe-mobl> (raw)
In-Reply-To: <20110823130210.766d466d689d60536f59340a@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 715 bytes --]
On Mon, 2011-08-22 at 20:02 -0700, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net tree got conflicts in
> drivers/net/Kconfig and drivers/net/Makefile between commit
> e8787de6fa83
> ("unicore32: add pkunity-v3 mac/net driver (umal)") from the unicore32
> tree and the network driver rearrangement from the net tree.
>
> I just added the new driver from the unicore32 tree commit into each
> file
> (see below).
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
Hmm, well with the latest series of patches I sent out, I am pretty sure
this patch would not apply.
Is it best that this patch not be sent to netdev for driver
inclusion? :)
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
next prev parent reply other threads:[~2011-08-23 9:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-23 3:02 linux-next: manual merge of the net tree with the unicore32 tree Stephen Rothwell
2011-08-23 9:00 ` Jeff Kirsher [this message]
2011-08-24 1:28 ` Guan Xuetao
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=1314090049.2128.224.camel@jtkirshe-mobl \
--to=jeffrey.t.kirsher@intel.com \
--cc=chuxiaowei@mprc.pku.edu.cn \
--cc=davem@davemloft.net \
--cc=davidshuzhang@gmail.com \
--cc=gxt@mprc.pku.edu.cn \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tonyhook.su@gmail.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