From: David Miller <davem@davemloft.net>
To: kvalo@codeaurora.org
Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: pull-request: wireless-drivers-next 2016-05-13 (take two)
Date: Fri, 20 May 2016 19:41:48 -0400 (EDT) [thread overview]
Message-ID: <20160520.194148.1467687685270353684.davem@davemloft.net> (raw)
In-Reply-To: <87eg8yfc8b.fsf@kamboji.qca.qualcomm.com>
From: Kalle Valo <kvalo@codeaurora.org>
Date: Thu, 19 May 2016 15:45:08 +0300
> this the second version of the last pull request to net-next for 4.7,
> which got postponed due to the recent iwlwifi merge conflict. Now that
> Linus fixed the merge problem in his tree I actually didn't have to fix
> anything in my tree anymore. So that's why I still use the same tag as
> in my previous pull request.
>
> The only dependency is that you need Linus' iwlwifi fix in your tree
> before you pull this:
>
> 0e034f5c4bc4 iwlwifi: fix mis-merge that breaks the driver
>
> So if you could pull latest Linus' tree to net-next that would solve
> that. I just did a test merge of that on your net-next tree and didn't
> see any conflicts, so this pull should go smoothly. Also these patches
> have been in linux-next at least a week now. But please let me know if
> you see any issues.
Done, pulled, thanks a lot!
> And I think a lesson learned from this is that I need to immediately
> merge wireless-drivers to wireless-drivers-next if there are any
> conflicts between the trees. Or how do you suggest to handle cases like
> that?
You shouldn't have to worry about this kind of stuff at all, and let's
just hope I handle the conflict better next time. :-)
prev parent reply other threads:[~2016-05-20 23:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-19 12:45 pull-request: wireless-drivers-next 2016-05-13 (take two) Kalle Valo
2016-05-19 22:20 ` Reinoud Koornstra
2016-05-20 23:41 ` David Miller [this message]
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=20160520.194148.1467687685270353684.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--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 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).