Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (fe30021c) · Commits · 戴 / test

arch/x86/kernel/cpu/resctrl/rdtgroup.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -461,10 +461,8 @@ static ssize_t rdtgroup_cpus_write(struct kernfs_open_file *of,
		}

		rdtgrp = rdtgroup_kn_lock_live(of->kn);
		rdt_last_cmd_clear();
		if (!rdtgrp) {
		ret = -ENOENT;
		rdt_last_cmd_puts("Directory was removed\n");
		goto unlock;
		}

		@@ -2648,10 +2646,8 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,
		int ret;

		prdtgrp = rdtgroup_kn_lock_live(prgrp_kn);
		rdt_last_cmd_clear();
		if (!prdtgrp) {
		ret = -ENODEV;
		rdt_last_cmd_puts("Directory was removed\n");
		goto out_unlock;
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -710,6 +710,8 @@ static struct chipset early_qrk[] __initdata = {
		*/
		{ PCI_VENDOR_ID_INTEL, 0x0f00,
		PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
		{ PCI_VENDOR_ID_INTEL, 0x3ec4,
		PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
		{ PCI_VENDOR_ID_BROADCOM, 0x4331,
		PCI_CLASS_NETWORK_OTHER, PCI_ANY_ID, 0, apple_airport_reset},
		{}