From: Kalle Valo <kvalo@codeaurora.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
Wireless <linux-wireless@vger.kernel.org>,
Christoph Hellwig <hch@lst.de>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Alexandru-Mihai Maftei <amaftei@solarflare.com>
Subject: Re: linux-next: manual merge of the generic-ioremap tree with the net-next tree
Date: Wed, 29 Jan 2020 16:24:22 +0200 [thread overview]
Message-ID: <87blqm8hnt.fsf@codeaurora.org> (raw)
In-Reply-To: <20200129081628.750f5e05@canb.auug.org.au> (Stephen Rothwell's message of "Wed, 29 Jan 2020 08:16:28 +1100")
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> On Tue, 28 Jan 2020 09:54:49 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> On Thu, 9 Jan 2020 16:12:02 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> >
>> > Today's linux-next merge of the generic-ioremap tree got a conflict in:
>> >
>> > drivers/net/ethernet/sfc/efx.c
>> >
>> > between commit:
>> >
>> > f1826756b499 ("sfc: move struct init and fini code")
>> >
>> > from the net-next tree and commit:
>> >
>> > 4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache")
>> >
>> > from the generic-ioremap tree.
>> >
>> > I fixed it up (the latter moved the code, so I applied the following
>> > merge fix patch) 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.
>> >
>> > From: Stephen Rothwell <sfr@canb.auug.org.au>
>> > Date: Thu, 9 Jan 2020 16:08:52 +1100
>> > Subject: [PATCH] fix up for "sfc: move struct init and fini code"
>> >
>> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> > ---
>> > drivers/net/ethernet/sfc/efx_common.c | 2 +-
>> > 1 file changed, 1 insertion(+), 1 deletion(-)
>> >
>> > diff --git a/drivers/net/ethernet/sfc/efx_common.c b/drivers/net/ethernet/sfc/efx_common.c
>> > index fe74c66c8ec6..bf0126633c25 100644
>> > --- a/drivers/net/ethernet/sfc/efx_common.c
>> > +++ b/drivers/net/ethernet/sfc/efx_common.c
>> > @@ -954,7 +954,7 @@ int efx_init_io(struct efx_nic *efx, int bar, dma_addr_t dma_mask,
>> > goto fail3;
>> > }
>> >
>> > - efx->membase = ioremap_nocache(efx->membase_phys, mem_map_size);
>> > + efx->membase = ioremap(efx->membase_phys, mem_map_size);
>> > if (!efx->membase) {
>> > netif_err(efx, probe, efx->net_dev,
>> > "could not map memory BAR at %llx+%x\n",
>> > --
>> > 2.24.0
>>
>> This is now a conflict between the net-next tree and Linus' tree.
>
> It actually turns out that this is a conflict between the
> wireless-drivers tree and Linus' tree since the wireless-drivers tree
> has merged most of the net-next tree.
Yeah, I fast forwarded wireless-drivers to top of net-next so that I can
easily apply fixes and send them to Dave later this week. But as I don't
touch drivers/net/ethernet I don't think there's nothing I can do to fix
this conflict.
--
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
prev parent reply other threads:[~2020-01-29 14:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-09 5:12 linux-next: manual merge of the generic-ioremap tree with the net-next tree Stephen Rothwell
2020-01-27 22:54 ` Stephen Rothwell
2020-01-28 21:16 ` Stephen Rothwell
2020-01-29 14:24 ` 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=87blqm8hnt.fsf@codeaurora.org \
--to=kvalo@codeaurora.org \
--cc=amaftei@solarflare.com \
--cc=davem@davemloft.net \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).