public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: reinette chatre <reinette.chatre@intel•com>
To: "John W. Linville" <linville@tuxdriver•com>
Cc: Johannes Berg <johannes@sipsolutions•net>,
	"linux-wireless@vger•kernel.org" <linux-wireless@vger•kernel.org>,
	"linux-next@vger•kernel.org" <linux-next@vger•kernel.org>
Subject: Re: [PATCH] iwlwifi: fix build error for CONFIG_IWLAGN=n
Date: Thu, 25 Mar 2010 09:33:40 -0700	[thread overview]
Message-ID: <1269534820.2446.3230.camel@rchatre-DESK> (raw)
In-Reply-To: <20100324233832.GB32563@tuxdriver.com>

Hi John,

On Wed, 2010-03-24 at 16:38 -0700, John W. Linville wrote:
> On Wed, Mar 24, 2010 at 03:41:29PM -0700, reinette chatre wrote:
> 
> > I am very sorry, here is the correct link:
> > http://git.kernel.org/?p=linux/kernel/git/iwlwifi/iwlwifi-2.6.git;a=commit;h=bc745eb7d28285f3b437c00253bf01ef501eb3f1
> 
> FWIW, that one misses the definition of iwl_good_ack_health in iwl-core.h.

This definition was added in an recent patch "iwlwifi: code cleanup for
connectivity recovery" which is already in wireless-next-2.6.

> I already put the other one in wireless-next-2.6.  I'll just resolve
> the conflict when I pull your tree.

I'll try to sort this out with our next submission so that there are no
conflicts to resolve.

Reinette

  reply	other threads:[~2010-03-25 16:33 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-24  5:17 linux-next: Tree for March 24 Stephen Rothwell
2010-03-24  7:29 ` Dmitry Torokhov
2010-03-24 19:44 ` linux-next: Tree for March 24 (staging/vt66*) Randy Dunlap
2010-03-25 13:00   ` Forest Bond
2010-03-25 15:38     ` Randy Dunlap
2010-04-17 15:03       ` [PATCH] vt6656: Rename hostap_set_hostapd, hostap_iotctl Forest Bond
2010-04-17 15:03       ` [PATCH] vt6655: " Forest Bond
2010-03-24 20:19 ` linux-next: Tree for March 24 (iwlwifi) Randy Dunlap
2010-03-24 21:23   ` [PATCH] iwlwifi: fix build error for CONFIG_IWLAGN=n John W. Linville
     [not found]     ` <1269465799-19060-1-git-send-email-linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2010-03-24 21:33       ` Johannes Berg
2010-03-24 21:42         ` reinette chatre
2010-03-24 22:37           ` John W. Linville
2010-03-24 22:41             ` reinette chatre
2010-03-24 23:38               ` John W. Linville
2010-03-25 16:33                 ` reinette chatre [this message]
2010-03-24 22:59     ` Randy Dunlap

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=1269534820.2446.3230.camel@rchatre-DESK \
    --to=reinette.chatre@intel$(echo .)com \
    --cc=johannes@sipsolutions$(echo .)net \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=linux-wireless@vger$(echo .)kernel.org \
    --cc=linville@tuxdriver$(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