All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kalle Valo <kvalo@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jeff Johnson <jjohnson@kernel.org>,
	 Ath10k List <ath10k@lists.infradead.org>,
	 Aditya Kumar Singh <quic_adisi@quicinc.com>,
	 Baochen Qiang <quic_bqiang@quicinc.com>,
	 Kalle Valo <quic_kvalo@quicinc.com>,
	 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	 Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the ath-next tree with the ath tree
Date: Thu, 08 Aug 2024 08:13:36 +0300	[thread overview]
Message-ID: <87bk234mwv.fsf@kernel.org> (raw)
In-Reply-To: <20240808104348.6846e064@canb.auug.org.au> (Stephen Rothwell's message of "Thu, 8 Aug 2024 10:43:48 +1000")

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi all,
>
> Today's linux-next merge of the ath-next tree got a conflict in:
>
>   drivers/net/wireless/ath/ath12k/hw.c
>
> between commit:
>
>   38055789d151 ("wifi: ath12k: use 128 bytes aligned iova in transmit
> path for WCN7850")
>
> from the ath tree and commit:
>
>   8be12629b428 ("wifi: ath12k: restore ASPM for supported hardwares only")
>
> from the ath-next tree.
>
> I fixed it up (see below) 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.

Thanks, the fix looks correct to me.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


  reply	other threads:[~2024-08-08  5:13 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-08  0:43 linux-next: manual merge of the ath-next tree with the ath tree Stephen Rothwell
2024-08-08  5:13 ` Kalle Valo [this message]
2024-08-14  1:00 ` Stephen Rothwell
2024-08-15 14:04   ` Kalle Valo
  -- strict thread matches above, loose matches on Subject: below --
2025-10-30  0:30 Stephen Rothwell
2025-10-30  1:14 ` Jeff Johnson
2025-11-06  0:56 ` Stephen Rothwell

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=87bk234mwv.fsf@kernel.org \
    --to=kvalo@kernel.org \
    --cc=ath10k@lists.infradead.org \
    --cc=jjohnson@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=quic_adisi@quicinc.com \
    --cc=quic_bqiang@quicinc.com \
    --cc=quic_kvalo@quicinc.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.