Skip to content

Commit ece1387

Browse files
author
James Morris
committed
Merge branch 'master' into next
Conflicts: security/Kconfig Manual fix. Signed-off-by: James Morris <[email protected]>
2 parents b08dc3e + 6c30c53 commit ece1387

File tree

358 files changed

+4113
-2128
lines changed

Some content is hidden

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

358 files changed

+4113
-2128
lines changed

‎Documentation/filesystems/afs.txt

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,13 @@ it does support include:
2323

2424
(*) Security (currently only AFS kaserver and KerberosIV tickets).
2525

26-
(*) File reading.
26+
(*) File reading and writing.
2727

2828
(*) Automounting.
2929

30-
It does not yet support the following AFS features:
31-
32-
(*) Write support.
30+
(*) Local caching (via fscache).
3331

34-
(*) Local caching.
32+
It does not yet support the following AFS features:
3533

3634
(*) pioctl() system call.
3735

@@ -56,7 +54,7 @@ They permit the debugging messages to be turned on dynamically by manipulating
5654
the masks in the following files:
5755

5856
/sys/module/af_rxrpc/parameters/debug
59-
/sys/module/afs/parameters/debug
57+
/sys/module/kafs/parameters/debug
6058

6159

6260
=====
@@ -66,9 +64,9 @@ USAGE
6664
When inserting the driver modules the root cell must be specified along with a
6765
list of volume location server IP addresses:
6866

69-
insmod af_rxrpc.o
70-
insmod rxkad.o
71-
insmod kafs.o rootcell=cambridge.redhat.com:172.16.18.73:172.16.18.91
67+
modprobe af_rxrpc
68+
modprobe rxkad
69+
modprobe kafs rootcell=cambridge.redhat.com:172.16.18.73:172.16.18.91
7270

7371
The first module is the AF_RXRPC network protocol driver. This provides the
7472
RxRPC remote operation protocol and may also be accessed from userspace. See:
@@ -81,7 +79,7 @@ is the actual filesystem driver for the AFS filesystem.
8179
Once the module has been loaded, more modules can be added by the following
8280
procedure:
8381

84-
echo add grand.central.org 18.7.14.88:128.2.191.224 >/proc/fs/afs/cells
82+
echo add grand.central.org 18.9.48.14:128.2.203.61:130.237.48.87 >/proc/fs/afs/cells
8583

8684
Where the parameters to the "add" command are the name of a cell and a list of
8785
volume location servers within that cell, with the latter separated by colons.
@@ -101,7 +99,7 @@ The name of the volume can be suffixes with ".backup" or ".readonly" to
10199
specify connection to only volumes of those types.
102100

103101
The name of the cell is optional, and if not given during a mount, then the
104-
named volume will be looked up in the cell specified during insmod.
102+
named volume will be looked up in the cell specified during modprobe.
105103

106104
Additional cells can be added through /proc (see later section).
107105

@@ -163,14 +161,14 @@ THE CELL DATABASE
163161

164162
The filesystem maintains an internal database of all the cells it knows and the
165163
IP addresses of the volume location servers for those cells. The cell to which
166-
the system belongs is added to the database when insmod is performed by the
164+
the system belongs is added to the database when modprobe is performed by the
167165
"rootcell=" argument or, if compiled in, using a "kafs.rootcell=" argument on
168166
the kernel command line.
169167

170168
Further cells can be added by commands similar to the following:
171169

172170
echo add CELLNAME VLADDR[:VLADDR][:VLADDR]... >/proc/fs/afs/cells
173-
echo add grand.central.org 18.7.14.88:128.2.191.224 >/proc/fs/afs/cells
171+
echo add grand.central.org 18.9.48.14:128.2.203.61:130.237.48.87 >/proc/fs/afs/cells
174172

175173
No other cell database operations are available at this time.
176174

@@ -233,7 +231,7 @@ insmod /tmp/kafs.o rootcell=cambridge.redhat.com:172.16.18.91
233231
mount -t afs \%root.afs. /afs
234232
mount -t afs \%cambridge.redhat.com:root.cell. /afs/cambridge.redhat.com/
235233

236-
echo add grand.central.org 18.7.14.88:128.2.191.224 > /proc/fs/afs/cells
234+
echo add grand.central.org 18.9.48.14:128.2.203.61:130.237.48.87 > /proc/fs/afs/cells
237235
mount -t afs "#grand.central.org:root.cell." /afs/grand.central.org/
238236
mount -t afs "#grand.central.org:root.archive." /afs/grand.central.org/archive
239237
mount -t afs "#grand.central.org:root.contrib." /afs/grand.central.org/contrib

‎Documentation/filesystems/proc.txt

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,13 +1167,11 @@ CHAPTER 3: PER-PROCESS PARAMETERS
11671167
3.1 /proc/<pid>/oom_adj - Adjust the oom-killer score
11681168
------------------------------------------------------
11691169

1170-
This file can be used to adjust the score used to select which processes should
1171-
be killed in an out-of-memory situation. The oom_adj value is a characteristic
1172-
of the task's mm, so all threads that share an mm with pid will have the same
1173-
oom_adj value. A high value will increase the likelihood of this process being
1174-
killed by the oom-killer. Valid values are in the range -16 to +15 as
1175-
explained below and a special value of -17, which disables oom-killing
1176-
altogether for threads sharing pid's mm.
1170+
This file can be used to adjust the score used to select which processes
1171+
should be killed in an out-of-memory situation. Giving it a high score will
1172+
increase the likelihood of this process being killed by the oom-killer. Valid
1173+
values are in the range -16 to +15, plus the special value -17, which disables
1174+
oom-killing altogether for this process.
11771175

11781176
The process to be killed in an out-of-memory situation is selected among all others
11791177
based on its badness score. This value equals the original memory size of the process
@@ -1187,9 +1185,6 @@ the parent's score if they do not share the same memory. Thus forking servers
11871185
are the prime candidates to be killed. Having only one 'hungry' child will make
11881186
parent less preferable than the child.
11891187

1190-
/proc/<pid>/oom_adj cannot be changed for kthreads since they are immune from
1191-
oom-killing already.
1192-
11931188
/proc/<pid>/oom_score shows process' current badness score.
11941189

11951190
The following heuristics are then applied:

‎Documentation/kernel-parameters.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,6 +1115,10 @@ and is between 256 and 4096 characters. It is defined in the file
11151115
libata.dma=4 Compact Flash DMA only
11161116
Combinations also work, so libata.dma=3 enables DMA
11171117
for disks and CDROMs, but not CFs.
1118+
1119+
libata.ignore_hpa= [LIBATA] Ignore HPA limit
1120+
libata.ignore_hpa=0 keep BIOS limits (default)
1121+
libata.ignore_hpa=1 ignore limits, using full disk
11181122

11191123
libata.noacpi [LIBATA] Disables use of ACPI in libata suspend/resume
11201124
when set.

‎Documentation/video4linux/CARDLIST.em28xx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
0 -> Unknown EM2800 video grabber (em2800) [eb1a:2800]
2-
1 -> Unknown EM2750/28xx video grabber (em2820/em2840) [eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]
2+
1 -> Unknown EM2750/28xx video grabber (em2820/em2840) [eb1a:2710,eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]
33
2 -> Terratec Cinergy 250 USB (em2820/em2840) [0ccd:0036]
44
3 -> Pinnacle PCTV USB 2 (em2820/em2840) [2304:0208]
55
4 -> Hauppauge WinTV USB 2 (em2820/em2840) [2040:4200,2040:4201]

‎Documentation/video4linux/CARDLIST.saa7134

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@
153153
152 -> Asus Tiger Rev:1.00 [1043:4857]
154154
153 -> Kworld Plus TV Analog Lite PCI [17de:7128]
155155
154 -> Avermedia AVerTV GO 007 FM Plus [1461:f31d]
156-
155 -> Hauppauge WinTV-HVR1120 ATSC/QAM-Hybrid [0070:6706,0070:6708]
157-
156 -> Hauppauge WinTV-HVR1110r3 DVB-T/Hybrid [0070:6707,0070:6709,0070:670a]
156+
155 -> Hauppauge WinTV-HVR1150 ATSC/QAM-Hybrid [0070:6706,0070:6708]
157+
156 -> Hauppauge WinTV-HVR1120 DVB-T/Hybrid [0070:6707,0070:6709,0070:670a]
158158
157 -> Avermedia AVerTV Studio 507UA [1461:a11b]
159159
158 -> AVerMedia Cardbus TV/Radio (E501R) [1461:b7e9]
160160
159 -> Beholder BeholdTV 505 RDS [0000:505B]

‎MAINTAINERS

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ F: drivers/input/misc/ati_remote2.c
904904

905905
ATLX ETHERNET DRIVERS
906906
M: Jay Cliburn <[email protected]>
907-
M: Chris Snook <csnook@redhat.com>
907+
M: Chris Snook <chris.snook@gmail.com>
908908
M: Jie Yang <[email protected]>
909909
L: [email protected]
910910
W: http://sourceforge.net/projects/atl1
@@ -2238,6 +2238,14 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
22382238
S: Maintained
22392239
F: drivers/media/video/gspca/pac207.c
22402240

2241+
GSPCA SN9C20X SUBDRIVER
2242+
P: Brian Johnson
2243+
M: [email protected]
2244+
L: [email protected]
2245+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
2246+
S: Maintained
2247+
F: drivers/media/video/gspca/sn9c20x.c
2248+
22412249
GSPCA T613 SUBDRIVER
22422250
M: Leandro Costantino <[email protected]>
22432251
L: [email protected]
@@ -3421,6 +3429,7 @@ F: drivers/mfd/
34213429

34223430
MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
34233431
S: Orphan
3432+
L: [email protected]
34243433
F: drivers/mmc/
34253434
F: include/linux/mmc/
34263435

@@ -3555,6 +3564,9 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
35553564
S: Maintained
35563565
F: net/
35573566
F: include/net/
3567+
F: include/linux/in.h
3568+
F: include/linux/net.h
3569+
F: include/linux/netdevice.h
35583570

35593571
NETWORKING [IPv4/IPv6]
35603572
M: "David S. Miller" <[email protected]>
@@ -3590,6 +3602,8 @@ W: http://www.linuxfoundation.org/en/Net
35903602
T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
35913603
S: Odd Fixes
35923604
F: drivers/net/
3605+
F: include/linux/if_*
3606+
F: include/linux/*device.h
35933607

35943608
NETXEN (1/10) GbE SUPPORT
35953609
M: Dhananjay Phadke <[email protected]>
@@ -3796,7 +3810,7 @@ W: http://open-osd.org
37963810
T: git git://git.open-osd.org/open-osd.git
37973811
S: Maintained
37983812
F: drivers/scsi/osd/
3799-
F: drivers/include/scsi/osd_*
3813+
F: include/scsi/osd_*
38003814
F: fs/exofs/
38013815

38023816
P54 WIRELESS DRIVER

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 2
22
PATCHLEVEL = 6
33
SUBLEVEL = 31
4-
EXTRAVERSION = -rc5
4+
EXTRAVERSION = -rc6
55
NAME = Man-Eating Seals of Antiquity
66

77
# *DOCUMENTATION*

‎REPORTING-BUGS

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ worry too much about getting the wrong person. If you are unsure send it
1515
to the person responsible for the code relevant to what you were doing.
1616
If it occurs repeatably try and describe how to recreate it. That is
1717
worth even more than the oops itself. The list of maintainers and
18-
mailing lists is in the MAINTAINERS file in this directory.
18+
mailing lists is in the MAINTAINERS file in this directory. If you
19+
know the file name that causes the problem you can use the following
20+
command in this directory to find some of the maintainers of that file:
21+
perl scripts/get_maintainer.pl -f <filename>
1922

2023
If it is a security bug, please copy the Security Contact listed
2124
in the MAINTAINERS file. They can help coordinate bugfix and disclosure.

‎arch/arm/configs/rx51_defconfig

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ CONFIG_ALIGNMENT_TRAP=y
282282
#
283283
CONFIG_ZBOOT_ROM_TEXT=0x0
284284
CONFIG_ZBOOT_ROM_BSS=0x0
285-
CONFIG_CMDLINE="init=/sbin/preinit ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs rootflags=bulk_read,no_chk_data_crc rw console=ttyMTD,log console=tty0"
285+
CONFIG_CMDLINE="init=/sbin/preinit ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs rootflags=bulk_read,no_chk_data_crc rw console=ttyMTD,log console=tty0 console=ttyS2,115200n8"
286286
# CONFIG_XIP_KERNEL is not set
287287
# CONFIG_KEXEC is not set
288288

@@ -1354,7 +1354,7 @@ CONFIG_USB_OTG_UTILS=y
13541354
# CONFIG_USB_GPIO_VBUS is not set
13551355
# CONFIG_ISP1301_OMAP is not set
13561356
CONFIG_TWL4030_USB=y
1357-
CONFIG_MMC=m
1357+
CONFIG_MMC=y
13581358
# CONFIG_MMC_DEBUG is not set
13591359
# CONFIG_MMC_UNSAFE_RESUME is not set
13601360

@@ -1449,7 +1449,8 @@ CONFIG_RTC_DRV_TWL4030=m
14491449
# on-CPU RTC drivers
14501450
#
14511451
# CONFIG_DMADEVICES is not set
1452-
# CONFIG_REGULATOR is not set
1452+
CONFIG_REGULATOR=y
1453+
CONFIG_REGULATOR_TWL4030=y
14531454
# CONFIG_UIO is not set
14541455
# CONFIG_STAGING is not set
14551456

‎arch/arm/include/asm/setup.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,8 @@ static struct tagtable __tagtable_##fn __tag = { tag, fn }
201201
struct membank {
202202
unsigned long start;
203203
unsigned long size;
204-
int node;
204+
unsigned short node;
205+
unsigned short highmem;
205206
};
206207

207208
struct meminfo {

‎arch/arm/mach-ixp4xx/include/mach/io.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#include <mach/hardware.h>
1919

20-
#define IO_SPACE_LIMIT 0xffff0000
20+
#define IO_SPACE_LIMIT 0x0000ffff
2121

2222
extern int (*ixp4xx_pci_read)(u32 addr, u32 cmd, u32* data);
2323
extern int ixp4xx_pci_write(u32 addr, u32 cmd, u32 data);

‎arch/arm/mach-mx3/mx31moboard-devboard.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ static struct imxuart_platform_data uart_pdata = {
6363

6464
static int devboard_sdhc2_get_ro(struct device *dev)
6565
{
66-
return gpio_get_value(SDHC2_WP);
66+
return !gpio_get_value(SDHC2_WP);
6767
}
6868

6969
static int devboard_sdhc2_init(struct device *dev, irq_handler_t detect_irq,

‎arch/arm/mach-mx3/mx31moboard-marxbot.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static unsigned int marxbot_pins[] = {
6767

6868
static int marxbot_sdhc2_get_ro(struct device *dev)
6969
{
70-
return gpio_get_value(SDHC2_WP);
70+
return !gpio_get_value(SDHC2_WP);
7171
}
7272

7373
static int marxbot_sdhc2_init(struct device *dev, irq_handler_t detect_irq,

‎arch/arm/mach-mx3/mx31moboard.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ static struct imxi2c_platform_data moboard_i2c1_pdata = {
9494

9595
static int moboard_sdhc1_get_ro(struct device *dev)
9696
{
97-
return gpio_get_value(SDHC1_WP);
97+
return !gpio_get_value(SDHC1_WP);
9898
}
9999

100100
static int moboard_sdhc1_init(struct device *dev, irq_handler_t detect_irq,

‎arch/arm/mach-mx3/pcm037_eet.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,6 @@
2424
#include "devices.h"
2525

2626
static unsigned int pcm037_eet_pins[] = {
27-
/* SPI #1 */
28-
MX31_PIN_CSPI1_MISO__MISO,
29-
MX31_PIN_CSPI1_MOSI__MOSI,
30-
MX31_PIN_CSPI1_SCLK__SCLK,
31-
MX31_PIN_CSPI1_SPI_RDY__SPI_RDY,
32-
MX31_PIN_CSPI1_SS0__SS0,
33-
MX31_PIN_CSPI1_SS1__SS1,
34-
MX31_PIN_CSPI1_SS2__SS2,
35-
3627
/* Reserve and hardwire GPIO 57 high - S6E63D6 chipselect */
3728
IOMUX_MODE(MX31_PIN_KEY_COL7, IOMUX_CONFIG_GPIO),
3829
/* GPIO keys */

‎arch/arm/mach-omap2/board-2430sdp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ static inline void board_smc91x_init(void)
141141

142142
static void __init omap_2430sdp_init_irq(void)
143143
{
144-
omap2_init_common_hw(NULL);
144+
omap2_init_common_hw(NULL, NULL);
145145
omap_init_irq();
146146
omap_gpio_init();
147147
}

‎arch/arm/mach-omap2/board-3430sdp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ static struct platform_device *sdp3430_devices[] __initdata = {
169169

170170
static void __init omap_3430sdp_init_irq(void)
171171
{
172-
omap2_init_common_hw(hyb18m512160af6_sdrc_params);
172+
omap2_init_common_hw(hyb18m512160af6_sdrc_params, NULL);
173173
omap_init_irq();
174174
omap_gpio_init();
175175
}

‎arch/arm/mach-omap2/board-4430sdp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static void __init gic_init_irq(void)
5959

6060
static void __init omap_4430sdp_init_irq(void)
6161
{
62-
omap2_init_common_hw(NULL);
62+
omap2_init_common_hw(NULL, NULL);
6363
#ifdef CONFIG_OMAP_32K_TIMER
6464
omap2_gp_clockevent_set_gptimer(1);
6565
#endif

‎arch/arm/mach-omap2/board-apollon.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ static inline void __init apollon_init_smc91x(void)
250250

251251
static void __init omap_apollon_init_irq(void)
252252
{
253-
omap2_init_common_hw(NULL);
253+
omap2_init_common_hw(NULL, NULL);
254254
omap_init_irq();
255255
omap_gpio_init();
256256
apollon_init_smc91x();

‎arch/arm/mach-omap2/board-generic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
static void __init omap_generic_init_irq(void)
3535
{
36-
omap2_init_common_hw(NULL);
36+
omap2_init_common_hw(NULL, NULL);
3737
omap_init_irq();
3838
}
3939

‎arch/arm/mach-omap2/board-h4.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ static void __init h4_init_flash(void)
270270

271271
static void __init omap_h4_init_irq(void)
272272
{
273-
omap2_init_common_hw(NULL);
273+
omap2_init_common_hw(NULL, NULL);
274274
omap_init_irq();
275275
omap_gpio_init();
276276
h4_init_flash();

‎arch/arm/mach-omap2/board-ldp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ static inline void __init ldp_init_smsc911x(void)
270270

271271
static void __init omap_ldp_init_irq(void)
272272
{
273-
omap2_init_common_hw(NULL);
273+
omap2_init_common_hw(NULL, NULL);
274274
omap_init_irq();
275275
omap_gpio_init();
276276
ldp_init_smsc911x();

‎arch/arm/mach-omap2/board-omap3beagle.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,8 @@ static int __init omap3_beagle_i2c_init(void)
282282

283283
static void __init omap3_beagle_init_irq(void)
284284
{
285-
omap2_init_common_hw(mt46h32m32lf6_sdrc_params);
285+
omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
286+
mt46h32m32lf6_sdrc_params);
286287
omap_init_irq();
287288
#ifdef CONFIG_OMAP_32K_TIMER
288289
omap2_gp_clockevent_set_gptimer(12);
@@ -408,6 +409,10 @@ static void __init omap3_beagle_init(void)
408409

409410
usb_musb_init();
410411
omap3beagle_flash_init();
412+
413+
/* Ensure SDRC pins are mux'd for self-refresh */
414+
omap_cfg_reg(H16_34XX_SDRC_CKE0);
415+
omap_cfg_reg(H17_34XX_SDRC_CKE1);
411416
}
412417

413418
static void __init omap3_beagle_map_io(void)

0 commit comments

Comments
 (0)