From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751929AbcFYBjZ (ORCPT ); Fri, 24 Jun 2016 21:39:25 -0400 Received: from x127155.tudelft.net ([131.180.127.155]:38014 "EHLO djo.tudelft.nl" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751895AbcFYBjX (ORCPT ); Fri, 24 Jun 2016 21:39:23 -0400 Date: Sat, 25 Jun 2016 03:39:20 +0200 From: Wim Osterholt To: Sinan Kaya Cc: Bjorn Helgaas , "Rafael J. Wysocki" , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, perex@perex.cz, linux-pci@vger.kernel.org, Takashi Iwai , linux-pci-owner@vger.kernel.org, Alex Williamson , Wim Osterholt Subject: Re: kernel-4.7 bug in Intel sound and/or ACPI Message-ID: <20160625013920.GA26737@djo.tudelft.nl> Reply-To: wim@djo.tudelft.nl References: <57686D67.8010201@codeaurora.org> <20160621124715.GB3528@djo.tudelft.nl> <576943BA.1000001@codeaurora.org> <20160621221347.GA28603@djo.tudelft.nl> <72eb7b76d449f906d9b2b1bb15d995bf@codeaurora.org> <20160623141234.GA14662@djo.tudelft.nl> <576BF86E.8060302@codeaurora.org> <576C042B.20507@codeaurora.org> <20160623232533.GA14984@djo.tudelft.nl> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: 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 On Fri, Jun 24, 2016 at 02:09:15AM -0400, Sinan Kaya wrote: > > Can you give it a try? Whell, I tried to no avail. Wether it is on 4.6 or 4.7, with or without your previous patch, I keep getting rejected hunks. For example, here the line to be deleted is nowhere to be found: > diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c > index 714ba4d..c2f22c9 100644 > --- a/drivers/acpi/pci_link.c > +++ b/drivers/acpi/pci_link.c > @@ -497,7 +497,7 @@ static int acpi_irq_get_penalty(int irq) > int penalty = 0; > > if (irq < ACPI_MAX_ISA_IRQS) > - penalty += acpi_isa_irq_penalty[irq]; > + return acpi_isa_irq_penalty[irq]; > > /* > * Penalize IRQ used by ACPI SCI. If ACPI SCI pin attributes conflict Regards, Wim. ----- wim@djo.tudelft.nl -----