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

Commit 089b6695 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull trivial tree updates from Jiri Kosina:
 "The usual stuff from trivial tree for 4.3 (kerneldoc updates, printk()
  fixes, Documentation and MAINTAINERS updates)"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (28 commits)
  MAINTAINERS: update my e-mail address
  mod_devicetable: add space before */
  scsi: a100u2w: trivial typo in printk
  i2c: Fix typo in i2c-bfin-twi.c
  treewide: fix typos in comment blocks
  Doc: fix trivial typo in SubmittingPatches
  proportions: Spelling s/consitent/consistent/
  dm: Spelling s/consitent/consistent/
  aic7xxx: Fix typo in error message
  pcmcia: Fix typo in locking documentation
  scsi/arcmsr: Fix typos in error log
  drm/nouveau/gr: Fix typo in nv10.c
  [SCSI] Fix printk typos in drivers/scsi
  staging: comedi: Grammar s/Enable support a/Enable support for a/
  Btrfs: Spelling s/consitent/consistent/
  README: GTK+ is a acronym
  ASoC: omap: Fix typo in config option description
  mm: tlb.c: Fix error message
  ntfs: super.c: Fix error log
  fix typo in Documentation/SubmittingPatches
  ...
parents 45c680b9 e5f6450c

Documentation/SubmittingPatches

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ sending him e-mail. 


If you have a patch that fixes an exploitable security bug, send that patch

to security@kernel.org.  For severe bugs, a short embargo may be considered

to allow distrbutors to get the patch out to users; in such cases,

to allow distributors to get the patch out to users; in such cases,

obviously, the patch should not be sent to any public lists.



Patches that fix a severe bug in a released kernel should be directed

Documentation/pcmcia/locking.txt

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ or single-use fields not mentioned): 
3. Per PCMCIA-device Data:

--------------------------



The "main" struct pcmcia_devie is protected as follows (read-only fields

The "main" struct pcmcia_device is protected as follows (read-only fields

or single-use fields not mentioned):

MAINTAINERS

+9 −9
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ S: Supported 
F:	drivers/input/touchscreen/ad7879.c



ADDRESS SPACE LAYOUT RANDOMIZATION (ASLR)

M:	Jiri Kosina <jkosina@suse.com>

M:	Jiri Kosina <jikos@kernel.org>

S:	Maintained



ADM1025 HARDWARE MONITOR DRIVER
@@ -752,7 +752,7 @@ S: Maintained 
F:	sound/aoa/



APM DRIVER

M:	Jiri Kosina <jkosina@suse.com>

M:	Jiri Kosina <jikos@kernel.org>

S:	Odd fixes

F:	arch/x86/kernel/apm_32.c

F:	include/linux/apm_bios.h
@@ -4264,7 +4264,7 @@ S: Maintained 
F:	drivers/block/rsxx/



FLOPPY DRIVER

M:	Jiri Kosina <jkosina@suse.com>

M:	Jiri Kosina <jikos@kernel.org>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git

S:	Odd fixes

F:	drivers/block/floppy.c
@@ -4835,7 +4835,7 @@ F: include/linux/pm.h 
F:	arch/*/include/asm/suspend*.h



HID CORE LAYER

M:	Jiri Kosina <jkosina@suse.com>

M:	Jiri Kosina <jikos@kernel.org>

L:	linux-input@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git

S:	Maintained
@@ -4844,7 +4844,7 @@ F: include/linux/hid* 
F:	include/uapi/linux/hid*



HID SENSOR HUB DRIVERS

M:	Jiri Kosina <jkosina@suse.com>

M:	Jiri Kosina <jikos@kernel.org>

M:	Jonathan Cameron <jic23@kernel.org>

M:	Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>

L:	linux-input@vger.kernel.org
@@ -5597,7 +5597,7 @@ F: include/uapi/linux/ip_vs.h 
F:	net/netfilter/ipvs/



IPWIRELESS DRIVER

M:	Jiri Kosina <jkosina@suse.com>

M:	Jiri Kosina <jikos@kernel.org>

M:	David Sterba <dsterba@suse.com>

S:	Odd Fixes

F:	drivers/tty/ipwireless/
@@ -6286,7 +6286,7 @@ F: drivers/platform/x86/hp_accel.c 
LIVE PATCHING

M:	Josh Poimboeuf <jpoimboe@redhat.com>

M:	Seth Jennings <sjenning@redhat.com>

M:	Jiri Kosina <jkosina@suse.com>

M:	Jiri Kosina <jikos@kernel.org>

M:	Vojtech Pavlik <vojtech@suse.com>

S:	Maintained

F:	kernel/livepatch/
@@ -8062,7 +8062,7 @@ S: Maintained 
F:	drivers/pinctrl/spear/



PKTCDVD DRIVER

M:	Jiri Kosina <jkosina@suse.com>

M:	Jiri Kosina <jikos@kernel.org>

S:	Maintained

F:	drivers/block/pktcdvd.c

F:	include/linux/pktcdvd.h
@@ -10668,7 +10668,7 @@ F: drivers/usb/gadget/ 
F:	include/linux/usb/gadget*



USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)

M:	Jiri Kosina <jkosina@suse.com>

M:	Jiri Kosina <jikos@kernel.org>

L:	linux-usb@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git

S:	Maintained

arch/ia64/mm/tlb.c

+2 −2
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ int ia64_itr_entry(u64 target_mask, u64 va, u64 pte, u64 log_size) 
			if (p->pte & 0x1)

				if (is_tr_overlap(p, va, log_size)) {

					printk(KERN_DEBUG "Overlapped Entry"

						"Inserted for TR Reigster!!\n");

						"Inserted for TR Register!!\n");

					goto out;

			}

		}
@@ -456,7 +456,7 @@ int ia64_itr_entry(u64 target_mask, u64 va, u64 pte, u64 log_size) 
			if (p->pte & 0x1)

				if (is_tr_overlap(p, va, log_size)) {

					printk(KERN_DEBUG "Overlapped Entry"

						"Inserted for TR Reigster!!\n");

						"Inserted for TR Register!!\n");

					goto out;

				}

		}

arch/metag/include/asm/elf.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#define R_METAG_RELBRANCH                4

#define R_METAG_GETSETOFF                5



/* Backward compatability */

/* Backward compatibility */

#define R_METAG_REG32OP1                 6

#define R_METAG_REG32OP2                 7

#define R_METAG_REG32OP3                 8