From: Johannes Berg <johannes@sipsolutions•net>
To: Stephen Rothwell <sfr@canb•auug.org.au>, Kalle Valo <kvalo@kernel•org>
Cc: Christophe JAILLET <christophe.jaillet@wanadoo•fr>,
Wireless <linux-wireless@vger•kernel.org>,
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: Wed, 09 Oct 2024 09:12:58 +0200 [thread overview]
Message-ID: <f4884810ce29b945674fe90d708f44fdd9717d85.camel@sipsolutions.net> (raw)
In-Reply-To: <20241009113537.4676291f@canb.auug.org.au>
On Wed, 2024-10-09 at 11:35 +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the wireless-next tree got a conflict in:
>
> drivers/net/wireless/intel/ipw2x00/libipw_crypto_tkip.c
This one's weird. These can't conflict:
> between commit:
>
> 1842442007cd ("wifi: lib80211: Constify struct lib80211_crypto_ops")
>
> from the origin tree and commit:
>
> 02f220b52670 ("wifi: ipw2x00/lib80211: move remaining lib80211 into libipw")
because 1842442007cd is an ancestor of 02f220b52670:
$ git merge-base 1842442007cd 02f220b52670
1842442007cd...
When I tried to redo the merge I did get a conflict in this area, but
git was showed it between comments in a deleted staging file and the now
moved lib80211/libipw code.
So I think that git just got confused because I moved a file around in
the tree, and deleted another copy of the same file in staging.
Anyway ... I need to sync with Kalle, but I think I'll pull net-next
into wireless-next and that should resolve this and the other two
conflicts.
johannes
next prev parent reply other threads:[~2024-10-09 7:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-09 0:35 linux-next: manual merge of the wireless-next tree with the origin tree Stephen Rothwell
2024-10-09 7:12 ` Johannes Berg [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-02-22 16:12 broonie
2022-02-22 16:45 ` 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=f4884810ce29b945674fe90d708f44fdd9717d85.camel@sipsolutions.net \
--to=johannes@sipsolutions$(echo .)net \
--cc=christophe.jaillet@wanadoo$(echo .)fr \
--cc=kvalo@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-wireless@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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