Commit bddb3636 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/cpu' into perf/core, to pick up dependent changes



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 3384c786 cbb99c0f
Loading
Loading
Loading
Loading
+14 −2
Original line number Diff line number Diff line
@@ -336,8 +336,20 @@ the copied layers will fail the verification of the lower root file handle.
Non-standard behavior
---------------------

Overlayfs can now act as a POSIX compliant filesystem with the following
features turned on:
Current version of overlayfs can act as a mostly POSIX compliant
filesystem.

This is the list of cases that overlayfs doesn't currently handle:

a) POSIX mandates updating st_atime for reads.  This is currently not
done in the case when the file resides on a lower layer.

b) If a file residing on a lower layer is opened for read-only and then
memory mapped with MAP_SHARED, then subsequent changes to the file are not
reflected in the memory mapping.

The following options allow overlayfs to act more like a standards
compliant filesystem:

1) "redirect_dir"

+2 −3
Original line number Diff line number Diff line
@@ -13057,7 +13057,6 @@ F: Documentation/devicetree/bindings/net/qcom,dwmac.txt

QUALCOMM GENERIC INTERFACE I2C DRIVER
M:	Alok Chauhan <alokc@codeaurora.org>
M:	Karthikeyan Ramasubramanian <kramasub@codeaurora.org>
L:	linux-i2c@vger.kernel.org
L:	linux-arm-msm@vger.kernel.org
S:	Supported
@@ -14995,7 +14994,7 @@ S: Odd Fixes
F:	drivers/net/ethernet/adaptec/starfire*

STEC S1220 SKD DRIVER
M:	Bart Van Assche <bart.vanassche@wdc.com>
M:	Damien Le Moal <Damien.LeMoal@wdc.com>
L:	linux-block@vger.kernel.org
S:	Maintained
F:	drivers/block/skd*[ch]
@@ -17312,7 +17311,7 @@ F: Documentation/ABI/stable/sysfs-hypervisor-xen
F:	Documentation/ABI/testing/sysfs-hypervisor-xen

XEN NETWORK BACKEND DRIVER
M:	Wei Liu <wei.liu2@citrix.com>
M:	Wei Liu <wei.liu@kernel.org>
M:	Paul Durrant <paul.durrant@citrix.com>
L:	xen-devel@lists.xenproject.org (moderated for non-subscribers)
L:	netdev@vger.kernel.org
+3 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
VERSION = 5
PATCHLEVEL = 2
SUBLEVEL = 0
EXTRAVERSION = -rc3
EXTRAVERSION = -rc4
NAME = Golden Lions

# *DOCUMENTATION*
@@ -1228,9 +1228,8 @@ kselftest-clean:
PHONY += kselftest-merge
kselftest-merge:
	$(if $(wildcard $(objtree)/.config),, $(error No .config exists, config your kernel first!))
	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \
		-m $(objtree)/.config \
		$(srctree)/tools/testing/selftests/*/config
	$(Q)find $(srctree)/tools/testing/selftests -name config | \
		xargs $(srctree)/scripts/kconfig/merge_config.sh -m $(objtree)/.config
	+$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig

# ---------------------------------------------------------------------------
+1 −2
Original line number Diff line number Diff line
/* SPDX-License-Identifier: GPL-2.0-only */
/*
 * Arch specific extensions to struct device
 *
 * This file is released under the GPLv2
 */
#include <asm-generic/device.h>
+1 −17
Original line number Diff line number Diff line
// SPDX-License-Identifier: GPL-2.0-only
/*
 * srm_env.c - Access to SRM environment
 *             variables through linux' procfs
@@ -9,23 +10,6 @@
 * <J.A.K.Mouw@its.tudelft.nl>. It is based on an idea
 * provided by DEC^WCompaq^WIntel's "Jumpstart" CD. They
 * included a patch like this as well. Thanks for idea!
 *
 * This program is free software; you can redistribute
 * it and/or modify it under the terms of the GNU General
 * Public License version 2 as published by the Free Software
 * Foundation.
 *
 * This program is distributed in the hope that it will be
 * useful, but WITHOUT ANY WARRANTY; without even the implied
 * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 * PURPOSE.  See the GNU General Public License for more
 * details.
 *
 * You should have received a copy of the GNU General Public
 * License along with this program; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place,
 * Suite 330, Boston, MA  02111-1307  USA
 *
 */

#include <linux/kernel.h>
Loading