From: "Kirsher, Jeffrey T" <jeffrey.t.kirsher@intel.com>
To: David Miller <davem@davemloft.net>
Cc: "sfr@canb.auug.org.au" <sfr@canb.auug.org.au>,
"torvalds@linux-foundation.org" <torvalds@linux-foundation.org>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"Rose, Gregory V" <gregory.v.rose@intel.com>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the origin tree
Date: Sun, 6 Nov 2011 21:29:36 -0800 [thread overview]
Message-ID: <EAE7BD3E-8965-47A4-B3CA-01686E2602C2@intel.com> (raw)
In-Reply-To: <20111106.223619.1348742215191441592.davem@davemloft.net>
Cheers,
Jeff
On Nov 6, 2011, at 19:38, "David Miller" <davem@davemloft.net> wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 7 Nov 2011 13:47:06 +1100
>
>>> If you just revert the commit in origin from -next, then you will get
>>> conflicts with you pull the net.git tree in.
>>
>> I got no conflicts when I merged in the net tree and can see no fix for
>> this problem in the net tree. My current head of the net tree is 1a6422f
>> "etherh: Add MAINTAINERS entry for etherh".
>
> Ok, Jeff please take a look at this and send me a fix soon.
>
> Thanks.
Ok Dave, at this point, I am puttying together a patch to revert this fix since it appears that more trouble comes with this fix. I will take a look at it quickly before sending out a patch to fix the issue.
next prev parent reply other threads:[~2011-11-07 5:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-06 23:12 linux-next: build failure after merge of the origin tree Stephen Rothwell
2011-11-07 1:52 ` David Miller
2011-11-07 2:47 ` Stephen Rothwell
2011-11-07 3:36 ` David Miller
2011-11-07 5:29 ` Kirsher, Jeffrey T [this message]
2011-11-07 16:46 ` Rose, Gregory V
2011-11-07 17:46 ` Rose, Gregory V
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=EAE7BD3E-8965-47A4-B3CA-01686E2602C2@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=gregory.v.rose@intel.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=torvalds@linux-foundation.org \
/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;
as well as URLs for NNTP newsgroup(s).