From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: build failure after merge of the wireless tree Date: Thu, 23 Jun 2011 13:03:17 +1000 Message-ID: <20110623130317.b3a6085e.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Anderson Briglia , Anderson Lizardo , Bruna Moreira , Vinicius Costa Gomes , "Gustavo F. Padovan" , Alexey Dobriyan , David Miller , To: "John W. Linville" Return-path: Sender: linux-next-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Hi John, After merging the wireless tree, today's linux-next build (x86_64 allmodconfig) failed like this: net/bluetooth/smp.c: In function 'smp_e': net/bluetooth/smp.c:49:21: error: storage size of 'sg' isn't known net/bluetooth/smp.c:67:2: error: implicit declaration of function 'sg_init_one' net/bluetooth/smp.c:49:21: warning: unused variable 'sg' Caused by commit d22ef0bc83c5 ("Bluetooth: Add LE SMP Cryptoolbox functions"). Missing include file, presumably. This batch has been in the bluetooth tree since June 14, so it may have been exposed by the removal of linux/mm.h from netdevice.h ... I have added the following patch as a merge fix up for today. From: Stephen Rothwell Date: Thu, 23 Jun 2011 12:58:55 +1000 Subject: [PATCH] Bluetooth: include scatterlist.h where needed Signed-off-by: Stephen Rothwell --- net/bluetooth/smp.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index 52e9ec2..a36f870 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #define SMP_TIMEOUT 30000 /* 30 seconds */ -- 1.7.5.4 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/