Skip to content

Commit 83b3d53

Browse files
olofjolofj
committed
Merge tag 'imx-fixes-3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
Merge "ARM: imx: fixes for 3.18, 2nd round" from Shawn Guo: "This is the second round of i.MX fixes for 3.18. The clk-vf610 fix is relatively big, because it needs some adaption to the change made by offending commit dc4805c (ARM: imx: remove ENABLE and BYPASS bits from clk-pllv3 driver). And it should have been sent to you for earlier -rc inclusion, but unfortunately it got delayed for some time because Stefan wasn't aware of my email address change." The i.MX fixes for 3.18, 2nd round: - Fix a regression on Vybrid platform which is caused by commit dc4805c (ARM: imx: remove ENABLE and BYPASS bits from clk-pllv3 driver), and results in a missing configuration on PLL clocks. - Fix a regression with i.MX defconfig files where CONFIG_SPI option gets lost accidentally. * tag 'imx-fixes-3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (460 commits) ARM: imx: Fix the removal of CONFIG_SPI option ARM: imx: clk-vf610: define PLL's clock tree + Linux 3.18-rc3 Signed-off-by: Olof Johansson <[email protected]>
2 parents 4257412 + 89fbec5 commit 83b3d53

File tree

509 files changed

+4647
-3962
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

509 files changed

+4647
-3962
lines changed

‎Documentation/ABI/testing/sysfs-ibft

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ Date: November 2007
2020
Contact: Konrad Rzeszutek <[email protected]>
2121
Description: The /sys/firmware/ibft/ethernetX directory will contain
2222
files that expose the iSCSI Boot Firmware Table NIC data.
23-
This can this can the IP address, MAC, and gateway of the NIC.
23+
Usually this contains the IP address, MAC, and gateway of the NIC.

‎Documentation/DocBook/media/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ GENFILES := $(addprefix $(MEDIA_OBJ_DIR)/, $(MEDIA_TEMP))
2525
PHONY += cleanmediadocs
2626

2727
cleanmediadocs:
28-
-@rm `find $(MEDIA_OBJ_DIR) -type l` $(GENFILES) $(OBJIMGFILES) 2>/dev/null
28+
-@rm -f `find $(MEDIA_OBJ_DIR) -type l` $(GENFILES) $(OBJIMGFILES) 2>/dev/null
2929

3030
$(obj)/media_api.xml: $(GENFILES) FORCE
3131

‎Documentation/DocBook/media/v4l/compat.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2566,6 +2566,10 @@ fields changed from _s32 to _u32.
25662566
<para>Added compound control types and &VIDIOC-QUERY-EXT-CTRL;.
25672567
</para>
25682568
</listitem>
2569+
</orderedlist>
2570+
</section>
2571+
2572+
<section>
25692573
<title>V4L2 in Linux 3.18</title>
25702574
<orderedlist>
25712575
<listitem>

‎Documentation/HOWTO

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,6 @@ tree, they need to be integration-tested. For this purpose, a special
324324
testing repository exists into which virtually all subsystem trees are
325325
pulled on an almost daily basis:
326326
http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git
327-
http://linux.f-seidel.de/linux-next/pmwiki/
328327

329328
This way, the -next kernel gives a summary outlook onto what will be
330329
expected to go into the mainline kernel at the next merge period.

‎Documentation/SubmittingPatches

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -483,12 +483,10 @@ have been included in the discussion
483483

484484
14) Using Reported-by:, Tested-by:, Reviewed-by:, Suggested-by: and Fixes:
485485

486-
If this patch fixes a problem reported by somebody else, consider adding a
487-
Reported-by: tag to credit the reporter for their contribution. Please
488-
note that this tag should not be added without the reporter's permission,
489-
especially if the problem was not reported in a public forum. That said,
490-
if we diligently credit our bug reporters, they will, hopefully, be
491-
inspired to help us again in the future.
486+
The Reported-by tag gives credit to people who find bugs and report them and it
487+
hopefully inspires them to help us again in the future. Please note that if
488+
the bug was reported in private, then ask for permission first before using the
489+
Reported-by tag.
492490

493491
A Tested-by: tag indicates that the patch has been successfully tested (in
494492
some environment) by the person named. This tag informs maintainers that

‎Documentation/development-process/2.Process

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,10 +289,6 @@ lists when they are assembled; they can be downloaded from:
289289

290290
http://www.kernel.org/pub/linux/kernel/next/
291291

292-
Some information about linux-next has been gathered at:
293-
294-
http://linux.f-seidel.de/linux-next/pmwiki/
295-
296292
Linux-next has become an integral part of the kernel development process;
297293
all patches merged during a given merge window should really have found
298294
their way into linux-next some time before the merge window opens.

‎Documentation/development-process/8.Conclusion

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ Beyond that, a valuable resource for kernel developers is:
2222

2323
http://kernelnewbies.org/
2424

25-
Information about the linux-next tree gathers at:
26-
27-
http://linux.f-seidel.de/linux-next/pmwiki/
28-
2925
And, of course, one should not forget http://kernel.org/, the definitive
3026
location for kernel release information.
3127

‎Documentation/devicetree/bindings/net/smsc-lan91c111.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ Optional properties:
1111
are supported on the device. Valid value for SMSC LAN91c111 are
1212
1, 2 or 4. If it's omitted or invalid, the size would be 2 meaning
1313
16-bit access only.
14+
- power-gpios: GPIO to control the PWRDWN pin
15+
- reset-gpios: GPIO to control the RESET pin

‎Documentation/devicetree/bindings/sound/sgtl5000.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,20 @@ Required properties:
77

88
- clocks : the clock provider of SYS_MCLK
99

10+
- VDDA-supply : the regulator provider of VDDA
11+
12+
- VDDIO-supply: the regulator provider of VDDIO
13+
14+
Optional properties:
15+
16+
- VDDD-supply : the regulator provider of VDDD
17+
1018
Example:
1119

1220
codec: sgtl5000@0a {
1321
compatible = "fsl,sgtl5000";
1422
reg = <0x0a>;
1523
clocks = <&clks 150>;
24+
VDDA-supply = <&reg_3p3v>;
25+
VDDIO-supply = <&reg_3p3v>;
1626
};

‎Documentation/devicetree/bindings/submitting-patches.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ I. For patch submitters
1212

1313
[email protected]
1414

15+
3) The Documentation/ portion of the patch should come in the series before
16+
the code implementing the binding.
17+
1518
II. For kernel maintainers
1619

1720
1) If you aren't comfortable reviewing a given binding, reply to it and ask

‎Documentation/kernel-parameters.txt

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1264,7 +1264,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
12641264
i8042.noloop [HW] Disable the AUX Loopback command while probing
12651265
for the AUX port
12661266
i8042.nomux [HW] Don't check presence of an active multiplexing
1267-
controller. Default: true.
1267+
controller
12681268
i8042.nopnp [HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX
12691269
controllers
12701270
i8042.notimeout [HW] Ignore timeout condition signalled by controller
@@ -1307,6 +1307,18 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
13071307
.cdrom .chs .ignore_cable are additional options
13081308
See Documentation/ide/ide.txt.
13091309

1310+
ide-generic.probe-mask= [HW] (E)IDE subsystem
1311+
Format: <int>
1312+
Probe mask for legacy ISA IDE ports. Depending on
1313+
platform up to 6 ports are supported, enabled by
1314+
setting corresponding bits in the mask to 1. The
1315+
default value is 0x0, which has a special meaning.
1316+
On systems that have PCI, it triggers scanning the
1317+
PCI bus for the first and the second port, which
1318+
are then probed. On systems without PCI the value
1319+
of 0x0 enables probing the two first ports as if it
1320+
was 0x3.
1321+
13101322
ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem
13111323
Claim all unknown PCI IDE storage controllers.
13121324

@@ -1587,6 +1599,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
15871599
kmemleak= [KNL] Boot-time kmemleak enable/disable
15881600
Valid arguments: on, off
15891601
Default: on
1602+
Built with CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y,
1603+
the default is off.
15901604

15911605
kmemcheck= [X86] Boot-time kmemcheck enable/disable/one-shot mode
15921606
Valid arguments: 0, 1, 2

‎Documentation/kmemleak.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ Memory may be allocated or freed before kmemleak is initialised and
6262
these actions are stored in an early log buffer. The size of this buffer
6363
is configured via the CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE option.
6464

65+
If CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF are enabled, the kmemleak is
66+
disabled by default. Passing "kmemleak=on" on the kernel command
67+
line enables the function.
68+
6569
Basic Algorithm
6670
---------------
6771

‎Documentation/prctl/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# List of programs to build
2-
hostprogs-y := disable-tsc-ctxt-sw-stress-test disable-tsc-on-off-stress-test disable-tsc-test
2+
hostprogs-$(CONFIG_X86) := disable-tsc-ctxt-sw-stress-test disable-tsc-on-off-stress-test disable-tsc-test
33
# Tell kbuild to always build the programs
44
always := $(hostprogs-y)
55

‎Documentation/ptp/testptp.mk

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# PTP 1588 clock support - User space test program
2+
#
3+
# Copyright (C) 2010 OMICRON electronics GmbH
4+
#
5+
# This program is free software; you can redistribute it and/or modify
6+
# it under the terms of the GNU General Public License as published by
7+
# the Free Software Foundation; either version 2 of the License, or
8+
# (at your option) any later version.
9+
#
10+
# This program is distributed in the hope that it will be useful,
11+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
# GNU General Public License for more details.
14+
#
15+
# You should have received a copy of the GNU General Public License
16+
# along with this program; if not, write to the Free Software
17+
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
18+
19+
CC = $(CROSS_COMPILE)gcc
20+
INC = -I$(KBUILD_OUTPUT)/usr/include
21+
CFLAGS = -Wall $(INC)
22+
LDLIBS = -lrt
23+
PROGS = testptp
24+
25+
all: $(PROGS)
26+
27+
testptp: testptp.o
28+
29+
clean:
30+
rm -f testptp.o
31+
32+
distclean: clean
33+
rm -f $(PROGS)

‎Documentation/vDSO/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ always := $(hostprogs-y)
1010
HOSTCFLAGS := -I$(objtree)/usr/include -std=gnu99
1111
HOSTCFLAGS_vdso_standalone_test_x86.o := -fno-asynchronous-unwind-tables -fno-stack-protector
1212
HOSTLOADLIBES_vdso_standalone_test_x86 := -nostdlib
13+
ifeq ($(CONFIG_X86_32),y)
14+
HOSTLOADLIBES_vdso_standalone_test_x86 += -lgcc_s
15+
endif

‎Documentation/vDSO/vdso_standalone_test_x86.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ static inline void linux_exit(int code)
6363
x86_syscall3(__NR_exit, code, 0, 0);
6464
}
6565

66-
void to_base10(char *lastdig, uint64_t n)
66+
void to_base10(char *lastdig, time_t n)
6767
{
6868
while (n) {
6969
*lastdig = (n % 10) + '0';

‎Documentation/vm/hugetlbpage.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ This command mounts a (pseudo) filesystem of type hugetlbfs on the directory
274274
/mnt/huge. Any files created on /mnt/huge uses huge pages. The uid and gid
275275
options sets the owner and group of the root of the file system. By default
276276
the uid and gid of the current process are taken. The mode option sets the
277-
mode of root of file system to value & 0777. This value is given in octal.
277+
mode of root of file system to value & 01777. This value is given in octal.
278278
By default the value 0755 is picked. The size option sets the maximum value of
279279
memory (huge pages) allowed for that filesystem (/mnt/huge). The size is
280280
rounded down to HPAGE_SIZE. The option nr_inodes sets the maximum number of

‎MAINTAINERS

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4313,17 +4313,21 @@ F: Documentation/blockdev/cpqarray.txt
43134313
F: drivers/block/cpqarray.*
43144314

43154315
HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)
4316-
M: "Stephen M. Cameron" <[email protected].com>
4316+
M: Don Brace <don.brace@pmcs.com>
43174317
L: [email protected]
4318+
L: [email protected]
4319+
L: [email protected]
43184320
S: Supported
43194321
F: Documentation/scsi/hpsa.txt
43204322
F: drivers/scsi/hpsa*.[ch]
43214323
F: include/linux/cciss*.h
43224324
F: include/uapi/linux/cciss*.h
43234325

43244326
HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)
4325-
M: Mike Miller <mike.miller@hp.com>
4327+
M: Don Brace <don.brace@pmcs.com>
43264328
L: [email protected]
4329+
L: [email protected]
4330+
L: [email protected]
43274331
S: Supported
43284332
F: Documentation/blockdev/cciss.txt
43294333
F: drivers/block/cciss*
@@ -4609,7 +4613,7 @@ S: Supported
46094613
F: drivers/crypto/nx/
46104614

46114615
IBM Power 842 compression accelerator
4612-
M: Nathan Fontenot <[email protected].ibm.com>
4616+
M: Dan Streetman <ddstreet@us.ibm.com>
46134617
S: Supported
46144618
F: drivers/crypto/nx/nx-842.c
46154619
F: include/linux/nx842.h
@@ -9605,7 +9609,6 @@ F: drivers/staging/unisys/
96059609

96069610
UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
96079611
M: Vinayak Holikatti <[email protected]>
9608-
M: Santosh Y <[email protected]>
96099612
L: [email protected]
96109613
S: Supported
96119614
F: Documentation/scsi/ufs.txt

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
VERSION = 3
22
PATCHLEVEL = 18
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc2
5-
NAME = Shuffling Zombie Juror
4+
EXTRAVERSION = -rc3
5+
NAME = Diseased Newt
66

77
# *DOCUMENTATION*
88
# To see a list of typical targets execute "make help"

‎arch/arm/boot/dts/omap3-n900.dts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -668,6 +668,8 @@
668668
bank-width = <2>;
669669
pinctrl-names = "default";
670670
pinctrl-0 = <&ethernet_pins>;
671+
power-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; /* gpio86 */
672+
reset-gpios = <&gpio6 4 GPIO_ACTIVE_HIGH>; /* gpio164 */
671673
gpmc,device-width = <2>;
672674
gpmc,sync-clk-ps = <0>;
673675
gpmc,cs-on-ns = <0>;

‎arch/arm/configs/imx_v4_v5_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ CONFIG_SERIAL_IMX_CONSOLE=y
9797
# CONFIG_HW_RANDOM is not set
9898
CONFIG_I2C_CHARDEV=y
9999
CONFIG_I2C_IMX=y
100+
CONFIG_SPI=y
100101
CONFIG_SPI_IMX=y
101102
CONFIG_SPI_SPIDEV=y
102103
CONFIG_GPIO_SYSFS=y

‎arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ CONFIG_I2C_CHARDEV=y
158158
CONFIG_I2C_ALGOPCF=m
159159
CONFIG_I2C_ALGOPCA=m
160160
CONFIG_I2C_IMX=y
161+
CONFIG_SPI=y
161162
CONFIG_SPI_IMX=y
162163
CONFIG_GPIO_SYSFS=y
163164
CONFIG_GPIO_MC9S08DZ60=y

‎arch/arm/include/uapi/asm/unistd.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,7 @@
412412
#define __NR_seccomp (__NR_SYSCALL_BASE+383)
413413
#define __NR_getrandom (__NR_SYSCALL_BASE+384)
414414
#define __NR_memfd_create (__NR_SYSCALL_BASE+385)
415+
#define __NR_bpf (__NR_SYSCALL_BASE+386)
415416

416417
/*
417418
* The following SWIs are ARM private.

‎arch/arm/kernel/asm-offsets.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
* it under the terms of the GNU General Public License version 2 as
1111
* published by the Free Software Foundation.
1212
*/
13+
#include <linux/compiler.h>
1314
#include <linux/sched.h>
1415
#include <linux/mm.h>
1516
#include <linux/dma-mapping.h>
@@ -39,10 +40,19 @@
3940
* GCC 3.2.x: miscompiles NEW_AUX_ENT in fs/binfmt_elf.c
4041
* (http://gcc.gnu.org/PR8896) and incorrect structure
4142
* initialisation in fs/jffs2/erase.c
43+
* GCC 4.8.0-4.8.2: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58854
44+
* miscompiles find_get_entry(), and can result in EXT3 and EXT4
45+
* filesystem corruption (possibly other FS too).
4246
*/
47+
#ifdef __GNUC__
4348
#if (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
4449
#error Your compiler is too buggy; it is known to miscompile kernels.
45-
#error Known good compilers: 3.3
50+
#error Known good compilers: 3.3, 4.x
51+
#endif
52+
#if GCC_VERSION >= 40800 && GCC_VERSION < 40803
53+
#error Your compiler is too buggy; it is known to miscompile kernels
54+
#error and result in filesystem corruption and oopses.
55+
#endif
4656
#endif
4757

4858
int main(void)

‎arch/arm/kernel/calls.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,7 @@
395395
CALL(sys_seccomp)
396396
CALL(sys_getrandom)
397397
/* 385 */ CALL(sys_memfd_create)
398+
CALL(sys_bpf)
398399
#ifndef syscalls_counted
399400
.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
400401
#define syscalls_counted

0 commit comments

Comments
 (0)