Re: linux-next: manual merge of the net-next tree with the wireless-drivers tree

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Kalle Valo <kvalo@codeaurora.org>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the net-next tree with the wireless-drivers tree
Date	Tue, 10 May 2016 08:50:01 +0200
Message-ID	<rx9Et-5o7-1@gated-at.bofh.it> (permalink)
References	<rwHoR-YK-1@gated-at.bofh.it>
X-Original-To	Stephen Rothwell <sfr@canb.auug.org.au>
User-Agent	Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux)
MIME-Version	1.0
Content-Type	text/plain; charset=us-ascii
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	29
Organization	linux.* mail to news gateway
X-Original-Cc	David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Emmanuel Grumbach <emmanuel.grumbach@intel.com>, Sara Sharon <sara.sharon@intel.com>, linux-wireless@vger.kernel.org
X-Original-Date	Tue, 10 May 2016 09:43:16 +0300
X-Original-Message-ID	<87futqh0qj.fsf@kamboji.qca.qualcomm.com>
X-Original-References	<20160509103921.72146ce1@canb.auug.org.au>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1397730

Show key headers only | View raw

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Today's linux-next merge of the net-next tree got a conflict in:
>
>   drivers/net/wireless/intel/iwlwifi/mvm/tx.c
>
> between commit:
>
>   5c08b0f5026f ("iwlwifi: mvm: don't override the rate with the AMSDU len")
>
> from the wireless-drivers tree and commit:
>
>   d8fe484470dd ("iwlwifi: mvm: add support for new TX CMD API")
>
> from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

I'm planning to fix this by merging wireless-drivers to
wireless-drivers-next later today and most likely tomorrow send a
wireless-drivers-next pull request to Dave.

-- 
Kalle Valo

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the net-next tree with the  wireless-drivers tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-05-09 02:40 +0200
  Re: linux-next: manual merge of the net-next tree with the wireless-drivers tree Kalle Valo <kvalo@codeaurora.org> - 2016-05-10 08:50 +0200

csiph-web