From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758112Ab1D2CFr (ORCPT ); Thu, 28 Apr 2011 22:05:47 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:59259 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753026Ab1D2CFp (ORCPT ); Thu, 28 Apr 2011 22:05:45 -0400 Date: Fri, 29 Apr 2011 12:05:41 +1000 From: Stephen Rothwell To: "Rafael J. Wysocki" Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Eric Dumazet , David Miller , Subject: linux-next: manual merge of the suspend tree with the net tree Message-Id: <20110429120541.c27998c2.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.1.0 (GTK+ 2.24.4; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Rafael, Today's linux-next merge of the suspend tree got a conflict in arch/x86/Kconfig between commit 0a14842f5a3c ("net: filter: Just In Time compiler for x86-64") from the tree and commit d9f1ce017fcf ("PM: Remove sysdev suspend, resume and shutdown operations") from the suspend tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc arch/x86/Kconfig index 92d07bd,140e254..0000000 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@@ -71,8 -71,6 +71,7 @@@ config X8 select GENERIC_IRQ_SHOW select IRQ_FORCED_THREADING select USE_GENERIC_SMP_HELPERS if SMP - select ARCH_NO_SYSDEV_OPS + select HAVE_BPF_JIT if X86_64 config INSTRUCTION_DECODER def_bool (KPROBES || PERF_EVENTS)