From: "Rose, Gregory V" <gregory.v.rose@intel.com>
To: "Kirsher, Jeffrey T" <jeffrey.t.kirsher@intel.com>,
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>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: RE: linux-next: build failure after merge of the origin tree
Date: Mon, 7 Nov 2011 08:46:35 -0800 [thread overview]
Message-ID: <43F901BD926A4E43B106BF17856F075501A1CCA399@orsmsx508.amr.corp.intel.com> (raw)
In-Reply-To: <EAE7BD3E-8965-47A4-B3CA-01686E2602C2@intel.com>
> -----Original Message-----
> From: Kirsher, Jeffrey T
> Sent: Sunday, November 06, 2011 9:30 PM
> To: David Miller
> Cc: sfr@canb.auug.org.au; torvalds@linux-foundation.org; linux-
> next@vger.kernel.org; linux-kernel@vger.kernel.org; Rose, Gregory V;
> netdev@vger.kernel.org
> Subject: Re: linux-next: build failure after merge of the origin tree
>
>
>
> 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.
My bad... I fixed a compiler warning that occurred with CONFIG_PCI_IOV turned on and didn't realize that my patch would cause an error when turning it back off.
I'll have it fixed ASAP.
- Greg
next prev parent reply other threads:[~2011-11-07 16:46 UTC|newest]
Thread overview: 60+ 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
2011-11-07 16:46 ` Rose, Gregory V [this message]
2011-11-07 17:46 ` Rose, Gregory V
-- strict thread matches above, loose matches on Subject: below --
2023-06-30 2:59 Stephen Rothwell
2023-06-30 3:43 ` Linus Torvalds
2021-09-19 23:42 Stephen Rothwell
2021-09-14 0:08 Stephen Rothwell
2021-09-14 0:19 ` Linus Torvalds
2021-09-14 0:24 ` Linus Torvalds
2021-09-14 0:58 ` Stephen Rothwell
2021-09-14 1:29 ` Linus Torvalds
2021-09-14 1:37 ` Linus Torvalds
2021-09-14 2:03 ` Linus Torvalds
2021-09-14 2:08 ` Stephen Rothwell
2021-09-14 2:12 ` Linus Torvalds
2021-09-14 2:50 ` Michael Ellerman
2021-09-14 12:21 ` Michael Ellerman
2021-09-14 2:39 ` Stephen Rothwell
2021-09-07 23:07 Stephen Rothwell
2021-09-07 23:09 ` Stephen Rothwell
2021-09-07 23:17 ` Marco Elver
2021-09-07 23:38 ` Miguel Ojeda
2020-07-30 22:58 Stephen Rothwell
2020-07-30 23:15 ` Stephen Rothwell
2020-07-29 23:08 Stephen Rothwell
2020-07-29 23:43 ` Linus Torvalds
2020-07-30 0:09 ` Linus Torvalds
2020-07-30 2:12 ` Linus Torvalds
2020-07-30 2:30 ` Willy Tarreau
2020-07-30 3:17 ` Kees Cook
2020-07-30 3:22 ` Willy Tarreau
2020-07-30 6:14 ` Willy Tarreau
2020-07-30 9:59 ` Marc Zyngier
2020-07-30 10:09 ` Catalin Marinas
2020-07-30 15:00 ` Will Deacon
2020-07-30 17:49 ` Kees Cook
2020-07-30 18:24 ` Linus Torvalds
2020-07-30 18:47 ` Kees Cook
2020-06-04 22:37 Stephen Rothwell
2020-06-05 0:04 ` Josh Poimboeuf
2020-06-05 9:48 ` Jessica Yu
2020-04-20 10:23 Stephen Rothwell
2020-01-31 4:12 Stephen Rothwell
2020-01-31 4:17 ` Randy Dunlap
2020-01-31 9:39 ` Daniel Lezcano
2012-10-09 23:21 Stephen Rothwell
2012-10-09 23:45 ` Andrew Morton
2012-10-09 23:52 ` Yasuaki Ishimatsu
2012-10-10 3:12 ` Stephen Rothwell
2012-10-10 0:07 ` Stephen Rothwell
2012-06-04 2:57 Stephen Rothwell
2012-06-04 7:39 ` Paul Mundt
2012-01-18 23:31 Stephen Rothwell
2012-01-19 8:21 ` Jens Axboe
2012-01-19 8:23 ` Jens Axboe
2011-07-25 1:16 Stephen Rothwell
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=43F901BD926A4E43B106BF17856F075501A1CCA399@orsmsx508.amr.corp.intel.com \
--to=gregory.v.rose@intel.com \
--cc=davem@davemloft.net \
--cc=jeffrey.t.kirsher@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).