Commit 64c720ad authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.16-rc4 into driver-core-next 



We want the lz* fixes here to do more work with them.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 868b60e0 cd3de83f

Documentation/trace/postprocess/trace-vmscan-postprocess.pl

+2 −12
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ use constant HIGH_KSWAPD_REWAKEUP => 21; 
use constant HIGH_NR_SCANNED			=> 22;

use constant HIGH_NR_TAKEN			=> 23;

use constant HIGH_NR_RECLAIMED			=> 24;

use constant HIGH_NR_CONTIG_DIRTY		=> 25;



my %perprocesspid;

my %perprocess;
@@ -105,7 +104,7 @@ my $regex_direct_end_default = 'nr_reclaimed=([0-9]*)'; 
my $regex_kswapd_wake_default = 'nid=([0-9]*) order=([0-9]*)';

my $regex_kswapd_sleep_default = 'nid=([0-9]*)';

my $regex_wakeup_kswapd_default = 'nid=([0-9]*) zid=([0-9]*) order=([0-9]*)';

my $regex_lru_isolate_default = 'isolate_mode=([0-9]*) order=([0-9]*) nr_requested=([0-9]*) nr_scanned=([0-9]*) nr_taken=([0-9]*) contig_taken=([0-9]*) contig_dirty=([0-9]*) contig_failed=([0-9]*)';

my $regex_lru_isolate_default = 'isolate_mode=([0-9]*) order=([0-9]*) nr_requested=([0-9]*) nr_scanned=([0-9]*) nr_taken=([0-9]*) file=([0-9]*)';

my $regex_lru_shrink_inactive_default = 'nid=([0-9]*) zid=([0-9]*) nr_scanned=([0-9]*) nr_reclaimed=([0-9]*) priority=([0-9]*) flags=([A-Z_|]*)';

my $regex_lru_shrink_active_default = 'lru=([A-Z_]*) nr_scanned=([0-9]*) nr_rotated=([0-9]*) priority=([0-9]*)';

my $regex_writepage_default = 'page=([0-9a-f]*) pfn=([0-9]*) flags=([A-Z_|]*)';
@@ -200,7 +199,7 @@ $regex_lru_isolate = generate_traceevent_regex( 
			$regex_lru_isolate_default,

			"isolate_mode", "order",

			"nr_requested", "nr_scanned", "nr_taken",

			"contig_taken", "contig_dirty", "contig_failed");

			"file");

$regex_lru_shrink_inactive = generate_traceevent_regex(

			"vmscan/mm_vmscan_lru_shrink_inactive",

			$regex_lru_shrink_inactive_default,
@@ -375,7 +374,6 @@ EVENT_PROCESS: 
			}

			my $isolate_mode = $1;

			my $nr_scanned = $4;

			my $nr_contig_dirty = $7;



			# To closer match vmstat scanning statistics, only count isolate_both

			# and isolate_inactive as scanning. isolate_active is rotation
@@ -385,7 +383,6 @@ EVENT_PROCESS: 
			if ($isolate_mode != 2) {

				$perprocesspid{$process_pid}->{HIGH_NR_SCANNED} += $nr_scanned;

			}

			$perprocesspid{$process_pid}->{HIGH_NR_CONTIG_DIRTY} += $nr_contig_dirty;

		} elsif ($tracepoint eq "mm_vmscan_lru_shrink_inactive") {

			$details = $6;

			if ($details !~ /$regex_lru_shrink_inactive/o) {
@@ -539,13 +536,6 @@ sub dump_stats { 
				}

			}

		}

		if ($stats{$process_pid}->{HIGH_NR_CONTIG_DIRTY}) {

			print "      ";

			my $count = $stats{$process_pid}->{HIGH_NR_CONTIG_DIRTY};

			if ($count != 0) {

				print "contig-dirty=$count ";

			}

		}



		print "\n";

	}

MAINTAINERS

+32 −25
Original line number Diff line number Diff line
@@ -943,16 +943,10 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git

F:	arch/arm/mach-imx/

F:	arch/arm/mach-mxs/

F:	arch/arm/boot/dts/imx*

F:	arch/arm/configs/imx*_defconfig



ARM/FREESCALE MXS ARM ARCHITECTURE

M:	Shawn Guo <shawn.guo@linaro.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

T:	git git://git.linaro.org/people/shawnguo/linux-2.6.git

F:	arch/arm/mach-mxs/



ARM/GLOMATION GESBC9312SX MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1052,9 +1046,33 @@ M: Santosh Shilimkar <santosh.shilimkar@ti.com> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-keystone/

F:	drivers/clk/keystone/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git



ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK

M:	Santosh Shilimkar <santosh.shilimkar@ti.com>

L:	linux-kernel@vger.kernel.org

S:	Maintained

F:	drivers/clk/keystone/



ARM/TEXAS INSTRUMENT KEYSTONE ClOCKSOURCE

M:	Santosh Shilimkar <santosh.shilimkar@ti.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-kernel@vger.kernel.org

S:	Maintained

F:	drivers/clocksource/timer-keystone.c



ARM/TEXAS INSTRUMENT KEYSTONE RESET DRIVER

M:	Santosh Shilimkar <santosh.shilimkar@ti.com>

L:	linux-kernel@vger.kernel.org

S:	Maintained

F:	drivers/power/reset/keystone-reset.c



ARM/TEXAS INSTRUMENT AEMIF/EMIF DRIVERS

M:	Santosh Shilimkar <santosh.shilimkar@ti.com>

L:	linux-kernel@vger.kernel.org

S:	Maintained

F:	drivers/memory/*emif*



ARM/LOGICPD PXA270 MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -5512,10 +5530,11 @@ S: Maintained 
F:	arch/arm/mach-lpc32xx/



LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)

M:	Nagalakshmi Nandigama <Nagalakshmi.Nandigama@lsi.com>

M:	Sreekanth Reddy <Sreekanth.Reddy@lsi.com>

M:	support@lsi.com

L:	DL-MPTFusionLinux@lsi.com

M:	Nagalakshmi Nandigama <nagalakshmi.nandigama@avagotech.com>

M:	Praveen Krishnamoorthy <praveen.krishnamoorthy@avagotech.com>

M:	Sreekanth Reddy <sreekanth.reddy@avagotech.com>

M:	Abhijit Mahajan <abhijit.mahajan@avagotech.com>

L:	MPT-FusionLinux.pdl@avagotech.com

L:	linux-scsi@vger.kernel.org

W:	http://www.lsilogic.com/support

S:	Supported
@@ -9406,12 +9425,6 @@ S: Maintained 
F:	drivers/usb/host/isp116x*

F:	include/linux/usb/isp116x.h



USB KAWASAKI LSI DRIVER

M:	Oliver Neukum <oliver@neukum.org>

L:	linux-usb@vger.kernel.org

S:	Maintained

F:	drivers/usb/serial/kl5kusb105.*



USB MASS STORAGE DRIVER

M:	Matthew Dharm <mdharm-usb@one-eyed-alien.net>

L:	linux-usb@vger.kernel.org
@@ -9439,12 +9452,6 @@ S: Maintained 
F:	Documentation/usb/ohci.txt

F:	drivers/usb/host/ohci*



USB OPTION-CARD DRIVER

M:	Matthias Urlichs <smurf@smurf.noris.de>

L:	linux-usb@vger.kernel.org

S:	Maintained

F:	drivers/usb/serial/option.c



USB PEGASUS DRIVER

M:	Petko Manolov <petkan@nucleusys.com>

L:	linux-usb@vger.kernel.org
@@ -9477,7 +9484,7 @@ S: Maintained 
F:	drivers/net/usb/rtl8150.c



USB SERIAL SUBSYSTEM

M:	Johan Hovold <jhovold@gmail.com>

M:	Johan Hovold <johan@kernel.org>

L:	linux-usb@vger.kernel.org

S:	Maintained

F:	Documentation/usb/usb-serial.txt

Makefile

+4 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 16

SUBLEVEL = 0

EXTRAVERSION = -rc3

EXTRAVERSION = -rc4

NAME = Shuffling Zombie Juror



# *DOCUMENTATION*
@@ -126,7 +126,10 @@ PHONY += $(MAKECMDGOALS) sub-make 
$(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make

	@:



# Fake the "Entering directory" message once, so that IDEs/editors are

# able to understand relative filenames.

sub-make: FORCE

	@echo "make[1]: Entering directory \`$(KBUILD_OUTPUT)'"

	$(if $(KBUILD_VERBOSE:1=),@)$(MAKE) -C $(KBUILD_OUTPUT) \

	KBUILD_SRC=$(CURDIR) \

	KBUILD_EXTMOD="$(KBUILD_EXTMOD)" -f $(CURDIR)/Makefile \

arch/arm/boot/dts/am43x-epos-evm.dts

+4 −0
Original line number Diff line number Diff line
@@ -319,6 +319,10 @@ 
	phy-mode = "rmii";

};



&phy_sel {

	rmii-clock-ext;

};



&i2c0 {

	status = "okay";

	pinctrl-names = "default";

arch/arm/boot/dts/dra7.dtsi

+11 −1
Original line number Diff line number Diff line
@@ -773,7 +773,6 @@ 
			clocks = <&qspi_gfclk_div>;

			clock-names = "fck";

			num-cs = <4>;

			interrupts = <0 343 0x4>;

			status = "disabled";

		};
@@ -984,6 +983,17 @@ 
			#size-cells = <1>;

			status = "disabled";

		};



		atl: atl@4843c000 {

			compatible = "ti,dra7-atl";

			reg = <0x4843c000 0x3ff>;

			ti,hwmods = "atl";

			ti,provided-clocks = <&atl_clkin0_ck>, <&atl_clkin1_ck>,

					     <&atl_clkin2_ck>, <&atl_clkin3_ck>;

			clocks = <&atl_gfclk_mux>;

			clock-names = "fck";

			status = "disabled";

		};

	};

};