lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 6 Jul 2011 08:07:30 -0300 From: Gustavo Padovan <padovan@...fusion.mobi> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: David Miller <davem@...emloft.net>, netdev@...r.kernel.org, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org Subject: Re: linux-next: manual merge of the net tree with the wireless-current tree * Stephen Rothwell <sfr@...b.auug.org.au> [2011-07-06 12:53:29 +1000]: > Hi all, > > Today's linux-next merge of the net tree got a conflict in > net/bluetooth/l2cap_core.c between commit 9fa7e4f76f36 ("Bluetooth: Fix > regression with incoming L2CAP connections") from the wireless-current > tree and commit 89bc500e41fc ("Bluetooth: Add state tracking to struct > l2cap_chan") from the net tree. > > I fixed it up (I think - see below) and can carry the fix as necessary. > -- > Cheers, > Stephen Rothwell sfr@...b.auug.org.au > > diff --cc net/bluetooth/l2cap_core.c > index ebff14c,9ec9c8c..0000000 > --- a/net/bluetooth/l2cap_core.c > +++ b/net/bluetooth/l2cap_core.c > @@@ -2323,8 -2530,7 +2530,8 @@@ static inline int l2cap_config_req(stru > > sk = chan->sk; > > - if ((bt_sk(sk)->defer_setup && sk->sk_state != BT_CONNECT2) || > - (!bt_sk(sk)->defer_setup && sk->sk_state != BT_CONFIG)) { > - if (chan->state != BT_CONFIG) { > ++ if ((bt_sk(sk)->defer_setup && chan->state != BT_CONNECT2) || > ++ (!bt_sk(sk)->defer_setup && chan->state != BT_CONFIG)) { Seems I need to merge my own trees. I'll do that. Thanks, Stephen. And the fix is right ;) Gustavo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists