linux-kernel - Re: linux-next: manual merge of the bluetooth tree with the wireless tree

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20130927150854.GA13211@joana>
Date:	Fri, 27 Sep 2013 12:08:54 -0300
From:	Gustavo Padovan <gustavo@...ovan.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Johan Hedberg <johan.hedberg@...el.com>,
	"John W. Linville" <linville@...driver.com>,
	Marcel Holtmann <marcel@...tmann.org>
Subject: Re: linux-next: manual merge of the bluetooth tree with the wireless
 tree

Hi Stephen,

2013-09-27 Stephen Rothwell <sfr@...b.auug.org.au>:

> Hi Gustavo,
> 
> Today's linux-next merge of the bluetooth tree got a conflict in
> net/bluetooth/hci_core.c between commit 5e130367d43f ("Bluetooth:
> Introduce a new HCI_RFKILLED flag") from the wireless tree and commit
> 0736cfa8e5bb ("Bluetooth: Introduce user channel flag for HCI devices")
> from the bluetooth tree.

Thanks for reporting, I knew about it about but didn't had any time to fix it
yesterday. I just merged bluetooth.git on bluetooth-next.git and fixed this.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
> P.S. that closing brace is badly indented :-(

Yeah, it is now fixed on bluetooth-next at least.

	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/