From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752100AbbCVKiV (ORCPT ); Sun, 22 Mar 2015 06:38:21 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:55049 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751781AbbCVKiQ (ORCPT ); Sun, 22 Mar 2015 06:38:16 -0400 Date: Sun, 22 Mar 2015 11:38:14 +0100 From: Greg KH To: Linus Torvalds , Andrew Morton , Arnd Bergmann Cc: linux-kernel@vger.kernel.org Subject: [GIT PULL] char/misc driver fixes for 4.0-rc5 Message-ID: <20150322103814.GB22221@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following changes since commit 9eccca0843205f87c00404b663188b88eb248051: Linux 4.0-rc3 (2015-03-08 16:09:09 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git/ tags/char-misc-4.0-rc5 for you to fetch changes up to 3d7a8278fdfdea5be4c647853171a0df5d13c1d3: Revert "pcmcia: add a new resource manager for non ISA systems" (2015-03-11 14:21:23 +0100) ---------------------------------------------------------------- Char/MISC fixes for 4.0-rc5 Here are three fixes for 4.0-rc5 that revert 3 PCMCIA patches that were merged in 4.0-rc1 that cause regressions. So let's revert them for now and they will be reworked and resent sometime in the future. All have been tested in linux-next for a while. Signed-off-by: Greg Kroah-Hartman ---------------------------------------------------------------- Greg Kroah-Hartman (3): Revert "pcmcia: add missing include for new pci resource handler" Revert "pcmcia: fix incorrect bracketing on a test" Revert "pcmcia: add a new resource manager for non ISA systems" drivers/pcmcia/Kconfig | 12 +--- drivers/pcmcia/Makefile | 1 - drivers/pcmcia/rsrc_pci.c | 173 ---------------------------------------------- 3 files changed, 3 insertions(+), 183 deletions(-) delete mode 100644 drivers/pcmcia/rsrc_pci.c