From: Kalle Valo <kvalo@codeaurora•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
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
Subject: Re: linux-next: manual merge of the net-next tree with the wireless-drivers tree
Date: Tue, 10 May 2016 09:43:16 +0300 [thread overview]
Message-ID: <87futqh0qj.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <20160509103921.72146ce1@canb.auug.org.au> (Stephen Rothwell's message of "Mon, 9 May 2016 10:39:21 +1000")
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
next prev parent reply other threads:[~2016-05-10 6:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-09 0:39 linux-next: manual merge of the net-next tree with the wireless-drivers tree Stephen Rothwell
2016-05-10 6:43 ` Kalle Valo [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-04-29 1:54 Stephen Rothwell
2019-04-29 5:19 ` Luca Coelho
2016-02-29 1:56 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=87futqh0qj.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@codeaurora$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=emmanuel.grumbach@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-wireless@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=sara.sharon@intel$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/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