From: Luca Coelho <luca@coelho.fi>
To: Mark Brown <broonie@kernel.org>
Cc: Kalle Valo <kvalo@codeaurora.org>,
Chaya Rachel Ivgi <chaya.rachel.ivgi@intel.com>,
Shahar S Matityahu <shahar.s.matityahu@intel.com>,
Wireless <linux-wireless@vger.kernel.org>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree
Date: Thu, 12 Oct 2017 21:50:51 +0300 [thread overview]
Message-ID: <1507834251.5497.7.camel@coelho.fi> (raw)
In-Reply-To: <20171012183505.oo77lgdbmqjevsuo@sirena.co.uk>
On Thu, 2017-10-12 at 19:35 +0100, Mark Brown wrote:
> On Thu, Oct 12, 2017 at 09:27:46PM +0300, Luciano Coelho wrote:
> > On Thu, 2017-10-12 at 19:21 +0100, Mark Brown wrote:
> > > I may have confused the trees when I was pasting things in, the
> > > commits
> > > are filled in by hand.
> >
> > Ah, okay. But still, if the same patches conflicted twice, why
> > wasn't
> > there only one occurrence with both conflicts at once?
>
> With trees like this that don't coordinate with their fixes branch
> there
> are frequently multiple conflicts introduced so I generally report
> things file by file without even looking at the new ones.
Sorry for the trouble. But how do you suggest that we "coordinate our
fixes branch"? Merge fixes into the main tree?
--
Luca.
next prev parent reply other threads:[~2017-10-12 18:50 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-12 17:25 linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree Mark Brown
2017-10-12 18:16 ` Luciano Coelho
2017-10-12 18:21 ` Mark Brown
2017-10-12 18:27 ` Luciano Coelho
2017-10-12 18:35 ` Mark Brown
2017-10-12 18:50 ` Luca Coelho [this message]
2017-10-12 18:59 ` Mark Brown
2017-10-12 19:02 ` Luca Coelho
2017-10-12 18:29 ` Luca Coelho
2017-10-12 19:12 ` Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2020-03-24 0:16 Stephen Rothwell
2020-03-24 7:00 ` Kalle Valo
2020-03-24 7:29 ` Luca Coelho
2020-03-24 8:07 ` Kalle Valo
2019-10-31 0:13 Stephen Rothwell
2019-10-31 9:36 ` Kalle Valo
2019-04-30 4:08 Stephen Rothwell
2019-04-30 5:30 ` Luciano Coelho
2019-04-15 2:08 Stephen Rothwell
2019-04-18 13:49 ` Kalle Valo
2019-04-15 2:01 Stephen Rothwell
2019-04-18 13:49 ` Kalle Valo
2018-04-26 1:09 Stephen Rothwell
2018-04-26 7:38 ` Luciano Coelho
2018-04-26 10:33 ` Kalle Valo
2018-04-26 11:51 ` Luciano Coelho
2017-12-08 1:00 Stephen Rothwell
2017-12-08 12:30 ` Kalle Valo
2017-10-12 17:20 Mark Brown
2017-10-12 17:14 Mark Brown
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=1507834251.5497.7.camel@coelho.fi \
--to=luca@coelho.fi \
--cc=broonie@kernel.org \
--cc=chaya.rachel.ivgi@intel.com \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=shahar.s.matityahu@intel.com \
/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).