You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (25 commits) sound: convert "sound" subdirectory to UTF-8 MAINTAINERS: Add cxacru website/mailing list include files: convert "include" subdirectory to UTF-8 general: convert "kernel" subdirectory to UTF-8 documentation: convert the Documentation directory to UTF-8 Convert the toplevel files CREDITS and MAINTAINERS to UTF-8. remove broken URLs from net drivers' output Magic number prefix consistency change to Documentation/magic-number.txt trivial: s/i_sem /i_mutex/ fix file specification in comments drivers/base/platform.c: fix small typo in doc misc doc and kconfig typos Remove obsolete fat_cvf help text Fix occurrences of "the the " Fix minor typoes in kernel/module.c Kconfig: Remove reference to external mqueue library Kconfig: A couple of grammatical fixes in arch/i386/Kconfig Correct comments in genrtc.c to refer to correct /proc file. Fix more "deprecated" spellos. Fix "deprecated" typoes. ... Fix trivial comment conflict in kernel/relay.c.
This commit is contained in:
Linus Torvalds
@@ -380,7 +380,7 @@ S: FutureTV Labs Ltd
|
||||
S: Brunswick House, 61-69 Newmarket Rd, Cambridge CB5 8EG
|
||||
S: United Kingdom
|
||||
|
||||
N: Thomas Bogendörfer
|
||||
N: Thomas Bogendörfer
|
||||
E: tsbogend@alpha.franken.de
|
||||
D: PCnet32 driver, SONIC driver, JAZZ_ESP driver
|
||||
D: newport abscon driver, g364 framebuffer driver
|
||||
@@ -400,7 +400,7 @@ W: http://math-www.uni-paderborn.de/~axel/
|
||||
D: Configuration help text support
|
||||
D: Linux CD and Support Giveaway List
|
||||
|
||||
N: Erik Inge Bolsø
|
||||
N: Erik Inge Bolsø
|
||||
E: knan@mo.himolde.no
|
||||
D: Misc kernel hacks
|
||||
|
||||
@@ -428,7 +428,7 @@ D: Various fixes (mostly networking)
|
||||
S: Montreal, Quebec
|
||||
S: Canada
|
||||
|
||||
N: Zoltán Böszörményi
|
||||
N: Zoltán Böszörményi
|
||||
E: zboszor@mail.externet.hu
|
||||
D: MTRR emulation with Cyrix style ARR registers, Athlon MTRR support
|
||||
|
||||
@@ -1029,11 +1029,11 @@ D: Future Domain TMC-16x0 SCSI driver (author)
|
||||
D: APM driver (early port)
|
||||
D: DRM drivers (author of several)
|
||||
|
||||
N: János Farkas
|
||||
N: János Farkas
|
||||
E: chexum@shadow.banki.hu
|
||||
D: romfs, various (mostly networking) fixes
|
||||
P: 1024/F81FB2E1 41 B7 E4 E6 3E D4 A6 71 6D 9C F3 9F F2 BF DF 6E
|
||||
S: Madarász Viktor utca 25
|
||||
S: Madarász Viktor utca 25
|
||||
S: 1131 Budapest
|
||||
S: Hungary
|
||||
|
||||
@@ -1044,10 +1044,10 @@ D: UDF filesystem
|
||||
S: (ask for current address)
|
||||
S: USA
|
||||
|
||||
N: Jürgen Fischer
|
||||
E: fischer@norbit.de (=?iso-8859-1?q?J=FCrgen?= Fischer)
|
||||
N: Jürgen Fischer
|
||||
E: fischer@norbit.de
|
||||
D: Author of Adaptec AHA-152x SCSI driver
|
||||
S: Schulstraße 18
|
||||
S: Schulstraße 18
|
||||
S: 26506 Norden
|
||||
S: Germany
|
||||
|
||||
@@ -1113,7 +1113,7 @@ E: fuganti@netbank.com.br
|
||||
D: random kernel hacker, ZF MachZ Watchdog driver
|
||||
S: Conectiva S.A.
|
||||
S: R. Tocantins, 89 - Cristo Rei
|
||||
S: 80050-430 - Curitiba - Paraná
|
||||
S: 80050-430 - Curitiba - Paraná
|
||||
S: Brazil
|
||||
|
||||
N: Kumar Gala
|
||||
@@ -1258,12 +1258,12 @@ S: 44 St. Joseph Street, Suite 506
|
||||
S: Toronto, Ontario, M4Y 2W4
|
||||
S: Canada
|
||||
|
||||
N: Richard Günther
|
||||
N: Richard Günther
|
||||
E: rguenth@tat.physik.uni-tuebingen.de
|
||||
W: http://www.tat.physik.uni-tuebingen.de/~rguenth
|
||||
P: 2048/2E829319 2F 83 FC 93 E9 E4 19 E2 93 7A 32 42 45 37 23 57
|
||||
D: binfmt_misc
|
||||
S: 72074 Tübingen
|
||||
S: 72074 Tübingen
|
||||
S: Germany
|
||||
|
||||
N: Justin Guyett
|
||||
@@ -1287,7 +1287,7 @@ N: Bruno Haible
|
||||
E: haible@ma2s2.mathematik.uni-karlsruhe.de
|
||||
D: SysV FS, shm swapping, memory management fixes
|
||||
S: 17 rue Danton
|
||||
S: F - 94270 Le Kremlin-Bicêtre
|
||||
S: F - 94270 Le Kremlin-Bicêtre
|
||||
S: France
|
||||
|
||||
N: Greg Hankins
|
||||
@@ -1701,7 +1701,7 @@ S: Czech Republic
|
||||
N: Jakob Kemi
|
||||
E: jakob.kemi@telia.com
|
||||
D: V4L W9966 Webcam driver
|
||||
S: Forsbyvägen 33
|
||||
S: Forsbyvägen 33
|
||||
S: 74143 Knivsta
|
||||
S: Sweden
|
||||
|
||||
@@ -2065,7 +2065,7 @@ D: misc. kernel hacking and debugging
|
||||
S: Cambridge, MA 02139
|
||||
S: USA
|
||||
|
||||
N: Martin von Löwis
|
||||
N: Martin von Löwis
|
||||
E: loewis@informatik.hu-berlin.de
|
||||
D: script binary format
|
||||
D: NTFS driver
|
||||
@@ -2142,7 +2142,7 @@ S: PO BOX 220, HFX. CENTRAL
|
||||
S: Halifax, Nova Scotia
|
||||
S: Canada B3J 3C8
|
||||
|
||||
N: Kai Mäkisara
|
||||
N: Kai Mäkisara
|
||||
E: Kai.Makisara@kolumbus.fi
|
||||
D: SCSI Tape Driver
|
||||
|
||||
@@ -2785,10 +2785,10 @@ N: Juan Quintela
|
||||
E: quintela@fi.udc.es
|
||||
D: Memory Management hacking
|
||||
S: LFCIA
|
||||
S: Departamento de Computación
|
||||
S: Universidade da Coruña
|
||||
S: Departamento de Computación
|
||||
S: Universidade da Coruña
|
||||
S: E-15071
|
||||
S: A Coruña
|
||||
S: A Coruña
|
||||
S: Spain
|
||||
|
||||
N: Augusto Cesar Radtke
|
||||
@@ -2939,7 +2939,7 @@ E: aris@cathedrallabs.org
|
||||
D: Support for EtherExpress 10 ISA (i82595) in eepro driver
|
||||
D: User level driver support for input
|
||||
S: R. Jose Serrato, 130 - Santa Candida
|
||||
S: 82640-320 - Curitiba - Paraná
|
||||
S: 82640-320 - Curitiba - Paraná
|
||||
S: Brazil
|
||||
|
||||
N: Alessandro Rubini
|
||||
@@ -3345,15 +3345,15 @@ P: 1024D/D0FE7AFB B24A 65C9 1D71 2AC2 DE87 CA26 189B 9946 D0FE 7AFB
|
||||
D: rcutorture maintainer
|
||||
D: lock annotations, finding and fixing lock bugs
|
||||
|
||||
N: Winfried Trümper
|
||||
N: Winfried Trümper
|
||||
E: winni@xpilot.org
|
||||
W: http://www.shop.de/~winni/
|
||||
D: German HOWTO, Crash-Kurs Linux (German, 100 comprehensive pages)
|
||||
D: CD-Writing HOWTO, various mini-HOWTOs
|
||||
D: One-week tutorials on Linux twice a year (free of charge)
|
||||
D: Linux-Workshop Köln (aka LUG Cologne, Germany), Installfests
|
||||
D: Linux-Workshop Köln (aka LUG Cologne, Germany), Installfests
|
||||
S: Tacitusstr. 6
|
||||
S: D-50968 Köln
|
||||
S: D-50968 Köln
|
||||
|
||||
N: Tsu-Sheng Tsao
|
||||
E: tsusheng@scf.usc.edu
|
||||
|
||||
@@ -6,7 +6,7 @@ Description:
|
||||
races, contains a naming policy within the kernel that is
|
||||
against the LSB, and can be replaced by using udev.
|
||||
The files fs/devfs/*, include/linux/devfs_fs*.h were removed,
|
||||
along with the the assorted devfs function calls throughout the
|
||||
along with the assorted devfs function calls throughout the
|
||||
kernel tree.
|
||||
|
||||
Users:
|
||||
|
||||
@@ -84,6 +84,10 @@ X!Iinclude/linux/kobject.h
|
||||
!Ekernel/rcupdate.c
|
||||
</sect1>
|
||||
|
||||
<sect1><title>Device Resource Management</title>
|
||||
!Edrivers/base/devres.c
|
||||
</sect1>
|
||||
|
||||
</chapter>
|
||||
|
||||
<chapter id="adt">
|
||||
|
||||
@@ -480,8 +480,8 @@ The PCI stack provides 3 possible levels of MSI disabling:
|
||||
|
||||
6.1. Disabling MSI on a single device
|
||||
|
||||
Under some circumstances, it might be required to disable MSI on a
|
||||
single device, It may be achived by either not calling pci_enable_msi()
|
||||
Under some circumstances it might be required to disable MSI on a
|
||||
single device. This may be achieved by either not calling pci_enable_msi()
|
||||
or all, or setting the pci_dev->no_msi flag before (most of the time
|
||||
in a quirk).
|
||||
|
||||
@@ -492,7 +492,7 @@ being able to route MSI between busses. In this case, MSI have to be
|
||||
disabled on all devices behind this bridge. It is achieves by setting
|
||||
the PCI_BUS_FLAGS_NO_MSI flag in the pci_bus->bus_flags of the bridge
|
||||
subordinate bus. There is no need to set the same flag on bridges that
|
||||
are below the broken brigde. When pci_enable_msi() is called to enable
|
||||
are below the broken bridge. When pci_enable_msi() is called to enable
|
||||
MSI on a device, pci_msi_supported() takes care of checking the NO_MSI
|
||||
flag in all parent busses of the device.
|
||||
|
||||
|
||||
@@ -149,7 +149,7 @@ So, what's changed?
|
||||
|
||||
3. set_GPIO_IRQ_edge() is obsolete, and should be replaced by set_irq_type.
|
||||
|
||||
4. Direct access to SA1111 INTPOL is depreciated. Use set_irq_type instead.
|
||||
4. Direct access to SA1111 INTPOL is deprecated. Use set_irq_type instead.
|
||||
|
||||
5. A handler is expected to perform any necessary acknowledgement of the
|
||||
parent IRQ via the correct chip specific function. For instance, if
|
||||
|
||||
@@ -23,7 +23,7 @@ Support
|
||||
|
||||
http://handhelds.org/moin/moin.cgi/HpIpaqH1940
|
||||
|
||||
Herbert Pötzl pages:
|
||||
Herbert Pötzl pages:
|
||||
|
||||
http://vserver.13thfloor.at/H1940/
|
||||
|
||||
@@ -32,7 +32,7 @@ Maintainers
|
||||
-----------
|
||||
|
||||
This project is being maintained and developed by a variety
|
||||
of people, including Ben Dooks, Arnaud Patard, and Herbert Pötzl.
|
||||
of people, including Ben Dooks, Arnaud Patard, and Herbert Pötzl.
|
||||
|
||||
Thanks to the many others who have also provided support.
|
||||
|
||||
|
||||
@@ -78,9 +78,9 @@ Select (17)------------------------------(16) Data / Instruction
|
||||
Ground (18)---[GND] [+5v]---(19) LED +
|
||||
Ground (19)---[GND]
|
||||
Ground (20)---[GND] E A Values:
|
||||
Ground (21)---[GND] [GND]---[P1]---(18) Vee · R = Resistor = 22 ohm
|
||||
Ground (22)---[GND] | · P1 = Preset = 10 Kohm
|
||||
Ground (23)---[GND] ---- S ------( 3) V0 · P2 = Preset = 1 Kohm
|
||||
Ground (21)---[GND] [GND]---[P1]---(18) Vee - R = Resistor = 22 ohm
|
||||
Ground (22)---[GND] | - P1 = Preset = 10 Kohm
|
||||
Ground (23)---[GND] ---- S ------( 3) V0 - P2 = Preset = 1 Kohm
|
||||
Ground (24)---[GND] | |
|
||||
Ground (25)---[GND] [GND]---[P2]---[R]---(20) LED -
|
||||
|
||||
|
||||
@@ -113,4 +113,4 @@ cause unexpected behaviour and can be a security hazard.
|
||||
There is a web page about binfmt_misc at
|
||||
http://www.tat.physik.uni-tuebingen.de/~rguenth/linux/binfmt_misc.html
|
||||
|
||||
Richard Günther <rguenth@tat.physik.uni-tuebingen.de>
|
||||
Richard Günther <rguenth@tat.physik.uni-tuebingen.de>
|
||||
|
||||
@@ -6,10 +6,10 @@ Intro
|
||||
-----
|
||||
|
||||
With the introduction of cfq v3 (aka cfq-ts or time sliced cfq), basic io
|
||||
priorities is supported for reads on files. This enables users to io nice
|
||||
processes or process groups, similar to what has been possible to cpu
|
||||
scheduling for ages. This document mainly details the current possibilites
|
||||
with cfq, other io schedulers do not support io priorities so far.
|
||||
priorities are supported for reads on files. This enables users to io nice
|
||||
processes or process groups, similar to what has been possible with cpu
|
||||
scheduling for ages. This document mainly details the current possibilities
|
||||
with cfq; other io schedulers do not support io priorities thus far.
|
||||
|
||||
Scheduling classes
|
||||
------------------
|
||||
|
||||
@@ -17,7 +17,7 @@ Contents
|
||||
|
||||
1. Introduction
|
||||
|
||||
cpufreq-stats is a driver that provices CPU frequency statistics for each CPU.
|
||||
cpufreq-stats is a driver that provides CPU frequency statistics for each CPU.
|
||||
These statistics are provided in /sysfs as a bunch of read_only interfaces. This
|
||||
interface (when configured) will appear in a separate directory under cpufreq
|
||||
in /sysfs (<sysfs root>/devices/system/cpu/cpuX/cpufreq/stats/) for each CPU.
|
||||
|
||||
@@ -177,7 +177,7 @@ Portions of this API were derived from the following projects:
|
||||
and;
|
||||
|
||||
Nettle (http://www.lysator.liu.se/~nisse/nettle/)
|
||||
Niels Möller
|
||||
Niels Möller
|
||||
|
||||
Original developers of the crypto algorithms:
|
||||
|
||||
@@ -200,8 +200,8 @@ SHA1 algorithm contributors:
|
||||
|
||||
DES algorithm contributors:
|
||||
Raimar Falke
|
||||
Gisle Sælensminde
|
||||
Niels Möller
|
||||
Gisle Sælensminde
|
||||
Niels Möller
|
||||
|
||||
Blowfish algorithm contributors:
|
||||
Herbert Valerio Riedel
|
||||
|
||||
@@ -16,7 +16,7 @@ host bridges to peripheral buses, and most controllers integrated
|
||||
into system-on-chip platforms. What they usually have in common
|
||||
is direct addressing from a CPU bus. Rarely, a platform_device will
|
||||
be connected through a segment of some other kind of bus; but its
|
||||
registers will still be directly addressible.
|
||||
registers will still be directly addressable.
|
||||
|
||||
Platform devices are given a name, used in driver binding, and a
|
||||
list of resources such as addresses and IRQs.
|
||||
@@ -125,7 +125,7 @@ three different ways to find such a match:
|
||||
usually register later during booting, or by module loading.
|
||||
|
||||
- Registering a driver using platform_driver_probe() works just like
|
||||
using platform_driver_register(), except that the the driver won't
|
||||
using platform_driver_register(), except that the driver won't
|
||||
be probed later if another device registers. (Which is OK, since
|
||||
this interface is only for use with non-hotpluggable devices.)
|
||||
|
||||
|
||||
@@ -228,5 +228,5 @@ Patches, comments and suggestions are very very welcome.
|
||||
|
||||
Ulf Hermenau for helping me out with traditional chinese.
|
||||
|
||||
André Smoktun and Christian Frömmel for supporting me with
|
||||
André Smoktun and Christian Frömmel for supporting me with
|
||||
hardware and listening to my problems very patiently.
|
||||
|
||||
@@ -66,7 +66,7 @@ Michael Dreher <michael@5dot1.de>
|
||||
Andreas 'randy' Weinberger
|
||||
for the support of the Fujitsu-Siemens Activy budget DVB-S
|
||||
|
||||
Kenneth Aafløy <ke-aa@frisurf.no>
|
||||
Kenneth Aafløy <ke-aa@frisurf.no>
|
||||
for adding support for Typhoon DVB-S budget card
|
||||
|
||||
Ernst Peinlich <e.peinlich@inode.at>
|
||||
|
||||
@@ -54,8 +54,8 @@ Accepted options:
|
||||
|
||||
noaccel - do not use acceleration engine. It is default.
|
||||
accel - use acceleration engine. Not finished.
|
||||
vmode:x - chooses PowerMacintosh video mode <x>. Depreciated.
|
||||
cmode:x - chooses PowerMacintosh colour mode <x>. Depreciated.
|
||||
vmode:x - chooses PowerMacintosh video mode <x>. Deprecated.
|
||||
cmode:x - chooses PowerMacintosh colour mode <x>. Deprecated.
|
||||
<XxX@X> - selects startup videomode. See modedb.txt for detailed
|
||||
explanation. Default is 640x480x8bpp.
|
||||
|
||||
|
||||
@@ -215,11 +215,11 @@ vertical retrace time is the sum of the upper margin, the lower margin and the
|
||||
vsync length.
|
||||
|
||||
+----------+---------------------------------------------+----------+-------+
|
||||
| | ^ | | |
|
||||
| | ↑ | | |
|
||||
| | |upper_margin | | |
|
||||
| | ¥ | | |
|
||||
| | ↓ | | |
|
||||
+----------###############################################----------+-------+
|
||||
| # ^ # | |
|
||||
| # ↑ # | |
|
||||
| # | # | |
|
||||
| # | # | |
|
||||
| # | # | |
|
||||
@@ -238,15 +238,15 @@ vsync length.
|
||||
| # | # | |
|
||||
| # | # | |
|
||||
| # | # | |
|
||||
| # ¥ # | |
|
||||
| # ↓ # | |
|
||||
+----------###############################################----------+-------+
|
||||
| | ^ | | |
|
||||
| | ↑ | | |
|
||||
| | |lower_margin | | |
|
||||
| | ¥ | | |
|
||||
| | ↓ | | |
|
||||
+----------+---------------------------------------------+----------+-------+
|
||||
| | ^ | | |
|
||||
| | ↑ | | |
|
||||
| | |vsync_len | | |
|
||||
| | ¥ | | |
|
||||
| | ↓ | | |
|
||||
+----------+---------------------------------------------+----------+-------+
|
||||
|
||||
The frame buffer device expects all horizontal timings in number of dotclocks
|
||||
|
||||
@@ -17,7 +17,7 @@ How to use it?
|
||||
==============
|
||||
|
||||
Imacfb does not have any kind of autodetection of your machine.
|
||||
You have to add the fillowing kernel parameters in your elilo.conf:
|
||||
You have to add the following kernel parameters in your elilo.conf:
|
||||
Macbook :
|
||||
video=imacfb:macbook
|
||||
MacMini :
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
Introduction
|
||||
|
||||
This is a frame buffer device driver for 3dfx' Voodoo Graphics
|
||||
(aka voodoo 1, aka sst1) and Voodoo² (aka Voodoo 2, aka CVG) based
|
||||
(aka voodoo 1, aka sst1) and Voodoo² (aka Voodoo 2, aka CVG) based
|
||||
video boards. It's highly experimental code, but is guaranteed to work
|
||||
on my computer, with my "Maxi Gamer 3D" and "Maxi Gamer 3d²" boards,
|
||||
on my computer, with my "Maxi Gamer 3D" and "Maxi Gamer 3d²" boards,
|
||||
and with me "between chair and keyboard". Some people tested other
|
||||
combinations and it seems that it works.
|
||||
The main page is located at <http://sstfb.sourceforge.net>, and if
|
||||
|
||||
@@ -54,7 +54,7 @@ ata *);
|
||||
|
||||
locking rules:
|
||||
all may block, none have BKL
|
||||
i_sem(inode)
|
||||
i_mutex(inode)
|
||||
lookup: yes
|
||||
create: yes
|
||||
link: yes (both)
|
||||
@@ -74,7 +74,7 @@ setxattr: yes
|
||||
getxattr: no
|
||||
listxattr: no
|
||||
removexattr: yes
|
||||
Additionally, ->rmdir(), ->unlink() and ->rename() have ->i_sem on
|
||||
Additionally, ->rmdir(), ->unlink() and ->rename() have ->i_mutex on
|
||||
victim.
|
||||
cross-directory ->rename() has (per-superblock) ->s_vfs_rename_sem.
|
||||
->truncate() is never called directly - it's a callback, not a
|
||||
@@ -461,7 +461,7 @@ doesn't take the BKL.
|
||||
->read on directories probably must go away - we should just enforce -EISDIR
|
||||
in sys_read() and friends.
|
||||
|
||||
->fsync() has i_sem on inode.
|
||||
->fsync() has i_mutex on inode.
|
||||
|
||||
--------------------------- dquot_operations -------------------------------
|
||||
prototypes:
|
||||
|
||||
@@ -290,7 +290,7 @@ History
|
||||
2.07 More fixes for Warp Server. Now it really works
|
||||
2.08 Creating new files is not so slow on large disks
|
||||
An attempt to sync deleted file does not generate filesystem error
|
||||
2.09 Fixed error on extremly fragmented files
|
||||
2.09 Fixed error on extremely fragmented files
|
||||
|
||||
|
||||
vim: set textwidth=80:
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user