From: "John W. Linville" <linville@tuxdriver.com>
To: Marcel Holtmann <marcel@holtmann.org>
Cc: "David S. Miller" <davem@davemloft.net>,
"linux-wireless@vger.kernel.org Wireless"
<linux-wireless@vger.kernel.org>,
Network Development <netdev@vger.kernel.org>,
linux-kernel@vger.kernel.org
Subject: Re: pull request: wireless-next 2014-08-01
Date: Mon, 4 Aug 2014 10:53:43 -0400 [thread overview]
Message-ID: <20140804145342.GB16658@tuxdriver.com> (raw)
In-Reply-To: <C2EB98EF-6873-4F44-B914-A9F89146914A@holtmann.org>
On Sun, Aug 03, 2014 at 10:37:16AM -0700, Marcel Holtmann wrote:
> Hi Dave,
>
> >> Please pull this last(?) batch of wireless change intended for the
> >> 3.17 stream...
> >
> > When I pull this I get tons of conflicts for:
> >
> > CONFLICT (content): Merge conflict in net/6lowpan/iphc.c
> >
> > I don't feel comfortable fixing these up, where are they coming
> > from?
>
> I was short on time yesterday, but now I checked up on this in detail. The merge conflicts are actually simple to resolve. You can just rely on John's tree to have the more recent net/6lowpan/ tree. I should have insisted on merging net/6lowpan/ through bluetooth-next and wireless-next way earlier to avoid conflicts.
>
> In the future we will avoid this by ensuring that all goes via bluetooth-next first. Sorry for this confusion. John mentioned these merge conflicts in his footnote.
>
> John, do you just want to resolve the merge conflicts and send Dave a new pull request?
I'm happy to do that, if Dave wants. But as you say, once the initial
shock of all those conflicts passes the resolution really is fairly
simple. :-)
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
next prev parent reply other threads:[~2014-08-04 15:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-01 16:57 pull request: wireless-next 2014-08-01 John W. Linville
2014-08-03 2:39 ` David Miller
2014-08-03 4:06 ` Marcel Holtmann
2014-08-03 17:37 ` Marcel Holtmann
2014-08-04 14:53 ` John W. Linville [this message]
2014-08-05 5:39 ` Marcel Holtmann
2014-08-05 5:57 ` David Miller
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=20140804145342.GB16658@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=marcel@holtmann.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).