linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Gustavo Padovan <gustavo@padovan.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Ying Xue <ying.xue@windriver.com>,
	David Miller <davem@davemloft.net>,
	netdev@vger.kernel.org, Dean Jenkins <Dean_Jenkins@mentor.com>
Subject: linux-next: manual merge of the bluetooth tree with Linus' tree
Date: Fri, 1 Mar 2013 12:54:25 +1100	[thread overview]
Message-ID: <20130301125425.1819c6cc77fb64be71351ade@canb.auug.org.au> (raw)

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

Hi Gustavo,

Today's linux-next merge of the bluetooth tree got a conflict in
net/bluetooth/rfcomm/core.c between commit 25cc4ae913a4 ("net: remove
redundant check for timer pending state before del_timer") from Linus' tree
and commit 5c87e6efd14d ("Bluetooth: Avoid rfcomm_session_timeout using
freed session") from the bluetooth tree.

I fixed it up (I just used the bluetooth tree version) and can carry the
fix as necessary (no action is required).

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

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

             reply	other threads:[~2013-03-01  1:54 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-01  1:54 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-05-09  1:41 linux-next: manual merge of the bluetooth tree with Linus' tree 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-10-25  6:25 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=20130301125425.1819c6cc77fb64be71351ade@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=Dean_Jenkins@mentor.com \
    --cc=davem@davemloft.net \
    --cc=gustavo@padovan.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=ying.xue@windriver.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: 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;
as well as URLs for NNTP newsgroup(s).