linux-next: manual merge of the wireless-next tree with Linus' tree

linux-next: manual merge of the wireless-next tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 862 bytes --]

Hi all,

FIXME: Add owner of second tree to To:
       Add author(s)/SOB of conflicting commits.

Today's linux-next merge of the wireless-next tree got a conflict in:

  net/mac80211/util.c

between commit:

  ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")

from the origin tree and commit:

  ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")

from the wireless-next tree.

I fixed it up (I just used the latter version) 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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the wireless-next tree with Linus' tree

[Jakub Kicinski]

On Thu, 20 Oct 2022 03:23:40 +1100 Stephen Rothwell wrote:
> Today's linux-next merge of the wireless-next tree got a conflict in:
> 
>   net/mac80211/util.c
> 
> between commit:
> 
>   ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")
> 
> from the origin tree and commit:
> 
>   ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")

Dunno if this is a glitch or real problem. But it reminds me - I see
there is direct wireless -> wireless-next merge without going via
Linus's tree. I think you may have mentioned it to us, but not sure
if I said this clearly - let's try to avoid such merges. Linus certainly
doesn't like when we do net -> net-next merges without sending net to
him first and forwarding. I'm not 100% sure why (maybe Steven knows)
- whether it's an aesthetic thing or avoiding real issues thing, but
either way it's _a_ thing :S

Re: linux-next: manual merge of the wireless-next tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1591 bytes --]

Hi Jakub,

On Wed, 19 Oct 2022 16:23:24 -0700 Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Thu, 20 Oct 2022 03:23:40 +1100 Stephen Rothwell wrote:
> > Today's linux-next merge of the wireless-next tree got a conflict in:
> > 
> >   net/mac80211/util.c
> > 
> > between commit:
> > 
> >   ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")
> > 
> > from the origin tree and commit:
> > 
> >   ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")  

This should have been commit

  45ebac4f059b ("wifi: mac80211: Parse station profile from association response")

> Dunno if this is a glitch or real problem. But it reminds me - I see
> there is direct wireless -> wireless-next merge without going via
> Linus's tree. I think you may have mentioned it to us, but not sure
> if I said this clearly - let's try to avoid such merges. Linus certainly
> doesn't like when we do net -> net-next merges without sending net to
> him first and forwarding. I'm not 100% sure why (maybe Steven knows)
> - whether it's an aesthetic thing or avoiding real issues thing, but
> either way it's _a_ thing :S

Has Linus really complained about you merging the net tree into the
net-next tree?  The only reason that would be a problem is if (as
happened only once that I remember) Linus rejects the net tree merge
due to some problem.  So, yes, wait until after the net (or wireless)
tree has been merged by Linus, but then there should be no reason to
not just merge the net tree (rather than Linus' tree).

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the wireless-next tree with Linus' tree

[Jakub Kicinski]

On Thu, 20 Oct 2022 04:14:40 +1100 Stephen Rothwell wrote:
> > Dunno if this is a glitch or real problem. But it reminds me - I see
> > there is direct wireless -> wireless-next merge without going via
> > Linus's tree. I think you may have mentioned it to us, but not sure
> > if I said this clearly - let's try to avoid such merges. Linus certainly
> > doesn't like when we do net -> net-next merges without sending net to
> > him first and forwarding. I'm not 100% sure why (maybe Steven knows)
> > - whether it's an aesthetic thing or avoiding real issues thing, but
> > either way it's _a_ thing :S  
> 
> Has Linus really complained about you merging the net tree into the
> net-next tree?

I can't find that exchange right now. Maybe it was about merging
back his tree into ours without submitting a PR. Hm.

Re: linux-next: manual merge of the wireless-next tree with Linus' tree

[Kalle Valo]

Jakub Kicinski <kuba@kernel.org> writes:

> On Thu, 20 Oct 2022 04:14:40 +1100 Stephen Rothwell wrote:
>> > Dunno if this is a glitch or real problem. But it reminds me - I see
>> > there is direct wireless -> wireless-next merge without going via
>> > Linus's tree. I think you may have mentioned it to us, but not sure
>> > if I said this clearly - let's try to avoid such merges. Linus certainly
>> > doesn't like when we do net -> net-next merges without sending net to
>> > him first and forwarding. I'm not 100% sure why (maybe Steven knows)
>> > - whether it's an aesthetic thing or avoiding real issues thing, but
>> > either way it's _a_ thing :S  
>> 
>> Has Linus really complained about you merging the net tree into the
>> net-next tree?
>
> I can't find that exchange right now. Maybe it was about merging
> back his tree into ours without submitting a PR. Hm.

So yes, we merged wireless into wireless-next in commit dfd2d876b3fd
("Merge remote-tracking branch 'wireless/main' into wireless-next"). But
that's only in wireless-next right now, we will send a pull request to
net-next soon.

My understanding is that Linus does not like excessive or pointless
merge requests, and his recent email[1] says similar. But in our case I
think the merge is justified, otherwise we would have conflicts between
trees, which means more work for everyone involved with tree merges and
most likely even bugs if the merge resolutions are difficult.

And we were not planning to do this often, maybe something like once per
cycle and only then there's a strong reason for the merge. Naturally we
would document that in the merge, just like Linus prefers. Thoughts?

[1] https://lore.kernel.org/all/CAHk-=wgb42XG1c_rtwupJMD9QXbJsE6k_TBKYC4YvZ8bkATcVg@mail.gmail.com/

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

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

Re: linux-next: manual merge of the wireless-next tree with Linus' tree

[Kalle Valo]

Hi Stephen,

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

> On Wed, 19 Oct 2022 16:23:24 -0700 Jakub Kicinski <kuba@kernel.org> wrote:
>>
>> On Thu, 20 Oct 2022 03:23:40 +1100 Stephen Rothwell wrote:
>> > Today's linux-next merge of the wireless-next tree got a conflict in:
>> > 
>> >   net/mac80211/util.c
>> > 
>> > between commit:
>> > 
>> >   ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")
>> > 
>> > from the origin tree and commit:
>> > 
>> >   ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")  
>
> This should have been commit
>
>   45ebac4f059b ("wifi: mac80211: Parse station profile from association response")

BTW I have been trying to reproduce this conflict to no avail, do you
still see it?

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

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

Re: linux-next: manual merge of the wireless-next tree with Linus' tree

[Kalle Valo]

Kalle Valo <kvalo@kernel.org> writes:

> Hi Stephen,
>
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
>
>> On Wed, 19 Oct 2022 16:23:24 -0700 Jakub Kicinski <kuba@kernel.org> wrote:
>>>
>>> On Thu, 20 Oct 2022 03:23:40 +1100 Stephen Rothwell wrote:
>>> > Today's linux-next merge of the wireless-next tree got a conflict in:
>>> > 
>>> >   net/mac80211/util.c
>>> > 
>>> > between commit:
>>> > 
>>> >   ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")
>>> > 
>>> > from the origin tree and commit:
>>> > 
>>> >   ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")  
>>
>> This should have been commit
>>
>>   45ebac4f059b ("wifi: mac80211: Parse station profile from association response")
>
> BTW I have been trying to reproduce this conflict to no avail, do you
> still see it?

Never mind, I see it now. Sorry for the noise.

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

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

linux-next: manual merge of the wireless-next tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1599 bytes --]

Hi all,

Today's linux-next merge of the wireless-next tree got conflicts in:

  drivers/staging/rtl8192e/rtl8192e/r8190P_def.h
  drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c
  drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
  drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h
  drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
  drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
  drivers/staging/rtl8192e/rtl8192e/rtl_core.c
  drivers/staging/rtl8192e/rtl8192e/rtl_core.h
  drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
  drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
  drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
  drivers/staging/rtl8192e/rtl819x_BAProc.c
  drivers/staging/rtl8192e/rtl819x_HTProc.c
  drivers/staging/rtl8192e/rtl819x_TSProc.c
  drivers/staging/rtl8192e/rtllib.h
  drivers/staging/rtl8192e/rtllib_rx.c
  drivers/staging/rtl8192e/rtllib_softmac_wx.c

between commits:

  5f60d5f6bbc1 ("move asm/unaligned.h to linux/unaligned.h")
  5e6bf74d63c2 ("Staging: rtl8192e: Rename variable RxDrvInfoSize")
and many others

from Linus' tree (pre v6.12-rc2) and commit:

  be9be9f54f22 ("staging: rtl8192e: delete the driver")

from the wireless-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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the wireless-next tree with Linus' tree

[Greg Kroah-Hartman]

On Wed, Oct 09, 2024 at 11:44:55AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the wireless-next tree got conflicts in:
> 
>   drivers/staging/rtl8192e/rtl8192e/r8190P_def.h
>   drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c
>   drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
>   drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h
>   drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
>   drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
>   drivers/staging/rtl8192e/rtl8192e/rtl_core.c
>   drivers/staging/rtl8192e/rtl8192e/rtl_core.h
>   drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
>   drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
>   drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
>   drivers/staging/rtl8192e/rtl819x_BAProc.c
>   drivers/staging/rtl8192e/rtl819x_HTProc.c
>   drivers/staging/rtl8192e/rtl819x_TSProc.c
>   drivers/staging/rtl8192e/rtllib.h
>   drivers/staging/rtl8192e/rtllib_rx.c
>   drivers/staging/rtl8192e/rtllib_softmac_wx.c
> 
> between commits:
> 
>   5f60d5f6bbc1 ("move asm/unaligned.h to linux/unaligned.h")
>   5e6bf74d63c2 ("Staging: rtl8192e: Rename variable RxDrvInfoSize")
> and many others
> 
> from Linus' tree (pre v6.12-rc2) and commit:
> 
>   be9be9f54f22 ("staging: rtl8192e: delete the driver")
> 
> from the wireless-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.

Johannes, any objection if I just pull in your wireless-next tree into
my staging-next branch so that we don't get these issues going forward?

It's not going to be rebased, right?

thanks,

greg k-h

Re: linux-next: manual merge of the wireless-next tree with Linus' tree

[Johannes Berg]

On Wed, 2024-10-09 at 08:43 +0200, Greg Kroah-Hartman wrote:
> 
> Johannes, any objection if I just pull in your wireless-next tree into
> my staging-next branch so that we don't get these issues going forward?
> 
> It's not going to be rebased, right?
> 

It's not.

However, Stephen also reported a build failure that you don't want to
pull in, so you can either

 * pull in commit 836265d31631 ("wifi: remove iw_public_data from struct
   net_device") from before the build failure,

 * pull in commit 4991d2e7ad38 ("staging: don't recommend using
   lib80211") which is really all you care about (both staging
   patches I had are included at that point), or

 * give me an hour or so to revert commit aee809aaa2d1 ("wifi: cfg80211:
   unexport wireless_nlevent_flush()") which caused a build failure.


But if the conflict is to Linus's tree, is that even going to help?
Seems like I should pull in -rc2 and solve this one and the ks7010 one
that way? Just need to check with net-next?

johannes

Re: linux-next: manual merge of the wireless-next tree with Linus' tree

[Greg Kroah-Hartman]

On Wed, Oct 09, 2024 at 08:51:22AM +0200, Johannes Berg wrote:
> On Wed, 2024-10-09 at 08:43 +0200, Greg Kroah-Hartman wrote:
> > 
> > Johannes, any objection if I just pull in your wireless-next tree into
> > my staging-next branch so that we don't get these issues going forward?
> > 
> > It's not going to be rebased, right?
> > 
> 
> It's not.
> 
> However, Stephen also reported a build failure that you don't want to
> pull in, so you can either
> 
>  * pull in commit 836265d31631 ("wifi: remove iw_public_data from struct
>    net_device") from before the build failure,
> 
>  * pull in commit 4991d2e7ad38 ("staging: don't recommend using
>    lib80211") which is really all you care about (both staging
>    patches I had are included at that point), or
> 
>  * give me an hour or so to revert commit aee809aaa2d1 ("wifi: cfg80211:
>    unexport wireless_nlevent_flush()") which caused a build failure.
> 
> 
> But if the conflict is to Linus's tree, is that even going to help?
> Seems like I should pull in -rc2 and solve this one and the ks7010 one
> that way? Just need to check with net-next?

I'm not worried about the conflict with Linus's tree, sorry, I now see
that that's what was being reported here also.  I just want to get your
staging driver changes, so I'll pull in up to commit 4991d2e7ad38, which
is all I really care about :)

thanks,

greg k-h

Re: linux-next: manual merge of the wireless-next tree with Linus' tree

[Johannes Berg]

On Wed, 2024-10-09 at 09:13 +0200, Greg Kroah-Hartman wrote:

> > But if the conflict is to Linus's tree, is that even going to help?
> > Seems like I should pull in -rc2 and solve this one and the ks7010 one
> > that way? Just need to check with net-next?
> 
> I'm not worried about the conflict with Linus's tree, sorry, I now see
> that that's what was being reported here also.

Ah OK. But I checked, and I can just pull in net-next to resolve this
and two other conflicts (where one appears to be due to git getting
confused between moving a file and deleting another copy of it in
staging), so I'll probably just do that, just need to sync with Kalle.

> I just want to get your
> staging driver changes, so I'll pull in up to commit 4991d2e7ad38, which
> is all I really care about :)

Oh OK, so that's mostly unrelated then. Sure, you can pull that in so
you have the staging changes I've made in case other staging patches
want to touch the files.


Although ... maybe wait with that too. If you merge that now you'll have
to resolve (some of) the conflicts, and if I'm merging net-next now as
well we'll have two conflict resolutions for the same thing? That seems
a bit strange, even if the resolutions are almost certainly going to be
identical.

I can push out the net-next merge (& revert) soon, and then it'll all be
cleaner?

johannes

Re: linux-next: manual merge of the wireless-next tree with Linus' tree

[Greg Kroah-Hartman]

On Wed, Oct 09, 2024 at 09:19:40AM +0200, Johannes Berg wrote:
> On Wed, 2024-10-09 at 09:13 +0200, Greg Kroah-Hartman wrote:
> 
> > > But if the conflict is to Linus's tree, is that even going to help?
> > > Seems like I should pull in -rc2 and solve this one and the ks7010 one
> > > that way? Just need to check with net-next?
> > 
> > I'm not worried about the conflict with Linus's tree, sorry, I now see
> > that that's what was being reported here also.
> 
> Ah OK. But I checked, and I can just pull in net-next to resolve this
> and two other conflicts (where one appears to be due to git getting
> confused between moving a file and deleting another copy of it in
> staging), so I'll probably just do that, just need to sync with Kalle.
> 
> > I just want to get your
> > staging driver changes, so I'll pull in up to commit 4991d2e7ad38, which
> > is all I really care about :)
> 
> Oh OK, so that's mostly unrelated then. Sure, you can pull that in so
> you have the staging changes I've made in case other staging patches
> want to touch the files.
> 
> 
> Although ... maybe wait with that too. If you merge that now you'll have
> to resolve (some of) the conflicts, and if I'm merging net-next now as
> well we'll have two conflict resolutions for the same thing? That seems
> a bit strange, even if the resolutions are almost certainly going to be
> identical.
> 
> I can push out the net-next merge (& revert) soon, and then it'll all be
> cleaner?

Sure, I'll wait, just let me know what commit to merge at, from what
tree, whenever you have it ready.

thanks!

greg k-h

Re: linux-next: manual merge of the wireless-next tree with Linus' tree

[Johannes Berg]

On Wed, 2024-10-09 at 09:27 +0200, Greg Kroah-Hartman wrote:
> > 
> > I can push out the net-next merge (& revert) soon, and then it'll all be
> > cleaner?
> 
> Sure, I'll wait, just let me know what commit to merge at, from what
> tree, whenever you have it ready.
> 

I've done all that now, so you could merge wireless-next/main up to its
head, which right now is a0efa2f362a6 ("Merge net-next/main to resolve
conflicts").

johannes

Re: linux-next: manual merge of the wireless-next tree with Linus' tree

[Greg Kroah-Hartman]

On Wed, Oct 09, 2024 at 10:30:12AM +0200, Johannes Berg wrote:
> On Wed, 2024-10-09 at 09:27 +0200, Greg Kroah-Hartman wrote:
> > > 
> > > I can push out the net-next merge (& revert) soon, and then it'll all be
> > > cleaner?
> > 
> > Sure, I'll wait, just let me know what commit to merge at, from what
> > tree, whenever you have it ready.
> > 
> 
> I've done all that now, so you could merge wireless-next/main up to its
> head, which right now is a0efa2f362a6 ("Merge net-next/main to resolve
> conflicts").

Sure, will do so now.  That branch has a lot of non-staging stuff in it
but git can figure it out when it's all merged together so all is good!

thanks,

greg k-h

linux-next: manual merge of the wireless-next tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 745 bytes --]

Hi all,

Today's linux-next merge of the wireless-next tree got a conflict in:

  drivers/staging/ks7010/TODO

between commit:

  d93e795b8621 ("staging: ks7010: Remove unused driver")

from Linus' tree and commit:

  4991d2e7ad38 ("staging: don't recommend using lib80211")

from the wireless-next tree.

I fixed it up (I just removed the file) 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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the wireless-next tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1549 bytes --]

Hi all,

Today's linux-next merge of the wireless-next tree got a conflict in:

  drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c

between commit:

  1d85bb7fd66a ("staging: rtl8723bs: Fix alignment open parenthesis")

from Linus' tree and commit:

  66f85d57b710 ("wifi: cfg80211: modify prototype for change_beacon")
  bb55441c57cc ("wifi: cfg80211: split struct cfg80211_ap_settings")

from the wireless-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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index af155fca39b8,1e683212027c..000000000000
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@@ -2317,9 -2318,8 +2317,9 @@@ static int cfg80211_rtw_start_ap(struc
  	return ret;
  }
  
 -static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
 -		struct cfg80211_ap_update *info)
 +static int cfg80211_rtw_change_beacon(struct wiphy *wiphy,
 +				      struct net_device *ndev,
- 				      struct cfg80211_beacon_data *info)
++				      struct cfg80211_ap_update *info)
  {
  	struct adapter *adapter = rtw_netdev_priv(ndev);
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the wireless-next tree with Linus' tree

[Greg Kroah-Hartman]

On Tue, Sep 26, 2023 at 11:54:52AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the wireless-next tree got a conflict in:
> 
>   drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> 
> between commit:
> 
>   1d85bb7fd66a ("staging: rtl8723bs: Fix alignment open parenthesis")
> 
> from Linus' tree and commit:
> 
>   66f85d57b710 ("wifi: cfg80211: modify prototype for change_beacon")
>   bb55441c57cc ("wifi: cfg80211: split struct cfg80211_ap_settings")
> 
> from the wireless-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.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> index af155fca39b8,1e683212027c..000000000000
> --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> @@@ -2317,9 -2318,8 +2317,9 @@@ static int cfg80211_rtw_start_ap(struc
>   	return ret;
>   }
>   
>  -static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
>  -		struct cfg80211_ap_update *info)
>  +static int cfg80211_rtw_change_beacon(struct wiphy *wiphy,
>  +				      struct net_device *ndev,
> - 				      struct cfg80211_beacon_data *info)
> ++				      struct cfg80211_ap_update *info)
>   {
>   	struct adapter *adapter = rtw_netdev_priv(ndev);
>   


Looks good to me, thanks!

greg k-h

linux-next: manual merge of the wireless-next tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1483 bytes --]

Hi all,

Today's linux-next merge of the wireless-next tree got a conflict in:

  drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c

between commit:

  1d85bb7fd66a ("staging: rtl8723bs: Fix alignment open parenthesis")

from Linus' tree and commit:

  66f85d57b710 ("wifi: cfg80211: modify prototype for change_beacon")

from the wireless-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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index af155fca39b8,5ddc2d9a6060..000000000000
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@@ -2317,9 -2318,8 +2317,9 @@@ static int cfg80211_rtw_start_ap(struc
  	return ret;
  }
  
 -static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
 -		struct cfg80211_ap_settings *info)
 +static int cfg80211_rtw_change_beacon(struct wiphy *wiphy,
 +				      struct net_device *ndev,
- 				      struct cfg80211_beacon_data *info)
++				      struct cfg80211_ap_settings *info)
  {
  	struct adapter *adapter = rtw_netdev_priv(ndev);
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the wireless-next tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1015 bytes --]

Hi John,

Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/ethernet/broadcom/Kconfig between commit 31bd29776b85
("bgmac: add dependency to phylib") from Linus' tree and commit
72bb2f267887 ("bgmac: make bgmac depend on bcm47xx") from the
wireless-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/ethernet/broadcom/Kconfig
index 52c9603,7b839bf..0000000
--- a/drivers/net/ethernet/broadcom/Kconfig
+++ b/drivers/net/ethernet/broadcom/Kconfig
@@@ -130,8 -130,7 +130,8 @@@ config BNX2X_SRIO
  
  config BGMAC
  	tristate "BCMA bus GBit core support"
- 	depends on BCMA_HOST_SOC && HAS_DMA
+ 	depends on BCMA_HOST_SOC && HAS_DMA && BCM47XX
 +	select PHYLIB
  	---help---
  	  This driver supports GBit MAC and BCM4706 GBit MAC cores on BCMA bus.
  	  They can be found on BCM47xx SoCs and provide gigabit ethernet.

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the wireless-next tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1184 bytes --]

Hi John,

Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/iwlwifi/dvm/tx.c between commit f590dcec9445
("iwlwifi: fix the reclaimed packet tracking upon flush queue") from
Linus' tree and commit 1c3fea82d6eb ("iwlwifi: improve the reports in TX
path") from the wireless-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/wireless/iwlwifi/dvm/tx.c
index 31534f7,b0aad71..0000000
--- a/drivers/net/wireless/iwlwifi/dvm/tx.c
+++ b/drivers/net/wireless/iwlwifi/dvm/tx.c
@@@ -1218,14 -1205,8 +1210,15 @@@ int iwlagn_rx_reply_tx(struct iwl_priv 
  			freed++;
  		}
  
 +		if (tid != IWL_TID_NON_QOS) {
 +			priv->tid_data[sta_id][tid].next_reclaimed =
 +				next_reclaimed;
 +			IWL_DEBUG_TX_REPLY(priv, "Next reclaimed packet:%d\n",
 +					   next_reclaimed);
 +		}
 +
- 		WARN_ON(!is_agg && freed != 1);
+ 		if (!is_agg && freed != 1)
+ 			IWL_ERR(priv, "Q: %d, freed %d\n", txq_id, freed);
  
  		/*
  		 * An offchannel frame can be send only on the AUX queue, where

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

RE: linux-next: manual merge of the wireless-next tree with Linus' tree

[Grumbach, Emmanuel]

> Today's linux-next merge of the wireless-next tree got a conflict in
> drivers/net/wireless/iwlwifi/dvm/tx.c between commit f590dcec9445
> ("iwlwifi: fix the reclaimed packet tracking upon flush queue") from Linus' tree
> and commit 1c3fea82d6eb ("iwlwifi: improve the reports in TX
> path") from the wireless-next tree.
> 

> diff --cc drivers/net/wireless/iwlwifi/dvm/tx.c
> index 31534f7,b0aad71..0000000
> --- a/drivers/net/wireless/iwlwifi/dvm/tx.c
> +++ b/drivers/net/wireless/iwlwifi/dvm/tx.c
> @@@ -1218,14 -1205,8 +1210,15 @@@ int iwlagn_rx_reply_tx(struct iwl_priv
>   			freed++;
>   		}
> 
>  +		if (tid != IWL_TID_NON_QOS) {
>  +			priv->tid_data[sta_id][tid].next_reclaimed =
>  +				next_reclaimed;
>  +			IWL_DEBUG_TX_REPLY(priv, "Next reclaimed
> packet:%d\n",
>  +					   next_reclaimed);
>  +		}
>  +
> - 		WARN_ON(!is_agg && freed != 1);
> + 		if (!is_agg && freed != 1)
> + 			IWL_ERR(priv, "Q: %d, freed %d\n", txq_id, freed);
> 

This looks fine - thanks!
---------------------------------------------------------------------
A member of the Intel Corporation group of companies

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.

linux-next: manual merge of the wireless-next tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 668 bytes --]

Hi John,

Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/iwlegacy/iwl-tx.c
drivers/net/wireless/iwlegacy/iwl-scan.c
drivers/net/wireless/iwlegacy/iwl-rx.c
drivers/net/wireless/iwlegacy/iwl-debugfs.c between commit ee40fa0656a7
("drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE")
from Linus' tree and various commits from the wireless-next tree that
renamed/merged these files.

I just removed these files.  Though someone should check to see if the
new files need export.h or module.h.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]