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 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 ...
This commit is contained in:
Linus Torvalds
@@ -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
|
||||
|
||||
@@ -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):
|
||||
|
||||
|
||||
|
||||
+9
-9
@@ -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
|
||||
|
||||
+2
-2
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -476,7 +476,7 @@ static void __init bootmem_init(void)
|
||||
* o bootmem_init()
|
||||
* o sparse_init()
|
||||
* o paging_init()
|
||||
* o dma_continguous_reserve()
|
||||
* o dma_contiguous_reserve()
|
||||
*
|
||||
* At this stage the bootmem allocator is ready to use.
|
||||
*
|
||||
|
||||
@@ -902,7 +902,7 @@ int kvmppc_core_check_processor_compat(void)
|
||||
{
|
||||
/*
|
||||
* We always return 0 for book3s. We check
|
||||
* for compatability while loading the HV
|
||||
* for compatibility while loading the HV
|
||||
* or PR module
|
||||
*/
|
||||
return 0;
|
||||
|
||||
@@ -1113,7 +1113,7 @@ static int fsl_pci_pme_probe(struct pci_controller *hose)
|
||||
IRQF_SHARED,
|
||||
"[PCI] PME", hose);
|
||||
if (res < 0) {
|
||||
dev_err(&dev->dev, "Unable to requiest irq %d for PME\n", pme_irq);
|
||||
dev_err(&dev->dev, "Unable to request irq %d for PME\n", pme_irq);
|
||||
irq_dispose_mapping(pme_irq);
|
||||
|
||||
return -ENODEV;
|
||||
|
||||
@@ -88,7 +88,7 @@
|
||||
#define VERS_MAXTL _AC(0x000000000000ff00,UL) /* Max Trap Level. */
|
||||
#define VERS_MAXWIN _AC(0x000000000000001f,UL) /* Max RegWindow Idx.*/
|
||||
|
||||
/* Compatability Feature Register (%asr26), SPARC-T4 and later */
|
||||
/* Compatibility Feature Register (%asr26), SPARC-T4 and later */
|
||||
#define CFR_AES _AC(0x0000000000000001,UL) /* Supports AES opcodes */
|
||||
#define CFR_DES _AC(0x0000000000000002,UL) /* Supports DES opcodes */
|
||||
#define CFR_KASUMI _AC(0x0000000000000004,UL) /* Supports KASUMI opcodes */
|
||||
|
||||
@@ -68,7 +68,7 @@ static int acpi_gpiochip_find(struct gpio_chip *gc, void *data)
|
||||
* GPIO controller driver.
|
||||
*
|
||||
* Typically the returned offset is same as @pin, but if the GPIO
|
||||
* controller uses pin controller and the mapping is not contigous the
|
||||
* controller uses pin controller and the mapping is not contiguous the
|
||||
* offset might be different.
|
||||
*/
|
||||
static int acpi_gpiochip_pin_to_gpio_offset(struct gpio_chip *chip, int pin)
|
||||
|
||||
@@ -750,7 +750,7 @@ crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *old_state)
|
||||
* This function shuts down all the outputs that need to be shut down and
|
||||
* prepares them (if required) with the new mode.
|
||||
*
|
||||
* For compatability with legacy crtc helpers this should be called before
|
||||
* For compatibility with legacy crtc helpers this should be called before
|
||||
* drm_atomic_helper_commit_planes(), which is what the default commit function
|
||||
* does. But drivers with different needs can group the modeset commits together
|
||||
* and do the plane commits at the end. This is useful for drivers doing runtime
|
||||
@@ -775,7 +775,7 @@ EXPORT_SYMBOL(drm_atomic_helper_commit_modeset_disables);
|
||||
* This function enables all the outputs with the new configuration which had to
|
||||
* be turned off for the update.
|
||||
*
|
||||
* For compatability with legacy crtc helpers this should be called after
|
||||
* For compatibility with legacy crtc helpers this should be called after
|
||||
* drm_atomic_helper_commit_planes(), which is what the default commit function
|
||||
* does. But drivers with different needs can group the modeset commits together
|
||||
* and do the plane commits at the end. This is useful for drivers doing runtime
|
||||
|
||||
@@ -845,7 +845,7 @@ nv10_gr_ctx_regs_find_offset(struct nv10_gr_priv *priv, int reg)
|
||||
if (nv10_gr_ctx_regs[i] == reg)
|
||||
return i;
|
||||
}
|
||||
nv_error(priv, "unknow offset nv10_ctx_regs %d\n", reg);
|
||||
nv_error(priv, "unknown offset nv10_ctx_regs %d\n", reg);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -857,7 +857,7 @@ nv17_gr_ctx_regs_find_offset(struct nv10_gr_priv *priv, int reg)
|
||||
if (nv17_gr_ctx_regs[i] == reg)
|
||||
return i;
|
||||
}
|
||||
nv_error(priv, "unknow offset nv17_ctx_regs %d\n", reg);
|
||||
nv_error(priv, "unknown offset nv17_ctx_regs %d\n", reg);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
@@ -260,7 +260,7 @@ via_lock_all_dma_pages(drm_via_sg_info_t *vsg, drm_via_dmablit_t *xfer)
|
||||
/*
|
||||
* Allocate DMA capable memory for the blit descriptor chain, and an array that keeps track of the
|
||||
* pages we allocate. We don't want to use kmalloc for the descriptor chain because it may be
|
||||
* quite large for some blits, and pages don't need to be contingous.
|
||||
* quite large for some blits, and pages don't need to be contiguous.
|
||||
*/
|
||||
|
||||
static int
|
||||
|
||||
@@ -227,7 +227,7 @@ enum vmw_dma_map_mode {
|
||||
* device-specific information.
|
||||
*
|
||||
* @sgt: Pointer to a struct sg_table with binding information
|
||||
* @num_regions: Number of regions with device-address contigous pages
|
||||
* @num_regions: Number of regions with device-address contiguous pages
|
||||
*/
|
||||
struct vmw_sg_table {
|
||||
enum vmw_dma_map_mode mode;
|
||||
|
||||
@@ -216,7 +216,7 @@ static int ili210x_i2c_probe(struct i2c_client *client,
|
||||
/* get panel info */
|
||||
error = ili210x_read_reg(client, REG_PANEL_INFO, &panel, sizeof(panel));
|
||||
if (error) {
|
||||
dev_err(dev, "Failed to get panel informations, err: %d\n",
|
||||
dev_err(dev, "Failed to get panel information, err: %d\n",
|
||||
error);
|
||||
return error;
|
||||
}
|
||||
@@ -276,7 +276,7 @@ static int ili210x_i2c_probe(struct i2c_client *client,
|
||||
|
||||
error = input_register_device(priv->input);
|
||||
if (error) {
|
||||
dev_err(dev, "Cannot regiser input device, err: %d\n", error);
|
||||
dev_err(dev, "Cannot register input device, err: %d\n", error);
|
||||
goto err_remove_sysfs;
|
||||
}
|
||||
|
||||
|
||||
@@ -506,7 +506,7 @@ dsp_cmx_hardware(struct dsp_conf *conf, struct dsp *dsp)
|
||||
__func__, conf->id);
|
||||
|
||||
if (list_empty(&conf->mlist)) {
|
||||
printk(KERN_ERR "%s: conference whithout members\n",
|
||||
printk(KERN_ERR "%s: conference without members\n",
|
||||
__func__);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -96,7 +96,7 @@ static int mhu_startup(struct mbox_chan *chan)
|
||||
IRQF_SHARED, "mhu_link", chan);
|
||||
if (ret) {
|
||||
dev_err(chan->mbox->dev,
|
||||
"Unable to aquire IRQ %d\n", mlink->irq);
|
||||
"Unable to acquire IRQ %d\n", mlink->irq);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -478,7 +478,7 @@ config DM_LOG_WRITES
|
||||
This device-mapper target takes two devices, one device to use
|
||||
normally, one to log all write operations done to the first device.
|
||||
This is for use by file system developers wishing to verify that
|
||||
their fs is writing a consitent file system at all times by allowing
|
||||
their fs is writing a consistent file system at all times by allowing
|
||||
them to replay the log in a variety of ways and to check the
|
||||
contents.
|
||||
|
||||
|
||||
@@ -922,7 +922,7 @@ module_param(debug, int, 0644);
|
||||
MODULE_PARM_DESC(debug, "Enable verbose debug messages");
|
||||
|
||||
module_param(zv_mode, int, 0644);
|
||||
MODULE_PARM_DESC(zv_mode, "Turn on/off ZeeVee modulator compatability mode (default:on).\n"
|
||||
MODULE_PARM_DESC(zv_mode, "Turn on/off ZeeVee modulator compatibility mode (default:on).\n"
|
||||
"\t\ton - modified AU8522 QAM256 initialization.\n"
|
||||
"\t\tProvides faster lock when using ZeeVee modulator based sources");
|
||||
|
||||
|
||||
@@ -188,7 +188,7 @@ static int fimc_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
|
||||
if (IS_ERR(f))
|
||||
return PTR_ERR(f);
|
||||
/*
|
||||
* Return number of non-contigous planes (plane buffers)
|
||||
* Return number of non-contiguous planes (plane buffers)
|
||||
* depending on the configured color format.
|
||||
*/
|
||||
if (!f->fmt)
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user