From: Kalle Valo <kvalo@codeaurora.org>
To: Johannes Berg <johannes@sipsolutions.net>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Matthew Wilcox <willy@infradead.org>,
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 xarray tree with the wireless-drivers-next tree
Date: Thu, 28 Jun 2018 11:51:40 +0300 [thread overview]
Message-ID: <87in63s38j.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <1530172269.4988.1.camel@sipsolutions.net> (Johannes Berg's message of "Thu, 28 Jun 2018 09:51:09 +0200")
Johannes Berg <johannes@sipsolutions.net> writes:
> On Thu, 2018-06-28 at 14:59 +1000, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the xarray tree got a conflict in:
>>
>> lib/Kconfig.debug
>>
>> between commit:
>>
>> 0e2dc70e3d0d ("bitfield: add tests")
>>
>> from the wireless-drivers-next tree and commit:
>>
>> d968f529e39f ("xarray: Add XArray load operation")
>>
>> from the xarray tree.
>
> Thanks for the heads-up! Not really sure where/how we'll be able to get
> that resolved before it hits Linus, but as the conflict seems rather
> easy (overlapping additions), I guess it's not such a big deal.
Yeah, I would assume this is business as usual for Linus and we don't
need to do anything. But please do let me know if that's not the case.
--
Kalle Valo
prev parent reply other threads:[~2018-06-28 8:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-28 4:59 linux-next: manual merge of the xarray tree with the wireless-drivers-next tree Stephen Rothwell
2018-06-28 7:51 ` Johannes Berg
2018-06-28 8:46 ` Matthew Wilcox
2018-06-28 8:56 ` Johannes Berg
2018-06-28 8:51 ` Kalle Valo [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=87in63s38j.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@codeaurora.org \
--cc=johannes@sipsolutions.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=willy@infradead.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).