Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 158c1294 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 

Pull trivial tree changes from Jiri Kosina:
 "Summer edition of trivial tree updates"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits)
  doc: fix two typos in watchdog-api.txt
  irq-gic: remove file name from heading comment
  MAINTAINERS: Add miscdevice.h to file list for char/misc drivers.
  scsi: mvsas: mv_sas.c: Fix for possible null pointer dereference
  doc: replace "practise" with "practice" in Documentation
  befs: remove check for CONFIG_BEFS_RW
  scsi: doc: fix 'SCSI_NCR_SETUP_MASTER_PARITY'
  drivers/usb/phy/phy.c: remove a leading space
  mfd: fix comment
  cpuidle: fix comment
  doc: hpfall.c: fix missing null-terminate after strncpy call
  usb: doc: hotplug.txt code typos
  kbuild: fix comment in Makefile.modinst
  SH: add proper prompt to SH_MAGIC_PANEL_R2_VERSION
  ARM: msm: Remove MSM_SCM
  crypto: Remove MPILIB_EXTRA
  doc: CN: remove dead link, kerneltrap.org no longer works
  media: update reference, kerneltrap.org no longer works
  hexagon: update reference, kerneltrap.org no longer works
  doc: LSM: update reference, kerneltrap.org no longer works
  ...
parents 172bfe09 51a70974

Documentation/PCI/MSI-HOWTO.txt

+1 −1
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ Some devices are known to have faulty MSI implementations. Usually this 
is handled in the individual device driver, but occasionally it's necessary

to handle this with a quirk.  Some drivers have an option to disable use

of MSI.  While this is a convenient workaround for the driver author,

it is not good practise, and should not be emulated.

it is not good practice, and should not be emulated.



5.4. Finding why MSIs are disabled on a device

Documentation/SubmittingDrivers

+0 −4
Original line number Diff line number Diff line
@@ -146,10 +146,6 @@ LWN.net: 
	Porting drivers from prior kernels to 2.6:

		http://lwn.net/Articles/driver-porting/



KernelTrap:

	Occasional Linux kernel articles and developer interviews

	http://kerneltrap.org/



KernelNewbies:

	Documentation and assistance for new kernel programmers

	http://kernelnewbies.org/

Documentation/SubmittingPatches

+2 −2
Original line number Diff line number Diff line
@@ -396,13 +396,13 @@ you are responsible for last-minute changes. Example : 
	[lucky@maintainer.example.org: struct foo moved from foo.c to foo.h]

	Signed-off-by: Lucky K Maintainer <lucky@maintainer.example.org>



This practise is particularly helpful if you maintain a stable branch and

This practice is particularly helpful if you maintain a stable branch and

want at the same time to credit the author, track changes, merge the fix,

and protect the submitter from complaints. Note that under no circumstances

can you change the author's identity (the From header), as it is the one

which appears in the changelog.



Special note to back-porters: It seems to be a common and useful practise

Special note to back-porters: It seems to be a common and useful practice

to insert an indication of the origin of a patch at the top of the commit

message (just after the subject line) to facilitate tracking. For instance,

here's what we see in 2.6-stable :

Documentation/laptops/freefall.c

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ static int set_unload_heads_path(char *device) 
	if (strlen(device) <= 5 || strncmp(device, "/dev/", 5) != 0)

		return -EINVAL;

	strncpy(devname, device + 5, sizeof(devname) - 1);

	devname[sizeof(devname) - 1] = '\0';

	strncpy(device_path, device, sizeof(device_path) - 1);



	snprintf(unload_heads_path, sizeof(unload_heads_path) - 1,

Documentation/scsi/ncr53c8xx.txt

+1 −1
Original line number Diff line number Diff line
@@ -1095,7 +1095,7 @@ SCSI_NCR_SETUP_FORCE_SYNC_NEGO (default: not defined) 
SCSI_NCR_SETUP_MASTER_PARITY	(default: defined)

	If defined, master parity checking is enabled.



SCSI_NCR_SETUP_MASTER_PARITY	(default: defined)

SCSI_NCR_SETUP_SCSI_PARITY	(default: defined)

	If defined, SCSI parity checking is enabled.



SCSI_NCR_PROFILE_SUPPORT	(default: not defined)