All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Johannes Berg <johannes.berg@intel.com>,
	"John W. Linville" <linville@tuxdriver.com>
Subject: Re: linux-next: manual merge of the net-next tree with the wireless tree
Date: Thu, 15 Dec 2011 14:16:46 +1100	[thread overview]
Message-ID: <20111215141646.02d82d2c0a905076ffb130d8@canb.auug.org.au> (raw)
In-Reply-To: <20111215135330.94caf28045fd307801fa5ef9@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 741 bytes --]

Hi all,

On Thu, 15 Dec 2011 13:53:30 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/wireless/iwlwifi/iwl-agn.c between commit 81670a491849
> ("iwlwifi: tx_sync only on PAN context") from the wireless tree and
> commits from the net-next tree.
> 
> I used the version of this file from the wireless-next tree (where this
> conflict has been resolved).

Unfortunately, it was the wrong resolution for the net-next tree due to
other changes in this file :-(

So instead, I just used the version of this file from the net-next tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, netdev@vger.kernel.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Johannes Berg <johannes.berg@intel.com>,
	"John W. Linville" <linville@tuxdriver.com>
Subject: Re: linux-next: manual merge of the net-next tree with the wireless tree
Date: Thu, 15 Dec 2011 14:16:46 +1100	[thread overview]
Message-ID: <20111215141646.02d82d2c0a905076ffb130d8@canb.auug.org.au> (raw)
In-Reply-To: <20111215135330.94caf28045fd307801fa5ef9@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 741 bytes --]

Hi all,

On Thu, 15 Dec 2011 13:53:30 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the net-next tree got a conflict in
> drivers/net/wireless/iwlwifi/iwl-agn.c between commit 81670a491849
> ("iwlwifi: tx_sync only on PAN context") from the wireless tree and
> commits from the net-next tree.
> 
> I used the version of this file from the wireless-next tree (where this
> conflict has been resolved).

Unfortunately, it was the wrong resolution for the net-next tree due to
other changes in this file :-(

So instead, I just used the version of this file from the net-next tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

  reply	other threads:[~2011-12-15  3:17 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-15  2:53 linux-next: manual merge of the net-next tree with the wireless tree Stephen Rothwell
2011-12-15  2:53 ` Stephen Rothwell
2011-12-15  3:16 ` Stephen Rothwell [this message]
2011-12-15  3:16   ` Stephen Rothwell
2011-12-20  2:02 Stephen Rothwell
2011-12-20  2:02 ` Stephen Rothwell
2012-02-16  1:37 Stephen Rothwell
2012-02-16  1:37 ` Stephen Rothwell
2012-02-16  1:40 Stephen Rothwell
2012-02-16  1:40 ` Stephen Rothwell
2012-05-04  3:21 Stephen Rothwell
2012-05-04  3:21 ` Stephen Rothwell
2012-05-04  4:35 ` Guy, Wey-Yi
2012-06-14  3:12 Stephen Rothwell
2012-06-14  3:12 ` Stephen Rothwell
2012-06-14  4:50 ` Mohammed Shafi Shajakhan
2012-06-14  4:50   ` Mohammed Shafi Shajakhan
2012-06-14 12:59   ` John W. Linville
2012-07-03  1:44 Stephen Rothwell
2012-07-03  1:44 ` Stephen Rothwell
2012-07-03  2:33 ` John W. Linville
2013-03-26  0:48 Stephen Rothwell
2013-03-26  0:48 ` Stephen Rothwell
2013-03-26  0:51 Stephen Rothwell
2013-03-26  0:51 ` Stephen Rothwell
2013-04-02  2:00 Stephen Rothwell
2013-04-02  2:00 ` Stephen Rothwell
2013-04-02  9:30 ` Samuel Ortiz
2013-04-04  0:44 Stephen Rothwell
2013-04-04  0:44 ` Stephen Rothwell
2013-05-02  3:19 ` Stephen Rothwell
2013-05-02  3:19   ` Stephen Rothwell
2013-08-27  4:10 Stephen Rothwell
2013-08-27  4:10 ` Stephen Rothwell
2013-09-27  3:03 Stephen Rothwell
2013-09-27  3:03 ` Stephen Rothwell
2014-02-21  2:34 Stephen Rothwell
2014-02-21  2:34 ` Stephen Rothwell
2014-02-26  3:21 Stephen Rothwell
2014-02-26  3:21 ` Stephen Rothwell
2014-05-23  3:45 Stephen Rothwell
2014-05-23  3:45 ` Stephen Rothwell
2014-07-23  2:00 Stephen Rothwell
2014-07-23  2:00 ` Stephen Rothwell
2014-07-24  2:47 Stephen Rothwell
2014-07-24  2:47 ` Stephen Rothwell
2023-10-12  0:37 Stephen Rothwell
2023-10-12  8:10 ` Johannes Berg
2023-10-19 21:40   ` Jakub Kicinski
2023-10-20  5:49     ` Johannes Berg
2023-10-24  0:24 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=20111215141646.02d82d2c0a905076ffb130d8@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=davem@davemloft.net \
    --cc=johannes.berg@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=netdev@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.