This reverts commit 22083c02 which is
commit 4abb951b upstream.

Jean writes:

	This commit was tagged with:

	    Link: https://bugzilla.kernel.org/show_bug.cgi?id=200011
	    Tested-by: Jean-Marc Lenoir
	    Cc: All applicable <stable@vger.kernel.org>

	making it sound like it was fixing an actual bug. This is not the case.
	The commit fixes a side issue discovered while investigating bug
	#200011. It does NOT fix bug #200011 itself (as explicitly reported by
	Jean-Marc at https://bugzilla.kernel.org/show_bug.cgi?id=200011#c65 ).

	It does however cause regressions, despite what the commit message says. See:

	https://bugzilla.kernel.org/show_bug.cgi?id=201721

	and I expect more similar regressions, as ACPI resource conflicts are
	very frequent.

	This commit was not stable material to start with. It is intrusive,
	presents a risk of side effects, and does not solve an actual bug that
	is bothering users.
Reported-by: Jean Delvare <jdelvare@suse.de>
Cc: Jean-Marc Lenoir <archlinux@jihemel.com>
Cc: Erik Schmauss <erik.schmauss@intel.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>