From patchwork Mon Feb 6 12:39:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 9557709 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 68C8660236 for ; Mon, 6 Feb 2017 12:40:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 589842654B for ; Mon, 6 Feb 2017 12:40:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4C64727E5A; Mon, 6 Feb 2017 12:40:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E8FFC2654B for ; Mon, 6 Feb 2017 12:40:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751545AbdBFMkA (ORCPT ); Mon, 6 Feb 2017 07:40:00 -0500 Received: from s3.sipsolutions.net ([5.9.151.49]:39806 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750950AbdBFMkA (ORCPT ); Mon, 6 Feb 2017 07:40:00 -0500 Received: by sipsolutions.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.88) (envelope-from ) id 1caiaM-0003IL-QC; Mon, 06 Feb 2017 13:39:59 +0100 From: Johannes Berg To: backports@vger.kernel.org Cc: Johannes Berg Subject: [PATCH 1/3] backports: devcoredump: make patch apply Date: Mon, 6 Feb 2017 13:39:54 +0100 Message-Id: <20170206123956.20082-1-johannes@sipsolutions.net> X-Mailer: git-send-email 2.9.3 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Berg Just make the patch apply again - the next commits will auto-generate the necessary backport code. Change-Id: I2b25ccbaadf1d49b9fdd229b3eaf1ecb7a9cf9ce Signed-off-by: Johannes Berg --- patches/backport-adjustments/devcoredump.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/backport-adjustments/devcoredump.patch b/patches/backport-adjustments/devcoredump.patch index b840adc145f7..315ffd57e3bf 100644 --- a/patches/backport-adjustments/devcoredump.patch +++ b/patches/backport-adjustments/devcoredump.patch @@ -62,7 +62,7 @@ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0) .dev_groups = devcd_dev_groups, +#endif - .class_attrs = devcd_class_attrs, + .class_groups = devcd_class_groups, }; @@ -270,6 +281,11 @@ void dev_coredumpm(struct device *dev, s