From patchwork Thu Dec 16 09:44:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 1569005 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=Qu1H6Lut; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4JF6gn3Nqpz9s0r for ; Thu, 16 Dec 2021 20:46:13 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235663AbhLPJqL (ORCPT ); Thu, 16 Dec 2021 04:46:11 -0500 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:51014 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235655AbhLPJqJ (ORCPT ); Thu, 16 Dec 2021 04:46:09 -0500 Received: from mail-lj1-f198.google.com (mail-lj1-f198.google.com [209.85.208.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 67C253FFDA for ; Thu, 16 Dec 2021 09:46:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1639647968; bh=ifKlZYGTOPdFCSDCTOtZXvFjnN1ta3FdQcJv2C1mO4Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Qu1H6Lut0kiGGY2GXaCK8BOZNPmfiBZyJglUcsuokeNFlj4pcMRd7zCKApIXEBJXv 3u42ybmRiP//1Ez2Ife48jCuX6S3Hh3B+rEPqCM67NGvOIbqLrix5GiV8uZ6ecwU3v Ty5xx4zbK9HplgIz74CfMCBLeEBh7Is8rZ0eH9d1AeKdVv+OZOzy4pcrqCVY6Gav/4 Kh5KDZXxY+3bI9unEySdjuhLKzAx7QBlIH5BV7ZNRpDPuW+vgGra1z7OWDNBvmkqg2 e/ibw3/xkXkbEssgfBzpjmoV7giOUCAjlZ4Kc8dRvQaVUMMZn43jNLWYgOsH03CfwM 0q0aFov2SDCKA== Received: by mail-lj1-f198.google.com with SMTP id b14-20020a05651c0b0e00b0021a1a39c481so8329767ljr.3 for ; Thu, 16 Dec 2021 01:46:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ifKlZYGTOPdFCSDCTOtZXvFjnN1ta3FdQcJv2C1mO4Q=; b=4FstuOPC9VW889eYCZNyCkdO3+qknCBtCPPMq7gTI4D9G9IcM8WMC1k3ZA8+Lvvdx3 PgjjPzGoQk0O5q2xDx6GWcEpq8U2Phvemo4eQ5SKmxkGilUacXYYI394YqJXIryHfXbk ptgq1+m+0511m12V04Agp4zj6seHCzL2+jGYjAUzCKISixFx03Jve5Do8DoUrnF3NaSN 6fDwMzQGkaVXr2l3YsmK4+gncz/WV8HyZngALmbYfskzgYbGH9WMtFZou8B8D31MwQQM IERP1GPCOooIQYqCbJ6eXQ061yMSPlrZFL3durF4c/vg5naAWnFaxP65m+i6GSDQrJOr 4L2A== X-Gm-Message-State: AOAM530F5XBSViDjPToK5/60uGpGSvlIac21OIF+a2S8aJhwB9IDdnwP IS7TppkNVj3eq64r++yXz8FqkbNl5wR7W1RqeG6KlIsVtdx00Qf6uiZA7XcJpg7kSY92FRgVzKe ST3dlS/AvxvHaVaYHPX3P070dFY9oAXj+SfUiGrQ= X-Received: by 2002:a5d:59af:: with SMTP id p15mr8145361wrr.314.1639647955362; Thu, 16 Dec 2021 01:45:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJyzUGy/dKebedUXgoem/d6gyVVYcP7Z2hszf3HxXNiUwHW6hBLUxxafQ7sSJ/XEtEqxAbevgA== X-Received: by 2002:a5d:59af:: with SMTP id p15mr8145334wrr.314.1639647955104; Thu, 16 Dec 2021 01:45:55 -0800 (PST) Received: from alex.home (lfbn-gre-1-195-1.w90-112.abo.wanadoo.fr. [90.112.158.1]) by smtp.gmail.com with ESMTPSA id t8sm4349398wrv.30.2021.12.16.01.45.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 01:45:54 -0800 (PST) From: Alexandre Ghiti To: Steve French , Jonathan Corbet , David Howells , Russell King , Thomas Bogendoerfer , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Yoshinori Sato , Rich Felker , Matti Vaittinen , Lee Jones , Jeff Layton , Greg Kroah-Hartman , Arnd Bergmann , Ronnie Sahlberg , Guenter Roeck , Wim Van Sebroeck , Lukas Bulwahn , Luis Chamberlain , Kalle Valo , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-cachefs@redhat.com, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-power@fi.rohmeurope.com Cc: Alexandre Ghiti Subject: [PATCH v2 1/6] Documentation, arch: Remove leftovers from fscache/cachefiles histograms Date: Thu, 16 Dec 2021 10:44:21 +0100 Message-Id: <20211216094426.2083802-2-alexandre.ghiti@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211216094426.2083802-1-alexandre.ghiti@canonical.com> References: <20211216094426.2083802-1-alexandre.ghiti@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org A few references to the fscache and cachefiles histograms were left in the Documentation and some arch defconfigs: remove them since those configs do not exist anymore. Fixes: 6ae9bd8bb037("fscache, cachefiles: Remove the histogram stuff") Signed-off-by: Alexandre Ghiti Acked-by: Arnd Bergmann [arch/arm/configs] --- .../filesystems/caching/cachefiles.rst | 34 ------------------- Documentation/filesystems/caching/fscache.rst | 34 ++----------------- arch/arm/configs/axm55xx_defconfig | 2 -- 3 files changed, 2 insertions(+), 68 deletions(-) diff --git a/Documentation/filesystems/caching/cachefiles.rst b/Documentation/filesystems/caching/cachefiles.rst index e58bc1fd312a..e59861458029 100644 --- a/Documentation/filesystems/caching/cachefiles.rst +++ b/Documentation/filesystems/caching/cachefiles.rst @@ -424,40 +424,6 @@ for CacheFiles to run in a context of a specific security label, or to create files and directories with another security label. -Statistical Information -======================= - -If FS-Cache is compiled with the following option enabled:: - - CONFIG_CACHEFILES_HISTOGRAM=y - -then it will gather certain statistics and display them through a proc file. - - /proc/fs/cachefiles/histogram - - :: - - cat /proc/fs/cachefiles/histogram - JIFS SECS LOOKUPS MKDIRS CREATES - ===== ===== ========= ========= ========= - - This shows the breakdown of the number of times each amount of time - between 0 jiffies and HZ-1 jiffies a variety of tasks took to run. The - columns are as follows: - - ======= ======================================================= - COLUMN TIME MEASUREMENT - ======= ======================================================= - LOOKUPS Length of time to perform a lookup on the backing fs - MKDIRS Length of time to perform a mkdir on the backing fs - CREATES Length of time to perform a create on the backing fs - ======= ======================================================= - - Each row shows the number of events that took a particular range of times. - Each step is 1 jiffy in size. The JIFS column indicates the particular - jiffy range covered, and the SECS field the equivalent number of seconds. - - Debugging ========= diff --git a/Documentation/filesystems/caching/fscache.rst b/Documentation/filesystems/caching/fscache.rst index 70de86922b6a..66e31a6d1070 100644 --- a/Documentation/filesystems/caching/fscache.rst +++ b/Documentation/filesystems/caching/fscache.rst @@ -201,10 +201,9 @@ Statistical Information If FS-Cache is compiled with the following options enabled:: CONFIG_FSCACHE_STATS=y - CONFIG_FSCACHE_HISTOGRAM=y -then it will gather certain statistics and display them through a number of -proc files. +then it will gather certain statistics and display them through the following +proc file. /proc/fs/fscache/stats ---------------------- @@ -413,35 +412,6 @@ proc files. -/proc/fs/fscache/histogram --------------------------- - - :: - - cat /proc/fs/fscache/histogram - JIFS SECS OBJ INST OP RUNS OBJ RUNS RETRV DLY RETRIEVLS - ===== ===== ========= ========= ========= ========= ========= - - This shows the breakdown of the number of times each amount of time - between 0 jiffies and HZ-1 jiffies a variety of tasks took to run. The - columns are as follows: - - ========= ======================================================= - COLUMN TIME MEASUREMENT - ========= ======================================================= - OBJ INST Length of time to instantiate an object - OP RUNS Length of time a call to process an operation took - OBJ RUNS Length of time a call to process an object event took - RETRV DLY Time between an requesting a read and lookup completing - RETRIEVLS Time between beginning and end of a retrieval - ========= ======================================================= - - Each row shows the number of events that took a particular range of times. - Each step is 1 jiffy in size. The JIFS column indicates the particular - jiffy range covered, and the SECS field the equivalent number of seconds. - - - Object List =========== diff --git a/arch/arm/configs/axm55xx_defconfig b/arch/arm/configs/axm55xx_defconfig index 46075216ee6d..b36e0b347d1f 100644 --- a/arch/arm/configs/axm55xx_defconfig +++ b/arch/arm/configs/axm55xx_defconfig @@ -204,11 +204,9 @@ CONFIG_FUSE_FS=y CONFIG_CUSE=y CONFIG_FSCACHE=y CONFIG_FSCACHE_STATS=y -CONFIG_FSCACHE_HISTOGRAM=y CONFIG_FSCACHE_DEBUG=y CONFIG_FSCACHE_OBJECT_LIST=y CONFIG_CACHEFILES=y -CONFIG_CACHEFILES_HISTOGRAM=y CONFIG_ISO9660_FS=y CONFIG_UDF_FS=y CONFIG_MSDOS_FS=y From patchwork Thu Dec 16 09:44:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 1569012 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=nF2cORUT; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4JF6j74Fd4z9s0r for ; Thu, 16 Dec 2021 20:47:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236005AbhLPJrW (ORCPT ); Thu, 16 Dec 2021 04:47:22 -0500 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:51066 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236090AbhLPJq7 (ORCPT ); Thu, 16 Dec 2021 04:46:59 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 8C01C3FFD8 for ; Thu, 16 Dec 2021 09:46:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1639648017; bh=vikRa1nxzcY4uLugL2Q09RF+hmHrdpmpkJ7AXRwjM28=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nF2cORUTKJACdz8C6aVCKuDjvoXmFw9DBhYNaI1yRD+MedexsI/TLDFa500zY/ovb HS3LU4XanYooO3n9xX+NCgHZZG9aIe9m+rrcMdaozzR2FJ94A3pAjx8cV1qvJUpaXz Du7g/8+CPtx2SXjpkHQJVnPW9jhWveANFJSnZ4ud4JP8K2LbUjEC3zWqs79DaC6KbV PhTrt2PXV5+pDuda15o3VCQ421+49DQtctVso+Q3CApgA1BP/M6Y+xpvc9enI1aRyv iU16/YGtV8xCuO/WHLPsy90Uki3BarTMIc62POzmW6xNMAObrCmORACyMjmk4FTco7 vWrRug9mEOAYw== Received: by mail-wm1-f72.google.com with SMTP id k25-20020a05600c1c9900b00332f798ba1dso1025370wms.4 for ; Thu, 16 Dec 2021 01:46:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vikRa1nxzcY4uLugL2Q09RF+hmHrdpmpkJ7AXRwjM28=; b=skZbs0h7/Gsi6A9+q8QEkWHpFEg1u4VH3B8/nPos2MRFSTqmeNrCWKTx7VLZ9mSxbs nwRzS6iXXD+ArhcN5uMM3Gfwtnbg9c03lrglpGkIMPs72mteA1CB0/qJo2XQomFPVzFd 3f0e0rHmW2/dVdYZDvjOEnVxJCLiU+P9n3FbHJR+oD47h1aECAnX9Qn//g0JfW6hg2mm S4htheFUo4zr0f8ns7zd+4qvg2UEXUiSqm7OVAQh3L+cOzIEImTFbxVV1QiyXXIKmj/Z wnGnn/ueM6ntgGD2Pnwf/dI11Bu9gSpr3oolQbALy+sSLb2V7YdOn0JIJ79MZSRvy0VD L6oQ== X-Gm-Message-State: AOAM5305rgBuh/L9aUwDcbX2S/PGHiUkyjm25dloNuNq5MNnixdw5cVD 1L+u32gSZNmkTC8N+JmE290pHR7G2y57cZ+pr4lTjENEp/72qtBkEyJd9tLSp0T24cceGPLqvtH wsUiQZKoInWtgP/e99BUxCwk0A0XOfDWPknX0Iro= X-Received: by 2002:a5d:5850:: with SMTP id i16mr8192903wrf.410.1639648016598; Thu, 16 Dec 2021 01:46:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJwA4Cb/78g/Np23rRrFeNNA+mcm6HyKEgF1u2KfoVSUn+c47106OcZ0yzWX4XGZuoK1ZlxQZQ== X-Received: by 2002:a5d:5850:: with SMTP id i16mr8192881wrf.410.1639648016431; Thu, 16 Dec 2021 01:46:56 -0800 (PST) Received: from alex.home (lfbn-gre-1-195-1.w90-112.abo.wanadoo.fr. [90.112.158.1]) by smtp.gmail.com with ESMTPSA id d15sm5660966wri.50.2021.12.16.01.46.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 01:46:56 -0800 (PST) From: Alexandre Ghiti To: Steve French , Jonathan Corbet , David Howells , Russell King , Thomas Bogendoerfer , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Yoshinori Sato , Rich Felker , Matti Vaittinen , Lee Jones , Jeff Layton , Greg Kroah-Hartman , Arnd Bergmann , Ronnie Sahlberg , Guenter Roeck , Wim Van Sebroeck , Lukas Bulwahn , Luis Chamberlain , Kalle Valo , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-cachefs@redhat.com, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-power@fi.rohmeurope.com Cc: Alexandre Ghiti Subject: [PATCH v2 2/6] Documentation, arch: Remove leftovers from raw device Date: Thu, 16 Dec 2021 10:44:22 +0100 Message-Id: <20211216094426.2083802-3-alexandre.ghiti@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211216094426.2083802-1-alexandre.ghiti@canonical.com> References: <20211216094426.2083802-1-alexandre.ghiti@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org Raw device interface was removed so remove all references to configs related to it. Fixes: 603e4922f1c8 ("remove the raw driver") Signed-off-by: Alexandre Ghiti Acked-by: Arnd Bergmann [arch/arm/configs] --- Documentation/admin-guide/devices.txt | 8 +------- arch/arm/configs/spear13xx_defconfig | 1 - arch/arm/configs/spear3xx_defconfig | 1 - arch/arm/configs/spear6xx_defconfig | 1 - arch/powerpc/configs/pseries_defconfig | 1 - 5 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Documentation/admin-guide/devices.txt b/Documentation/admin-guide/devices.txt index 922c23bb4372..c07dc0ee860e 100644 --- a/Documentation/admin-guide/devices.txt +++ b/Documentation/admin-guide/devices.txt @@ -2339,13 +2339,7 @@ disks (see major number 3) except that the limit on partitions is 31. - 162 char Raw block device interface - 0 = /dev/rawctl Raw I/O control device - 1 = /dev/raw/raw1 First raw I/O device - 2 = /dev/raw/raw2 Second raw I/O device - ... - max minor number of raw device is set by kernel config - MAX_RAW_DEVS or raw module parameter 'max_raw_devs' + 162 char Used for (now removed) raw block device interface 163 char diff --git a/arch/arm/configs/spear13xx_defconfig b/arch/arm/configs/spear13xx_defconfig index 3b206a31902f..065553326b39 100644 --- a/arch/arm/configs/spear13xx_defconfig +++ b/arch/arm/configs/spear13xx_defconfig @@ -61,7 +61,6 @@ CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_RAW_DRIVER=y -CONFIG_MAX_RAW_DEVS=8192 CONFIG_I2C=y CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_SPI=y diff --git a/arch/arm/configs/spear3xx_defconfig b/arch/arm/configs/spear3xx_defconfig index fc5f71c765ed..afca722d6605 100644 --- a/arch/arm/configs/spear3xx_defconfig +++ b/arch/arm/configs/spear3xx_defconfig @@ -41,7 +41,6 @@ CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_RAW_DRIVER=y -CONFIG_MAX_RAW_DEVS=8192 CONFIG_I2C=y CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_SPI=y diff --git a/arch/arm/configs/spear6xx_defconfig b/arch/arm/configs/spear6xx_defconfig index 52a56b8ce6a7..bc32c02cb86b 100644 --- a/arch/arm/configs/spear6xx_defconfig +++ b/arch/arm/configs/spear6xx_defconfig @@ -36,7 +36,6 @@ CONFIG_INPUT_FF_MEMLESS=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_RAW_DRIVER=y -CONFIG_MAX_RAW_DEVS=8192 CONFIG_I2C=y CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_SPI=y diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index de7641adb899..e64f2242abe1 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig @@ -189,7 +189,6 @@ CONFIG_HVCS=m CONFIG_VIRTIO_CONSOLE=m CONFIG_IBM_BSR=m CONFIG_RAW_DRIVER=y -CONFIG_MAX_RAW_DEVS=1024 CONFIG_I2C_CHARDEV=y CONFIG_FB=y CONFIG_FIRMWARE_EDID=y From patchwork Thu Dec 16 09:44:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 1569016 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=lGksiKB/; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4JF6k82Lv7z9s0r for ; Thu, 16 Dec 2021 20:48:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233276AbhLPJsO (ORCPT ); Thu, 16 Dec 2021 04:48:14 -0500 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]:50072 "EHLO smtp-relay-internal-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231256AbhLPJsJ (ORCPT ); Thu, 16 Dec 2021 04:48:09 -0500 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 9F7033F1B0 for ; Thu, 16 Dec 2021 09:48:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1639648088; bh=UA5EztZHI/uiiMUXLzWoUuv2dZPMgtdfvbN4/RIGhNw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lGksiKB/zVU/967utZyw76TxcXQVEZEY15UKQlnoUVqfTUu81duL75jDsWbFMCasD wCOO35CywHgkKhtX+8FU6Q4YawslqKZVnbRtT3+IiVOMkcdFJqM7shwHuUJ0uAvfsk 4Gn/be6imh5fwSfopdY6JGeblapHZb3+ZVllMUuu329931m/yE16bGY+gF4ulxDVOW aSPQTzZOVg43cUvCviLI7butaa0HGJ66R3jSIUPaKuRIeghuCo+cSEFqooMvF7l6zB iqsKtMU9FhLwMUfaLD5kS/d/1bkOlAoWVjXFp21r7Jn7U587vmHEGTTK82E6pNGlh1 oKhV5FIScIC2A== Received: by mail-wm1-f69.google.com with SMTP id j71-20020a1c234a000000b00342f418ae7cso1040079wmj.1 for ; Thu, 16 Dec 2021 01:48:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UA5EztZHI/uiiMUXLzWoUuv2dZPMgtdfvbN4/RIGhNw=; b=6UITtsQKQAmiVonA0fnFfv+vK6g803CGeLSrvZWxcSB2ttFn1GDm7DqMVVcLTIaGhu 7HbTeKqZl+Y+H9CAB/Adj4jLYak30KN4qv+aitO2l+SQbTLV0X0PdquiZ8fabb/vsjeM 9dr+Rt2XPOtTSYDg8DyyAFtDDFjCjjyB9/sUVyYhSpnQI5Qdp8gGXmFSB/SYhF+R7jXR MIjSMCDpiE9CBSlA8HJ7tgOszLCMRlfyuIkElJ0DL3eVbwqvYlIWJVfzi1RDtbZhYS31 Ow+gZWdJhUcFNm15KuIsETzbvGqgsXrk7d/2Xwx4nasY3pev5fk0Zi5u+a01XREeJDbm B1Kw== X-Gm-Message-State: AOAM532ki2aRCSHKumcGcAQU2t/lMNQjSObRaUv/AFQjuFRKq1NRvb0q kDAtJSjAkmaayBC8yN3CXFX67IwHCd0HMH8IHn92Aepfy47dWcqepybRXwRKXgIRtxT/0ggD2fX K/+wflFElH/jwW0+4WyNlXLq7WZRRF0FfloEhkS4= X-Received: by 2002:a1c:740c:: with SMTP id p12mr316021wmc.140.1639648078057; Thu, 16 Dec 2021 01:47:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJyePI8Du4Q8VFJBsAu6osq6C3A++AYoB7smlNaZZ2VPRzrhLbuU04wBMA93ArT9KvS81ExrOQ== X-Received: by 2002:a1c:740c:: with SMTP id p12mr315973wmc.140.1639648077773; Thu, 16 Dec 2021 01:47:57 -0800 (PST) Received: from alex.home (lfbn-gre-1-195-1.w90-112.abo.wanadoo.fr. [90.112.158.1]) by smtp.gmail.com with ESMTPSA id g124sm7250562wme.28.2021.12.16.01.47.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 01:47:57 -0800 (PST) From: Alexandre Ghiti To: Steve French , Jonathan Corbet , David Howells , Russell King , Thomas Bogendoerfer , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Yoshinori Sato , Rich Felker , Matti Vaittinen , Lee Jones , Jeff Layton , Greg Kroah-Hartman , Arnd Bergmann , Ronnie Sahlberg , Guenter Roeck , Wim Van Sebroeck , Lukas Bulwahn , Luis Chamberlain , Kalle Valo , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-cachefs@redhat.com, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-power@fi.rohmeurope.com Cc: Alexandre Ghiti , Steve French Subject: [PATCH v2 3/6] Documentation, arch: Remove leftovers from CIFS_WEAK_PW_HASH Date: Thu, 16 Dec 2021 10:44:23 +0100 Message-Id: <20211216094426.2083802-4-alexandre.ghiti@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211216094426.2083802-1-alexandre.ghiti@canonical.com> References: <20211216094426.2083802-1-alexandre.ghiti@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org This config was removed so remove all references to it. Fixes: 76a3c92ec9e0 ("cifs: remove support for NTLM and weaker authentication algorithms") Signed-off-by: Alexandre Ghiti Reviewed-by: Steve French Acked-by: Arnd Bergmann [arch/arm/configs] --- Documentation/admin-guide/cifs/usage.rst | 7 +++---- arch/arm/configs/cm_x300_defconfig | 1 - arch/arm/configs/ezx_defconfig | 1 - arch/arm/configs/imote2_defconfig | 1 - arch/arm/configs/nhk8815_defconfig | 1 - arch/arm/configs/pxa_defconfig | 1 - arch/mips/configs/fuloong2e_defconfig | 1 - arch/mips/configs/malta_qemu_32r6_defconfig | 1 - arch/mips/configs/maltaaprp_defconfig | 1 - arch/mips/configs/maltasmvp_defconfig | 1 - arch/mips/configs/maltasmvp_eva_defconfig | 1 - arch/mips/configs/maltaup_defconfig | 1 - arch/powerpc/configs/ppc6xx_defconfig | 1 - arch/sh/configs/titan_defconfig | 1 - 14 files changed, 3 insertions(+), 17 deletions(-) diff --git a/Documentation/admin-guide/cifs/usage.rst b/Documentation/admin-guide/cifs/usage.rst index f170d8820258..3766bf8a1c20 100644 --- a/Documentation/admin-guide/cifs/usage.rst +++ b/Documentation/admin-guide/cifs/usage.rst @@ -734,10 +734,9 @@ SecurityFlags Flags which control security negotiation and using weaker password hashes is 0x37037 (lanman, plaintext, ntlm, ntlmv2, signing allowed). Some SecurityFlags require the corresponding menuconfig - options to be enabled (lanman and plaintext require - CONFIG_CIFS_WEAK_PW_HASH for example). Enabling - plaintext authentication currently requires also - enabling lanman authentication in the security flags + options to be enabled. Enabling plaintext + authentication currently requires also enabling + lanman authentication in the security flags because the cifs module only supports sending laintext passwords using the older lanman dialect form of the session setup SMB. (e.g. for authentication diff --git a/arch/arm/configs/cm_x300_defconfig b/arch/arm/configs/cm_x300_defconfig index 502a9d870ca4..45769d0ddd4e 100644 --- a/arch/arm/configs/cm_x300_defconfig +++ b/arch/arm/configs/cm_x300_defconfig @@ -146,7 +146,6 @@ CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y CONFIG_ROOT_NFS=y CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_PARTITION_ADVANCED=y CONFIG_NLS_CODEPAGE_437=m CONFIG_NLS_ISO8859_1=m diff --git a/arch/arm/configs/ezx_defconfig b/arch/arm/configs/ezx_defconfig index a49e699e52de..ec84d80096b1 100644 --- a/arch/arm/configs/ezx_defconfig +++ b/arch/arm/configs/ezx_defconfig @@ -314,7 +314,6 @@ CONFIG_NFSD_V3_ACL=y CONFIG_SMB_FS=m CONFIG_CIFS=m CONFIG_CIFS_STATS=y -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_NLS_CODEPAGE_437=m diff --git a/arch/arm/configs/imote2_defconfig b/arch/arm/configs/imote2_defconfig index 118c4c927f26..6db871d4e077 100644 --- a/arch/arm/configs/imote2_defconfig +++ b/arch/arm/configs/imote2_defconfig @@ -288,7 +288,6 @@ CONFIG_NFSD_V3_ACL=y CONFIG_SMB_FS=m CONFIG_CIFS=m CONFIG_CIFS_STATS=y -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_NLS_CODEPAGE_437=m diff --git a/arch/arm/configs/nhk8815_defconfig b/arch/arm/configs/nhk8815_defconfig index 23595fc5a29a..907d6512821a 100644 --- a/arch/arm/configs/nhk8815_defconfig +++ b/arch/arm/configs/nhk8815_defconfig @@ -127,7 +127,6 @@ CONFIG_NFS_FS=y CONFIG_NFS_V3_ACL=y CONFIG_ROOT_NFS=y CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ASCII=y CONFIG_NLS_ISO8859_1=y diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig index 58f4834289e6..dedaaae3d0d8 100644 --- a/arch/arm/configs/pxa_defconfig +++ b/arch/arm/configs/pxa_defconfig @@ -699,7 +699,6 @@ CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_CIFS=m CONFIG_CIFS_STATS=y -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_NLS_DEFAULT="utf8" diff --git a/arch/mips/configs/fuloong2e_defconfig b/arch/mips/configs/fuloong2e_defconfig index 5c24ac7fdf56..ba47c5e929b7 100644 --- a/arch/mips/configs/fuloong2e_defconfig +++ b/arch/mips/configs/fuloong2e_defconfig @@ -206,7 +206,6 @@ CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_CIFS=m CONFIG_CIFS_STATS2=y -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_CIFS_DEBUG2=y diff --git a/arch/mips/configs/malta_qemu_32r6_defconfig b/arch/mips/configs/malta_qemu_32r6_defconfig index 614af02d83e6..6fb9bc29f4a0 100644 --- a/arch/mips/configs/malta_qemu_32r6_defconfig +++ b/arch/mips/configs/malta_qemu_32r6_defconfig @@ -165,7 +165,6 @@ CONFIG_TMPFS=y CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_NLS_CODEPAGE_437=m diff --git a/arch/mips/configs/maltaaprp_defconfig b/arch/mips/configs/maltaaprp_defconfig index 9c051f8fd330..eb72df528243 100644 --- a/arch/mips/configs/maltaaprp_defconfig +++ b/arch/mips/configs/maltaaprp_defconfig @@ -166,7 +166,6 @@ CONFIG_TMPFS=y CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_NLS_CODEPAGE_437=m diff --git a/arch/mips/configs/maltasmvp_defconfig b/arch/mips/configs/maltasmvp_defconfig index 2e90d97551d6..1fb40d310f49 100644 --- a/arch/mips/configs/maltasmvp_defconfig +++ b/arch/mips/configs/maltasmvp_defconfig @@ -167,7 +167,6 @@ CONFIG_TMPFS=y CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_NLS_CODEPAGE_437=m diff --git a/arch/mips/configs/maltasmvp_eva_defconfig b/arch/mips/configs/maltasmvp_eva_defconfig index d1f7fdb27284..75cb778c6149 100644 --- a/arch/mips/configs/maltasmvp_eva_defconfig +++ b/arch/mips/configs/maltasmvp_eva_defconfig @@ -169,7 +169,6 @@ CONFIG_TMPFS=y CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_NLS_CODEPAGE_437=m diff --git a/arch/mips/configs/maltaup_defconfig b/arch/mips/configs/maltaup_defconfig index 48e5bd492452..7b4f247dc60c 100644 --- a/arch/mips/configs/maltaup_defconfig +++ b/arch/mips/configs/maltaup_defconfig @@ -165,7 +165,6 @@ CONFIG_TMPFS=y CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_NLS_CODEPAGE_437=m diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig index 6697c5e6682f..bb549cb1c3e3 100644 --- a/arch/powerpc/configs/ppc6xx_defconfig +++ b/arch/powerpc/configs/ppc6xx_defconfig @@ -1022,7 +1022,6 @@ CONFIG_NFSD=m CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y diff --git a/arch/sh/configs/titan_defconfig b/arch/sh/configs/titan_defconfig index ba887f1351be..cd5c58916c65 100644 --- a/arch/sh/configs/titan_defconfig +++ b/arch/sh/configs/titan_defconfig @@ -242,7 +242,6 @@ CONFIG_NFSD=y CONFIG_NFSD_V3=y CONFIG_SMB_FS=m CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_PARTITION_ADVANCED=y CONFIG_NLS_CODEPAGE_437=m CONFIG_NLS_ASCII=m From patchwork Thu Dec 16 09:44:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 1569018 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=Qa3oNcdT; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4JF6l65xMjz9sCD for ; Thu, 16 Dec 2021 20:49:06 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229905AbhLPJtF (ORCPT ); Thu, 16 Dec 2021 04:49:05 -0500 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]:50138 "EHLO smtp-relay-internal-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230500AbhLPJtD (ORCPT ); Thu, 16 Dec 2021 04:49:03 -0500 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 705263F1FD for ; Thu, 16 Dec 2021 09:49:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1639648142; bh=WUEOV0Puf0rdsNKOWUqNq9jf3IbOHS9FDzqSlVW9pZ4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Qa3oNcdTl7X8TrqWlFnXc4hRkVZ/LbMWYMnfoDFpgdU60zsGUk7DPdJ3/Wevl+TY+ 0sIsu+s3E/UEsZkJ1idG0PJ9hpS4YMxXyCKfttsvyIxY6LdFJ2oa+zpsI/O56LxRm0 IXrL1tTqjdKvK57itzqt4exV5WR7cLlE5Q6msdRFgRVc2l1tJPJbMxrVU2cCoiQ6nh IEEO3a/yaSM7a7km4nCuivrGC2ZpwMEHUW+i6LggKbsv7Y1Ck8Yq7hYHPlxerPY3AC nORK3qo7PerLArs3cq5LQt7nnsMvUy1xO9hABEyaC+WGRfHCWH1odTn1uCHlx9pCu+ oQo1l3Pu0BI1w== Received: by mail-wr1-f72.google.com with SMTP id l9-20020adfa389000000b001a23bd1c661so572007wrb.6 for ; Thu, 16 Dec 2021 01:49:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WUEOV0Puf0rdsNKOWUqNq9jf3IbOHS9FDzqSlVW9pZ4=; b=J8w+KlhVTMKBqOR9AiQZYctewh9nvFeMjrvcxLETgXYU7Xg7DTWTamdzpDoLsCaZCf wvOy/VeskUUIQ0+aezyaA1xncQWBRgfK7xPjyOc3yZzwmYCBm1g8mH7NOKewCrxPjvZ1 tdG+d9FDwIZ23ohCIc0yyXJG3KDzX6XzDuqPEkP9Bvdxu1FItZ4WUB4NRNMPCyznk4fm m2J/IF2m3YhHZhTU3928FnhZ6H+ZzYJjskF61WBaLmLexHBOlyXCxBNWEaRqBXW/Jzpn UGpxBxUSceVF4wAqD8D2UJJxyE/WDh9ScCoX+raz1L3m/4tQVY8eQYdXWfwT8wDlL7wM Ki5A== X-Gm-Message-State: AOAM531SXXxXBSMjPpyLF2FKlA2D2S99ECP7tLji/E7YAyKwflzX/Nfb SOVaWYgTnNH6mt1IUMbfQ1F5VEZv6AqMNqQFcjBOvPr7l15GgYNVS/OMBoCVnQTmfRUmTgu9EsW cdDxxL4RU6v3LJWlBmMW19CdRWUE29Av3guyxR9Q= X-Received: by 2002:a5d:69c5:: with SMTP id s5mr8274598wrw.283.1639648139311; Thu, 16 Dec 2021 01:48:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJy4D7RcuSiJhn58Bkp9nDVxQgFgFxFbQZtRi6SJVIaJvvuUPrIa3b5F/cBoS8baOoKUv8xnUw== X-Received: by 2002:a5d:69c5:: with SMTP id s5mr8274584wrw.283.1639648139155; Thu, 16 Dec 2021 01:48:59 -0800 (PST) Received: from alex.home (lfbn-gre-1-195-1.w90-112.abo.wanadoo.fr. [90.112.158.1]) by smtp.gmail.com with ESMTPSA id m36sm4145891wms.25.2021.12.16.01.48.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 01:48:58 -0800 (PST) From: Alexandre Ghiti To: Steve French , Jonathan Corbet , David Howells , Russell King , Thomas Bogendoerfer , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Yoshinori Sato , Rich Felker , Matti Vaittinen , Lee Jones , Jeff Layton , Greg Kroah-Hartman , Arnd Bergmann , Ronnie Sahlberg , Guenter Roeck , Wim Van Sebroeck , Lukas Bulwahn , Luis Chamberlain , Kalle Valo , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-cachefs@redhat.com, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-power@fi.rohmeurope.com Cc: Alexandre Ghiti Subject: [PATCH v2 4/6] arch: Remove leftovers from mandatory file locking Date: Thu, 16 Dec 2021 10:44:24 +0100 Message-Id: <20211216094426.2083802-5-alexandre.ghiti@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211216094426.2083802-1-alexandre.ghiti@canonical.com> References: <20211216094426.2083802-1-alexandre.ghiti@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org This config was removed so remove all references to it. Fixes: f7e33bdbd6d1 ("fs: remove mandatory file locking support") Signed-off-by: Alexandre Ghiti Reviewed-by: Jeff Layton --- arch/mips/configs/decstation_64_defconfig | 1 - arch/mips/configs/decstation_defconfig | 1 - arch/mips/configs/decstation_r4k_defconfig | 1 - 3 files changed, 3 deletions(-) diff --git a/arch/mips/configs/decstation_64_defconfig b/arch/mips/configs/decstation_64_defconfig index 85f1955b4b00..e2ed105f8c97 100644 --- a/arch/mips/configs/decstation_64_defconfig +++ b/arch/mips/configs/decstation_64_defconfig @@ -144,7 +144,6 @@ CONFIG_EXT2_FS_SECURITY=y CONFIG_EXT3_FS=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y -# CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_ISO9660_FS=y CONFIG_JOLIET=y CONFIG_PROC_KCORE=y diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig index 30a6eafdb1d0..7e987d6f5e34 100644 --- a/arch/mips/configs/decstation_defconfig +++ b/arch/mips/configs/decstation_defconfig @@ -140,7 +140,6 @@ CONFIG_EXT2_FS_SECURITY=y CONFIG_EXT3_FS=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y -# CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_ISO9660_FS=y CONFIG_JOLIET=y CONFIG_PROC_KCORE=y diff --git a/arch/mips/configs/decstation_r4k_defconfig b/arch/mips/configs/decstation_r4k_defconfig index e2b58dbf4aa9..6df5f6f2ac8e 100644 --- a/arch/mips/configs/decstation_r4k_defconfig +++ b/arch/mips/configs/decstation_r4k_defconfig @@ -140,7 +140,6 @@ CONFIG_EXT2_FS_SECURITY=y CONFIG_EXT3_FS=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y -# CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_ISO9660_FS=y CONFIG_JOLIET=y CONFIG_PROC_KCORE=y From patchwork Thu Dec 16 09:44:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 1569022 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=TihPtfNP; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4JF6mD2Xh3z9s0r for ; Thu, 16 Dec 2021 20:50:04 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231510AbhLPJuD (ORCPT ); Thu, 16 Dec 2021 04:50:03 -0500 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]:50198 "EHLO smtp-relay-internal-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230345AbhLPJuC (ORCPT ); Thu, 16 Dec 2021 04:50:02 -0500 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 632783F1F6 for ; Thu, 16 Dec 2021 09:50:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1639648201; bh=UE9qVdLRJW7bpl/DPmIb38u9EtZ1GCmDXsqavcnm0Z0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TihPtfNPkBeUNOEAEzQ25xyVQPGPJbNCujbUQkqprU0irdWQQNwBaSt8CEDmRnM3i HM6sCeel9d03U9fi3IHOBbyTP3UR5VhOotzWLD6rYgrQ9wA2fW3sfIt+YDkH2xoYOm gDmNNn6XjiNnXMMaxINuCKJe831iHV+T2Z4XCQKiJrbVNBsAFTkY0SHtwyMBIFHB7g Ud9dYc/u//Q8YMAT1v6GrON9gEhr2QjJQKXYqGRVScJOXX5oyOsYJKCL9UOhnGQte2 dv9rAxfhi/p8bcJ4mdT6XfG24csC69x6h+kEePYPeazBUwTKUYEgxL8UqpA7cZmWMh 4sgA9s1Bfi5Ag== Received: by mail-wm1-f71.google.com with SMTP id 144-20020a1c0496000000b003305ac0e03aso1019170wme.8 for ; Thu, 16 Dec 2021 01:50:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UE9qVdLRJW7bpl/DPmIb38u9EtZ1GCmDXsqavcnm0Z0=; b=2SmqM/brYYD/LmDkr9ZE75QwbDRVWDlbdn5+qAspDIVnUlLCv0KkEwmGISdo3Fh2jB i7KO7FaW1njMdQHa18Th/OVHUSj1bwQQ55VicdUU4ZVCNxLD0g+BpCsin0bPwdjH5kvu AEgxE2UUTK/5JDQjcQU0iBhPG757SLZzL5OUTKVne1kzwekNigAdsCxJ0fsA3mfB9v0r NyhkfAF1na50OEpcRUK8IbTwZ/DwfU5yjT/VcUA6elEhiXs62HXHlj6VRrl3Y4WkaNUI FfiGU2tgYoT06PVR0zgD7XA+kvolhWKRL7wnYwa+IbPSAjuQJNg+SurHDTLSr0/z6UZz g5sQ== X-Gm-Message-State: AOAM533JHq70zGBdpZwzMKiAimbjQboQAcQY10hd6o7sIMzIZt07bO5L LqtX5CHD3/x2m0gAaEnnfjOjGj93ba2hAbFqYyj1hVa3kTVxCiGzCjZaw7Ki/gcJ77JlCcedbdg db2hZf4eQ1aC+EeLHKoyotWSJGmgfu6NHiPt6xUU= X-Received: by 2002:a05:6000:1d1:: with SMTP id t17mr2381575wrx.569.1639648200619; Thu, 16 Dec 2021 01:50:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJx/xLlJnCExECCDNoAM44eP9543vxxsGpjhjfHYoFuaFs3LQSghst7DJCdkhsW2zDOpmEE8rA== X-Received: by 2002:a05:6000:1d1:: with SMTP id t17mr2381544wrx.569.1639648200429; Thu, 16 Dec 2021 01:50:00 -0800 (PST) Received: from alex.home (lfbn-gre-1-195-1.w90-112.abo.wanadoo.fr. [90.112.158.1]) by smtp.gmail.com with ESMTPSA id k6sm3892637wmj.16.2021.12.16.01.49.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 01:50:00 -0800 (PST) From: Alexandre Ghiti To: Steve French , Jonathan Corbet , David Howells , Russell King , Thomas Bogendoerfer , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Yoshinori Sato , Rich Felker , Matti Vaittinen , Lee Jones , Jeff Layton , Greg Kroah-Hartman , Arnd Bergmann , Ronnie Sahlberg , Guenter Roeck , Wim Van Sebroeck , Lukas Bulwahn , Luis Chamberlain , Kalle Valo , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-cachefs@redhat.com, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-power@fi.rohmeurope.com Cc: Alexandre Ghiti Subject: [PATCH v2 5/6] Documentation, arch, fs: Remove leftovers from fscache object list Date: Thu, 16 Dec 2021 10:44:25 +0100 Message-Id: <20211216094426.2083802-6-alexandre.ghiti@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211216094426.2083802-1-alexandre.ghiti@canonical.com> References: <20211216094426.2083802-1-alexandre.ghiti@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org A few references to the fscache object list were left in the Documentation, some arch defconfigs and in fs: remove them since this config does not exists anymore. Fixes: 58f386a73f16 ("fscache: Remove the object list procfile") Signed-off-by: Alexandre Ghiti Acked-by: Arnd Bergmann [arch/arm/configs] --- Documentation/filesystems/caching/fscache.rst | 89 ------------------- arch/arm/configs/axm55xx_defconfig | 1 - fs/fscache/object.c | 3 - fs/fscache/proc.c | 12 --- 4 files changed, 105 deletions(-) diff --git a/Documentation/filesystems/caching/fscache.rst b/Documentation/filesystems/caching/fscache.rst index 66e31a6d1070..7cedab444947 100644 --- a/Documentation/filesystems/caching/fscache.rst +++ b/Documentation/filesystems/caching/fscache.rst @@ -411,95 +411,6 @@ proc file. +--------------+-------+-------------------------------------------------------+ - -Object List -=========== - -If CONFIG_FSCACHE_OBJECT_LIST is enabled, the FS-Cache facility will maintain a -list of all the objects currently allocated and allow them to be viewed -through:: - - /proc/fs/fscache/objects - -This will look something like:: - - [root@andromeda ~]# head /proc/fs/fscache/objects - OBJECT PARENT STAT CHLDN OPS OOP IPR EX READS EM EV F S | NETFS_COOKIE_DEF TY FL NETFS_DATA OBJECT_KEY, AUX_DATA - ======== ======== ==== ===== === === === == ===== == == = = | ================ == == ================ ================ - 17e4b 2 ACTV 0 0 0 0 0 0 7b 4 0 0 | NFS.fh DT 0 ffff88001dd82820 010006017edcf8bbc93b43298fdfbe71e50b57b13a172c0117f38472, e567634700000000000000000000000063f2404a000000000000000000000000c9030000000000000000000063f2404a - 1693a 2 ACTV 0 0 0 0 0 0 7b 4 0 0 | NFS.fh DT 0 ffff88002db23380 010006017edcf8bbc93b43298fdfbe71e50b57b1e0162c01a2df0ea6, 420ebc4a000000000000000000000000420ebc4a0000000000000000000000000e1801000000000000000000420ebc4a - -where the first set of columns before the '|' describe the object: - - ======= =============================================================== - COLUMN DESCRIPTION - ======= =============================================================== - OBJECT Object debugging ID (appears as OBJ%x in some debug messages) - PARENT Debugging ID of parent object - STAT Object state - CHLDN Number of child objects of this object - OPS Number of outstanding operations on this object - OOP Number of outstanding child object management operations - IPR - EX Number of outstanding exclusive operations - READS Number of outstanding read operations - EM Object's event mask - EV Events raised on this object - F Object flags - S Object work item busy state mask (1:pending 2:running) - ======= =============================================================== - -and the second set of columns describe the object's cookie, if present: - - ================ ====================================================== - COLUMN DESCRIPTION - ================ ====================================================== - NETFS_COOKIE_DEF Name of netfs cookie definition - TY Cookie type (IX - index, DT - data, hex - special) - FL Cookie flags - NETFS_DATA Netfs private data stored in the cookie - OBJECT_KEY Object key } 1 column, with separating comma - AUX_DATA Object aux data } presence may be configured - ================ ====================================================== - -The data shown may be filtered by attaching the a key to an appropriate keyring -before viewing the file. Something like:: - - keyctl add user fscache:objlist @s - -where are a selection of the following letters: - - == ========================================================= - K Show hexdump of object key (don't show if not given) - A Show hexdump of object aux data (don't show if not given) - == ========================================================= - -and the following paired letters: - - == ========================================================= - C Show objects that have a cookie - c Show objects that don't have a cookie - B Show objects that are busy - b Show objects that aren't busy - W Show objects that have pending writes - w Show objects that don't have pending writes - R Show objects that have outstanding reads - r Show objects that don't have outstanding reads - S Show objects that have work queued - s Show objects that don't have work queued - == ========================================================= - -If neither side of a letter pair is given, then both are implied. For example: - - keyctl add user fscache:objlist KB @s - -shows objects that are busy, and lists their object keys, but does not dump -their auxiliary data. It also implies "CcWwRrSs", but as 'B' is given, 'b' is -not implied. - -By default all objects and all fields will be shown. - - Debugging ========= diff --git a/arch/arm/configs/axm55xx_defconfig b/arch/arm/configs/axm55xx_defconfig index b36e0b347d1f..c0ea326d4c5e 100644 --- a/arch/arm/configs/axm55xx_defconfig +++ b/arch/arm/configs/axm55xx_defconfig @@ -205,7 +205,6 @@ CONFIG_CUSE=y CONFIG_FSCACHE=y CONFIG_FSCACHE_STATS=y CONFIG_FSCACHE_DEBUG=y -CONFIG_FSCACHE_OBJECT_LIST=y CONFIG_CACHEFILES=y CONFIG_ISO9660_FS=y CONFIG_UDF_FS=y diff --git a/fs/fscache/object.c b/fs/fscache/object.c index 6a675652129b..f31257a74f35 100644 --- a/fs/fscache/object.c +++ b/fs/fscache/object.c @@ -321,9 +321,6 @@ void fscache_object_init(struct fscache_object *object, object->cookie = cookie; fscache_cookie_get(cookie, fscache_cookie_get_attach_object); object->parent = NULL; -#ifdef CONFIG_FSCACHE_OBJECT_LIST - RB_CLEAR_NODE(&object->objlist_link); -#endif object->oob_event_mask = 0; for (t = object->oob_table; t->events; t++) diff --git a/fs/fscache/proc.c b/fs/fscache/proc.c index 061df8f61ffc..4c327aeed91b 100644 --- a/fs/fscache/proc.c +++ b/fs/fscache/proc.c @@ -31,18 +31,9 @@ int __init fscache_proc_init(void) goto error_stats; #endif -#ifdef CONFIG_FSCACHE_OBJECT_LIST - if (!proc_create("fs/fscache/objects", S_IFREG | 0444, NULL, - &fscache_objlist_proc_ops)) - goto error_objects; -#endif - _leave(" = 0"); return 0; -#ifdef CONFIG_FSCACHE_OBJECT_LIST -error_objects: -#endif #ifdef CONFIG_FSCACHE_STATS remove_proc_entry("fs/fscache/stats", NULL); error_stats: @@ -60,9 +51,6 @@ int __init fscache_proc_init(void) */ void fscache_proc_cleanup(void) { -#ifdef CONFIG_FSCACHE_OBJECT_LIST - remove_proc_entry("fs/fscache/objects", NULL); -#endif #ifdef CONFIG_FSCACHE_STATS remove_proc_entry("fs/fscache/stats", NULL); #endif From patchwork Thu Dec 16 09:44:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 1569024 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=UzUXNm4S; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4JF6nR4rScz9s0r for ; Thu, 16 Dec 2021 20:51:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233414AbhLPJvG (ORCPT ); Thu, 16 Dec 2021 04:51:06 -0500 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:51520 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233371AbhLPJvD (ORCPT ); Thu, 16 Dec 2021 04:51:03 -0500 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 752DF3FFD6 for ; Thu, 16 Dec 2021 09:51:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1639648262; bh=0bEssfmXxHPGUprNSso7Mjq6wm8EF4TYvKsU8/02BBE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UzUXNm4SELsujPBnF4AU04rs8XSKGNby+foh60JgPHbRWPXBBEEE55yPAWlNzLumb 4uovQuJFre3K7f+xEGYXYsxkotugkcP/nvLVb4FrH61ePpbH/8MVxn3mdTznCtXRgk seQu33ykbqyAo/hX2uWB4z6wfTurr48HmclDQKub1ewanjURoogb4aLH4VhX26n4j5 jVRnusmsML1z1/ntpOEzlhAPboQ3JdEYc1O1Us18Yy/fCS3EwNzDudmH/oLnujW/3t vWMS6yuiNSXHg/iO6FEkhylUm65aG/Yz4pd6Z8zPIJZ34jlEdtZbCJS3S4OKsLlBwU HMC+NEs5FOOkg== Received: by mail-wm1-f69.google.com with SMTP id k25-20020a05600c1c9900b00332f798ba1dso1029645wms.4 for ; Thu, 16 Dec 2021 01:51:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0bEssfmXxHPGUprNSso7Mjq6wm8EF4TYvKsU8/02BBE=; b=3jUZl1zUfQqwHlREQwlkh579VOTkKTQ2NY1WD+imawlCn09HqINbuN8sEw0UDqLtaG rrTz7MnROZ3zKPGSEsD1MIbvzNgGvlKx+KNV3G1tbPaUN6/TbhGBLQnc9v4pfQAjfsX1 Wz4AnGZ+is1HsulEYa3HQJo6PGEr0BFuKkkGzEJqXuvxW/NGIR6wdPIVOl1iuHAixTzO lvuRMDzCOMmLNkXdVGrkRaoSG7JsqQWoMro51w325rkDCr3Sn+APqPmsC0LWUhzNx0U4 ZdsOgx1T4dmQkS+MgbXxp8hppT6VmlQ8N0bCCxGXYmEwydFI06whqFWrIQ7PF6PQvQvN Ih4Q== X-Gm-Message-State: AOAM533LMWWuk+f18gfjGl0tRqE8RCqBM9ZceiMbFlhqISGdlSVlBOzp +r/MaWuYTmVbKRzLdj6O6sfTIJ60rLlGNWhy42MnPbenR6ntobJWTGgSN4oE6BforyHv8BYdzsA Rzfh702mqHjhA8lAZUsIP/hM9tJTqivC5MC71HjI= X-Received: by 2002:adf:e0c7:: with SMTP id m7mr8388283wri.530.1639648261837; Thu, 16 Dec 2021 01:51:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJzbJdsw74e1MWIrtUpFfSGPgTM99V/z0uqkAiMvhK7tPz89ydRhYflRK8+9nZRMh9H4fPR73w== X-Received: by 2002:adf:e0c7:: with SMTP id m7mr8388260wri.530.1639648261695; Thu, 16 Dec 2021 01:51:01 -0800 (PST) Received: from alex.home (lfbn-gre-1-195-1.w90-112.abo.wanadoo.fr. [90.112.158.1]) by smtp.gmail.com with ESMTPSA id a1sm5552974wri.89.2021.12.16.01.51.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 01:51:01 -0800 (PST) From: Alexandre Ghiti To: Steve French , Jonathan Corbet , David Howells , Russell King , Thomas Bogendoerfer , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Yoshinori Sato , Rich Felker , Matti Vaittinen , Lee Jones , Jeff Layton , Greg Kroah-Hartman , Arnd Bergmann , Ronnie Sahlberg , Guenter Roeck , Wim Van Sebroeck , Lukas Bulwahn , Luis Chamberlain , Kalle Valo , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-cachefs@redhat.com, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-power@fi.rohmeurope.com Cc: Alexandre Ghiti Subject: [PATCH v2 6/6] arch: Remove leftovers from prism54 wireless driver Date: Thu, 16 Dec 2021 10:44:26 +0100 Message-Id: <20211216094426.2083802-7-alexandre.ghiti@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211216094426.2083802-1-alexandre.ghiti@canonical.com> References: <20211216094426.2083802-1-alexandre.ghiti@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org This driver was removed so remove all references to it. Fixes: d249ff28b1d8 ("intersil: remove obsolete prism54 wireless driver") Signed-off-by: Alexandre Ghiti --- arch/mips/configs/ip27_defconfig | 1 - arch/mips/configs/malta_defconfig | 1 - arch/mips/configs/malta_kvm_defconfig | 1 - arch/mips/configs/maltaup_xpa_defconfig | 1 - arch/powerpc/configs/pmac32_defconfig | 1 - 5 files changed, 5 deletions(-) diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig index 638d7cf5ef01..821630ac1be7 100644 --- a/arch/mips/configs/ip27_defconfig +++ b/arch/mips/configs/ip27_defconfig @@ -223,7 +223,6 @@ CONFIG_TMD_HERMES=m CONFIG_NORTEL_HERMES=m CONFIG_P54_COMMON=m CONFIG_P54_PCI=m -CONFIG_PRISM54=m CONFIG_LIBERTAS=m CONFIG_LIBERTAS_THINFIRM=m CONFIG_MWL8K=m diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig index 9cb2cf2595e0..3321bb576944 100644 --- a/arch/mips/configs/malta_defconfig +++ b/arch/mips/configs/malta_defconfig @@ -302,7 +302,6 @@ CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PCI=m -CONFIG_PRISM54=m CONFIG_LIBERTAS=m CONFIG_INPUT_MOUSEDEV=y CONFIG_MOUSE_PS2_ELANTECH=y diff --git a/arch/mips/configs/malta_kvm_defconfig b/arch/mips/configs/malta_kvm_defconfig index 5924e48fd3ec..009b30372226 100644 --- a/arch/mips/configs/malta_kvm_defconfig +++ b/arch/mips/configs/malta_kvm_defconfig @@ -310,7 +310,6 @@ CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PCI=m -CONFIG_PRISM54=m CONFIG_LIBERTAS=m CONFIG_INPUT_MOUSEDEV=y CONFIG_SERIAL_8250=y diff --git a/arch/mips/configs/maltaup_xpa_defconfig b/arch/mips/configs/maltaup_xpa_defconfig index c0d3156ef640..e214e136101c 100644 --- a/arch/mips/configs/maltaup_xpa_defconfig +++ b/arch/mips/configs/maltaup_xpa_defconfig @@ -309,7 +309,6 @@ CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PCI=m -CONFIG_PRISM54=m CONFIG_LIBERTAS=m CONFIG_INPUT_MOUSEDEV=y CONFIG_MOUSE_PS2_ELANTECH=y diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig index 7aefac5afab0..13885ec563d1 100644 --- a/arch/powerpc/configs/pmac32_defconfig +++ b/arch/powerpc/configs/pmac32_defconfig @@ -169,7 +169,6 @@ CONFIG_USB_USBNET=m CONFIG_B43=m CONFIG_B43LEGACY=m CONFIG_P54_COMMON=m -CONFIG_PRISM54=m CONFIG_INPUT_EVDEV=y # CONFIG_KEYBOARD_ATKBD is not set # CONFIG_MOUSE_PS2 is not set