mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Johannes Berg <johannes@sipsolutions.net>
To: broonie@kernel.org, Kalle Valo <kvalo@kernel.org>,
	Wireless <linux-wireless@vger.kernel.org>
Cc: Ilan Peer <ilan.peer@intel.com>,
	Jiasheng Jiang <jiasheng@iscas.ac.cn>,
	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 wireless-next tree with the origin tree
Date: Tue, 22 Feb 2022 17:45:11 +0100	[thread overview]
Message-ID: <116cc3c6cdf4d515a31848dda915b9c21ce02922.camel@sipsolutions.net> (raw)
In-Reply-To: <20220222161218.4028508-1-broonie@kernel.org>

Hi,

> Today's linux-next merge of the wireless-next tree got a conflict in:
> 
>   net/mac80211/mlme.c
> 
> between commit:
> 
>   a72c01a94f1d2 ("mac80211: mlme: check for null after calling kmemdup")
> 
> from the origin tree and commit:
> 
>   820acc810fb6e ("mac80211: Add EHT capabilities to association/probe request")
> 
> from the wireless-next tree.

Thanks. I think Stephen had also noticed this before.

Maybe I'll just move the new code around so it doesn't conflict anymore
;)

johannes

  reply	other threads:[~2022-02-22 16:45 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-22 16:12 broonie
2022-02-22 16:45 ` Johannes Berg [this message]
2024-10-09  0:35 Stephen Rothwell
2024-10-09  7:12 ` Johannes Berg
2026-07-22 15:57 Mark Brown
2026-07-22 20:53 ` Enderaoe Lyther
2026-07-23 11:51   ` Mark Brown
2026-07-23 20:21     ` Zhao Li
2026-07-26 10:33       ` Johannes Berg
2026-07-26 16:41         ` Zhao Li
2026-07-26 17:02           ` Johannes Berg

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=116cc3c6cdf4d515a31848dda915b9c21ce02922.camel@sipsolutions.net \
    --to=johannes@sipsolutions.net \
    --cc=broonie@kernel.org \
    --cc=ilan.peer@intel.com \
    --cc=jiasheng@iscas.ac.cn \
    --cc=kvalo@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux-wireless@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
all inboxes | Powered by JetHome®