Skip to content

Commit 6792dfe

Browse files
committed
Merge branch 'akpm' (patches from Andrew Morton)
Merge misc fixes from Andrew Morton: "A bunch of fixes" * emailed patches fron Andrew Morton <[email protected]>: ocfs2: check existence of old dentry in ocfs2_link() ocfs2: update inode size after zeroing the hole ocfs2: fix issue that ocfs2_setattr() does not deal with new_i_size==i_size mm/memory-failure.c: move refcount only in !MF_COUNT_INCREASED smp.h: fix x86+cpu.c sparse warnings about arch nonboot CPU calls mm: fix page leak at nfs_symlink() slub: do not assert not having lock in removing freed partial gitignore: add all.config ocfs2: fix ocfs2_sync_file() if filesystem is readonly drivers/edac/edac_mc_sysfs.c: poll timeout cannot be zero fs/file.c:fdtable: avoid triggering OOMs from alloc_fdmem xen: properly account for _PAGE_NUMA during xen pte translations mm/slub.c: list_lock may not be held in some circumstances drivers/md/bcache/extents.c: use %zi to format size_t vmcore: prevent PT_NOTE p_memsz overflow during header update drivers/message/i2o/i2o_config.c: fix deadlock in compat_ioctl(I2OGETIOPS) Documentation/: update 00-INDEX files checkpatch: fix detection of git repository get_maintainer: fix detection of git repository drivers/misc/sgi-gru/grukdump.c: unlocking should be conditional in gru_dump_context()
2 parents cbf2822 + 0e04831 commit 6792dfe

File tree

44 files changed

+315
-84
lines changed

Some content is hidden

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

44 files changed

+315
-84
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,6 @@ extra_certificates
9292
signing_key.priv
9393
signing_key.x509
9494
x509.genkey
95+
96+
# Kconfig presets
97+
all.config

Documentation/00-INDEX

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ DMA-ISA-LPC.txt
2929
- How to do DMA with ISA (and LPC) devices.
3030
DMA-attributes.txt
3131
- listing of the various possible attributes a DMA region can have
32+
dmatest.txt
33+
- how to compile, configure and use the dmatest system.
3234
DocBook/
3335
- directory with DocBook templates etc. for kernel documentation.
3436
EDID/
@@ -77,6 +79,8 @@ arm/
7779
- directory with info about Linux on the ARM architecture.
7880
arm64/
7981
- directory with info about Linux on the 64 bit ARM architecture.
82+
assoc_array.txt
83+
- generic associative array intro.
8084
atomic_ops.txt
8185
- semantics and behavior of atomic and bitmask operations.
8286
auxdisplay/
@@ -87,6 +91,8 @@ bad_memory.txt
8791
- how to use kernel parameters to exclude bad RAM regions.
8892
basic_profiling.txt
8993
- basic instructions for those who wants to profile Linux kernel.
94+
bcache.txt
95+
- Block-layer cache on fast SSDs to improve slow (raid) I/O performance.
9096
binfmt_misc.txt
9197
- info on the kernel support for extra binary formats.
9298
blackfin/
@@ -171,6 +177,8 @@ early-userspace/
171177
- info about initramfs, klibc, and userspace early during boot.
172178
edac.txt
173179
- information on EDAC - Error Detection And Correction
180+
efi-stub.txt
181+
- How to use the EFI boot stub to bypass GRUB or elilo on EFI systems.
174182
eisa.txt
175183
- info on EISA bus support.
176184
email-clients.txt
@@ -195,8 +203,8 @@ futex-requeue-pi.txt
195203
- info on requeueing of tasks from a non-PI futex to a PI futex
196204
gcov.txt
197205
- use of GCC's coverage testing tool "gcov" with the Linux kernel
198-
gpio.txt
199-
- overview of GPIO (General Purpose Input/Output) access conventions.
206+
gpio/
207+
- gpio related documentation
200208
hid/
201209
- directory with information on human interface devices
202210
highuid.txt
@@ -255,6 +263,8 @@ kernel-docs.txt
255263
- listing of various WWW + books that document kernel internals.
256264
kernel-parameters.txt
257265
- summary listing of command line / boot prompt args for the kernel.
266+
kernel-per-CPU-kthreads.txt
267+
- List of all per-CPU kthreads and how they introduce jitter.
258268
kmemcheck.txt
259269
- info on dynamic checker that detects uses of uninitialized memory.
260270
kmemleak.txt
@@ -299,8 +309,6 @@ memory-devices/
299309
- directory with info on parts like the Texas Instruments EMIF driver
300310
memory-hotplug.txt
301311
- Hotpluggable memory support, how to use and current status.
302-
memory.txt
303-
- info on typical Linux memory problems.
304312
metag/
305313
- directory with info about Linux on Meta architecture.
306314
mips/
@@ -311,6 +319,8 @@ mmc/
311319
- directory with info about the MMC subsystem
312320
mn10300/
313321
- directory with info about the mn10300 architecture port
322+
module-signing.txt
323+
- Kernel module signing for increased security when loading modules.
314324
mtd/
315325
- directory with info about memory technology devices (flash)
316326
mono.txt
@@ -343,6 +353,8 @@ pcmcia/
343353
- info on the Linux PCMCIA driver.
344354
percpu-rw-semaphore.txt
345355
- RCU based read-write semaphore optimized for locking for reading
356+
phy.txt
357+
- Description of the generic PHY framework.
346358
pi-futex.txt
347359
- documentation on lightweight priority inheritance futexes.
348360
pinctrl.txt
@@ -431,6 +443,8 @@ sysrq.txt
431443
- info on the magic SysRq key.
432444
target/
433445
- directory with info on generating TCM v4 fabric .ko modules
446+
this_cpu_ops.txt
447+
- List rationale behind and the way to use this_cpu operations.
434448
thermal/
435449
- directory with information on managing thermal issues (CPU/temp)
436450
trace/
@@ -469,6 +483,8 @@ wimax/
469483
- directory with info about Intel Wireless Wimax Connections
470484
workqueue.txt
471485
- information on the Concurrency Managed Workqueue implementation
486+
ww-mutex-design.txt
487+
- Intro to Mutex wait/would deadlock handling.s
472488
x86/x86_64/
473489
- directory with info on Linux support for AMD x86-64 (Hammer) machines.
474490
xtensa/

Documentation/RCU/00-INDEX

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ listRCU.txt
88
- Using RCU to Protect Read-Mostly Linked Lists
99
lockdep.txt
1010
- RCU and lockdep checking
11+
lockdep-splat.txt
12+
- RCU Lockdep splats explained.
1113
NMI-RCU.txt
1214
- Using RCU to Protect Dynamic NMI Handlers
1315
rcubarrier.txt

Documentation/arm/00-INDEX

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Booting
44
- requirements for booting
55
Interrupts
66
- ARM Interrupt subsystem documentation
7+
IXP4xx
8+
- Intel IXP4xx Network processor.
79
msm
810
- MSM specific documentation
911
Netwinder
@@ -24,8 +26,16 @@ SPEAr
2426
- ST SPEAr platform Linux Overview
2527
VFP/
2628
- Release notes for Linux Kernel Vector Floating Point support code
29+
cluster-pm-race-avoidance.txt
30+
- Algorithm for CPU and Cluster setup/teardown
2731
empeg/
2832
- Ltd's Empeg MP3 Car Audio Player
33+
firmware.txt
34+
- Secure firmware registration and calling.
35+
kernel_mode_neon.txt
36+
- How to use NEON instructions in kernel mode
37+
kernel_user_helpers.txt
38+
- Helper functions in kernel space made available for userspace.
2939
mem_alignment
3040
- alignment abort handler documentation
3141
memory.txt
@@ -34,3 +44,7 @@ nwfpe/
3444
- NWFPE floating point emulator documentation
3545
swp_emulation
3646
- SWP/SWPB emulation handler/logging description
47+
tcm.txt
48+
- ARM Tightly Coupled Memory
49+
vlocks.txt
50+
- Voting locks, low-level mechanism relying on memory system atomic writes.

Documentation/blackfin/00-INDEX

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
00-INDEX
22
- This file
3-
3+
Makefile
4+
- Makefile for gptimers example file.
45
bfin-gpio-notes.txt
56
- Notes in developing/using bfin-gpio driver.
6-
77
bfin-spi-notes.txt
88
- Notes for using bfin spi bus driver.
9+
gptimers-example.c
10+
- gptimers example

Documentation/block/00-INDEX

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ deadline-iosched.txt
1414
- Deadline IO scheduler tunables
1515
ioprio.txt
1616
- Block io priorities (in CFQ scheduler)
17+
null_blk.txt
18+
- Null block for block-layer benchmarking.
1719
queue-sysfs.txt
1820
- Queue's sysfs entries
1921
request.txt

Documentation/devicetree/00-INDEX

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ https://lists.ozlabs.org/listinfo/devicetree-discuss
88
- this file
99
booting-without-of.txt
1010
- Booting Linux without Open Firmware, describes history and format of device trees.
11+
usage-model.txt
12+
- How Linux uses DT and what DT aims to solve.

Documentation/fb/00-INDEX

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ please mail me.
55

66
00-INDEX
77
- this file.
8+
api.txt
9+
- The frame buffer API between applications and buffer devices.
810
arkfb.txt
911
- info on the fbdev driver for ARK Logic chips.
1012
aty128fb.txt
@@ -51,12 +53,16 @@ sh7760fb.txt
5153
- info on the SH7760/SH7763 integrated LCDC Framebuffer driver.
5254
sisfb.txt
5355
- info on the framebuffer device driver for various SiS chips.
56+
sm501.txt
57+
- info on the framebuffer device driver for sm501 videoframebuffer.
5458
sstfb.txt
5559
- info on the frame buffer driver for 3dfx' Voodoo Graphics boards.
5660
tgafb.txt
5761
- info on the TGA (DECChip 21030) frame buffer driver.
5862
tridentfb.txt
5963
info on the framebuffer driver for some Trident chip based cards.
64+
udlfb.txt
65+
- Driver for DisplayLink USB 2.0 chips.
6066
uvesafb.txt
6167
- info on the userspace VESA (VBE2+ compliant) frame buffer device.
6268
vesafb.txt

Documentation/filesystems/00-INDEX

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
- this file (info on some of the filesystems supported by linux).
33
Locking
44
- info on locking rules as they pertain to Linux VFS.
5+
Makefile
6+
- Makefile for building the filsystems-part of DocBook.
57
9p.txt
68
- 9p (v9fs) is an implementation of the Plan 9 remote fs protocol.
79
adfs.txt

Documentation/filesystems/nfs/00-INDEX

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ nfs41-server.txt
1212
- info on the Linux server implementation of NFSv4 minor version 1.
1313
nfs-rdma.txt
1414
- how to install and setup the Linux NFS/RDMA client and server software
15+
nfsd-admin-interfaces.txt
16+
- Administrative interfaces for nfsd.
1517
nfsroot.txt
1618
- short guide on setting up a diskless box with NFS root filesystem.
1719
pnfs.txt
@@ -20,5 +22,5 @@ rpc-cache.txt
2022
- introduction to the caching mechanisms in the sunrpc layer.
2123
idmapper.txt
2224
- information for configuring request-keys to be used by idmapper
23-
knfsd-rpcgss.txt
25+
rpc-server-gss.txt
2426
- Information on GSS authentication support in the NFS Server

Documentation/ide/00-INDEX

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@ ide-tape.txt
1010
- info on the IDE ATAPI streaming tape driver
1111
ide.txt
1212
- important info for users of ATA devices (IDE/EIDE disks and CD-ROMS).
13+
warm-plug-howto.txt
14+
- using sysfs to remove and add IDE devices.

Documentation/laptops/00-INDEX

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
00-INDEX
22
- This file
3-
acer-wmi.txt
4-
- information on the Acer Laptop WMI Extras driver.
3+
Makefile
4+
- Makefile for building dslm example program.
55
asus-laptop.txt
66
- information on the Asus Laptop Extras driver.
77
disk-shock-protection.txt
88
- information on hard disk shock protection.
99
dslm.c
1010
- Simple Disk Sleep Monitor program
11+
hpfall.c
12+
- (HP) laptop accelerometer program for disk protection.
1113
laptop-mode.txt
1214
- how to conserve battery power using laptop-mode.
1315
sony-laptop.txt

Documentation/leds/00-INDEX

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
00-INDEX
2+
- This file
3+
leds-blinkm.txt
4+
- Driver for BlinkM LED-devices.
15
leds-class.txt
26
- documents LED handling under Linux.
37
leds-lp3944.txt
@@ -12,3 +16,7 @@ leds-lp55xx.txt
1216
- description about lp55xx common driver.
1317
leds-lm3556.txt
1418
- notes on how to use the leds-lm3556 driver.
19+
ledtrig-oneshot.txt
20+
- One-shot LED trigger for both sporadic and dense events.
21+
ledtrig-transient.txt
22+
- LED Transient Trigger, one shot timer activation.

Documentation/m68k/00-INDEX

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
00-INDEX
22
- this file
3+
README.buddha
4+
- Amiga Buddha and Catweasel IDE Driver
35
kernel-options.txt
46
- command line options for Linux/m68k
57

Documentation/networking/00-INDEX

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@
66
- information on the 3Com Etherlink III Series Ethernet cards.
77
6pack.txt
88
- info on the 6pack protocol, an alternative to KISS for AX.25
9-
DLINK.txt
10-
- info on the D-Link DE-600/DE-620 parallel port pocket adapters
9+
LICENSE.qla3xxx
10+
- GPLv2 for QLogic Linux Networking HBA Driver
11+
LICENSE.qlge
12+
- GPLv2 for QLogic Linux qlge NIC Driver
13+
LICENSE.qlcnic
14+
- GPLv2 for QLogic Linux qlcnic NIC Driver
15+
Makefile
16+
- Makefile for docsrc.
1117
PLIP.txt
1218
- PLIP: The Parallel Line Internet Protocol device driver
1319
README.ipw2100
@@ -17,7 +23,7 @@ README.ipw2200
1723
README.sb1000
1824
- info on General Instrument/NextLevel SURFboard1000 cable modem.
1925
alias.txt
20-
- info on using alias network devices
26+
- info on using alias network devices.
2127
arcnet-hardware.txt
2228
- tons of info on ARCnet, hubs, jumper settings for ARCnet cards, etc.
2329
arcnet.txt
@@ -80,14 +86,16 @@ framerelay.txt
8086
- info on using Frame Relay/Data Link Connection Identifier (DLCI).
8187
gen_stats.txt
8288
- Generic networking statistics for netlink users.
83-
generic_hdlc.txt
89+
generic-hdlc.txt
8490
- The generic High Level Data Link Control (HDLC) layer.
8591
generic_netlink.txt
8692
- info on Generic Netlink
8793
gianfar.txt
8894
- Gianfar Ethernet Driver.
8995
i40e.txt
9096
- README for the Intel Ethernet Controller XL710 Driver (i40e).
97+
i40evf.txt
98+
- Short note on the Driver for the Intel(R) XL710 X710 Virtual Function
9199
ieee802154.txt
92100
- Linux IEEE 802.15.4 implementation, API and drivers
93101
igb.txt
@@ -102,6 +110,8 @@ ipddp.txt
102110
- AppleTalk-IP Decapsulation and AppleTalk-IP Encapsulation
103111
iphase.txt
104112
- Interphase PCI ATM (i)Chip IA Linux driver info.
113+
ipsec.txt
114+
- Note on not compressing IPSec payload and resulting failed policy check.
105115
ipv6.txt
106116
- Options to the ipv6 kernel module.
107117
ipvs-sysctl.txt
@@ -120,6 +130,8 @@ lapb-module.txt
120130
- programming information of the LAPB module.
121131
ltpc.txt
122132
- the Apple or Farallon LocalTalk PC card driver
133+
mac80211-auth-assoc-deauth.txt
134+
- authentication and association / deauth-disassoc with max80211
123135
mac80211-injection.txt
124136
- HOWTO use packet injection with mac80211
125137
multiqueue.txt
@@ -134,6 +146,10 @@ netdevices.txt
134146
- info on network device driver functions exported to the kernel.
135147
netif-msg.txt
136148
- Design of the network interface message level setting (NETIF_MSG_*).
149+
netlink_mmap.txt
150+
- memory mapped I/O with netlink
151+
nf_conntrack-sysctl.txt
152+
- list of netfilter-sysctl knobs.
137153
nfc.txt
138154
- The Linux Near Field Communication (NFS) subsystem.
139155
openvswitch.txt
@@ -176,7 +192,7 @@ skfp.txt
176192
- SysKonnect FDDI (SK-5xxx, Compaq Netelligent) driver info.
177193
smc9.txt
178194
- the driver for SMC's 9000 series of Ethernet cards
179-
spider-net.txt
195+
spider_net.txt
180196
- README for the Spidernet Driver (as found in PS3 / Cell BE).
181197
stmmac.txt
182198
- README for the STMicro Synopsys Ethernet driver.
@@ -188,6 +204,8 @@ tcp.txt
188204
- short blurb on how TCP output takes place.
189205
tcp-thin.txt
190206
- kernel tuning options for low rate 'thin' TCP streams.
207+
team.txt
208+
- pointer to information for ethernet teaming devices.
191209
tlan.txt
192210
- ThunderLAN (Compaq Netelligent 10/100, Olicom OC-2xxx) driver info.
193211
tproxy.txt
@@ -200,6 +218,8 @@ vortex.txt
200218
- info on using 3Com Vortex (3c590, 3c592, 3c595, 3c597) Ethernet cards.
201219
vxge.txt
202220
- README for the Neterion X3100 PCIe Server Adapter.
221+
vxlan.txt
222+
- Virtual extensible LAN overview
203223
x25.txt
204224
- general info on X.25 development.
205225
x25-iface.txt

0 commit comments

Comments
 (0)