From: Stephen Rothwell <sfr@canb.auug.org.au> To: "Gustavo F. Padovan" <padovan@profusion.mobi> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Moore <pmoore@redhat.com>, David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>, Andrei Emeltchenko <andrei.emeltchenko@intel.com> Subject: linux-next: manual merge of the bluetooth tree with Linus' tree Date: Tue, 25 Oct 2011 17:25:09 +1100 [thread overview] Message-ID: <20111025172509.931831a5ad9ae3dab8fca562@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 1113 bytes --] Hi Gustavo, Today's linux-next merge of the bluetooth tree got a conflict in net/bluetooth/l2cap_sock.c between commit 6230c9b4f895 ("bluetooth: Properly clone LSM attributes to newly created child connections") from Linus' tree and commit 15770b1ab974 ("Bluetooth: convert force_active variable to flag in l2cap chan") from the bluetooth tree. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc net/bluetooth/l2cap_sock.c index e829236,836d12e..0000000 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@@ -931,12 -944,7 +946,9 @@@ static void l2cap_sock_init(struct soc chan->max_tx = pchan->max_tx; chan->tx_win = pchan->tx_win; chan->sec_level = pchan->sec_level; - chan->role_switch = pchan->role_switch; - chan->force_reliable = pchan->force_reliable; - chan->flushable = pchan->flushable; - chan->force_active = pchan->force_active; + chan->flags = pchan->flags; + + security_sk_clone(parent, sk); } else { switch (sk->sk_type) { [-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au> To: "Gustavo F. Padovan" <padovan@profusion.mobi> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Moore <pmoore@redhat.com>, David Miller <davem@davemloft.net>, netdev@vger.kernel.org, Andrei Emeltchenko <andrei.emeltchenko@intel.com> Subject: linux-next: manual merge of the bluetooth tree with Linus' tree Date: Tue, 25 Oct 2011 17:25:09 +1100 [thread overview] Message-ID: <20111025172509.931831a5ad9ae3dab8fca562@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 1113 bytes --] Hi Gustavo, Today's linux-next merge of the bluetooth tree got a conflict in net/bluetooth/l2cap_sock.c between commit 6230c9b4f895 ("bluetooth: Properly clone LSM attributes to newly created child connections") from Linus' tree and commit 15770b1ab974 ("Bluetooth: convert force_active variable to flag in l2cap chan") from the bluetooth tree. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc net/bluetooth/l2cap_sock.c index e829236,836d12e..0000000 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@@ -931,12 -944,7 +946,9 @@@ static void l2cap_sock_init(struct soc chan->max_tx = pchan->max_tx; chan->tx_win = pchan->tx_win; chan->sec_level = pchan->sec_level; - chan->role_switch = pchan->role_switch; - chan->force_reliable = pchan->force_reliable; - chan->flushable = pchan->flushable; - chan->force_active = pchan->force_active; + chan->flags = pchan->flags; + + security_sk_clone(parent, sk); } else { switch (sk->sk_type) { [-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2011-10-25 6:25 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-10-25 6:25 Stephen Rothwell [this message] 2011-10-25 6:25 ` linux-next: manual merge of the bluetooth tree with Linus' tree Stephen Rothwell -- strict thread matches above, loose matches on Subject: below -- 2014-05-09 1:41 Stephen Rothwell 2013-03-01 1:54 Stephen Rothwell 2013-03-01 1:54 ` Stephen Rothwell 2011-11-08 1:58 linux-next: manual merge of the bluetooth tree with Linus tree Stephen Rothwell 2011-11-04 2:55 linux-next: manual merge of the bluetooth tree with Linus' tree Stephen Rothwell 2011-04-28 1:34 Stephen Rothwell 2011-04-28 3:36 ` Gustavo F. Padovan
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=20111025172509.931831a5ad9ae3dab8fca562@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=andrei.emeltchenko@intel.com \ --cc=davem@davemloft.net \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=netdev@vger.kernel.org \ --cc=padovan@profusion.mobi \ --cc=pmoore@redhat.com \ /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: linkBe 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.