| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 12 Jan 2011 09:49:34 +0100 (CET)
From: Jiri Kosina <jkosina@...e.cz>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: linux-kernel@...r.kernel.org
Subject: [GIT] trivial
Linus,
please pull from 'for-next' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-next
to receive updates queued in trivial tree. Nothing earth-shaking, as usual
with this tree -- some comment typo updates, very simple fixes all over
the tree.
You are going to receive one conflict in
drivers/net/wireless/iwlwifi/iwl-core.c -- this is caused by conflict
between 81baf6ec ("iwlwifi: Legacy isr only used by legacy devices") from
the net tree and commit 62e45c14 ("wireless: comment typo fix diable ->
disable") from the trivial tree.
This is because the code got moved around to
iwl-legacy.c from iwl-core.c, but the typo is still there. The resolution
is therefore trivial (attached).
Thanks.
Alan Stern (1):
SCSI: improve two error messages
Andrea Gelmini (1):
drivers: scsi: fix typo in comment
David Sterba (1):
i7core_edac: fix typos in comments
Figo.zhang (1):
mm/rmap.c: fix comment
Jesper Juhl (6):
VIA Chrome camera: remove duplicate includes
ARM, mm: Don't include smp_plat.h twice in flush.c
infiniband: Only include mutex.h once in drivers/infiniband/hw/cxgb4/iw_cxgb4.h
Kill off a bunch of warning: ‘inline’ is not at beginning of declaration
coda: kill redundant cast in coda_alloc_inode()
sound, ca0106: Fix assignment to 'channel'.
Jim Cromie (3):
init/Kconfig: fix typo
remove extraneous 'is' from Documentation/iostats.txt
remove doc for obsolete dynamic-printk kernel-parameter
Jiri Kosina (4):
Merge branch 'master' into for-next
Don't touch blackfin with printk typo fixes
Merge branch 'master' into for-next
Revert conflicting V4L changes
Jonathan Neuschäfer (1):
spelling fix in drivers/misc/Kconfig
Justin P. Mattock (5):
media: comment typo fix diable -> disable.
wireless: comment typo fix diable -> disable.
m68k: fix comment typo diable -> disable.
drivers: fix comment typo diable -> disable.
ppc: fix comment typo singal -> signal
Lionel Debroux (3):
hibernation: constify platform_hibernation_ops
backlight: constify backlight_ops
suspend: constify platform_suspend_ops
Michael Witten (4):
Kconfig: typo: and -> an
Docs: typo: Complete -> Completely
Kconfig: typo: boad -> board
Docs/Kconfig: Update: osdl.org -> linuxfoundation.org
Minchan Kim (1):
writeback: fix global_dirty_limits comment runtime -> real-time
Namhyung Kim (3):
poll: fix a typo in comment
anon_inodes: fix wrong function name in comment
hrtimer: fix a typo in comment
Nicolas Kaiser (1):
telephony: fix return value
Robert P. J. Day (1):
Fix "forcably" comment typo
Ross Kirk (1):
audit: error message typo correction
Simon Horman (1):
kdump: update kexec-tools URL and Vivek's email
Stefan Weil (2):
Fix spelling mistakes in comments
Fix spelling milisec -> ms in snd_ps3 module parameter description
Tao Ma (1):
Documentation/trace/events.txt: Remove obsolete sched_signal_send.
Uwe Kleine-König (2):
tree-wide: fix comment/printk typos
fix comment typos concerning "consistent"
Wu Fengguang (1):
ext4: fix redirty_page_for_writepage() typo in comment
matt mooney (1):
powerpc: remove cast from void*
Documentation/DocBook/mtdnand.tmpl | 2 +-
Documentation/cgroups/cgroup_event_listener.c | 2 +-
Documentation/cgroups/memcg_test.txt | 2 +-
Documentation/iostats.txt | 2 +-
Documentation/kdump/kdump.txt | 15 +++++++++------
Documentation/kernel-parameters.txt | 5 -----
Documentation/ko_KR/HOWTO | 4 ++--
Documentation/kprobes.txt | 2 +-
Documentation/kvm/api.txt | 2 +-
Documentation/lguest/lguest.txt | 7 +++++--
Documentation/networking/bridge.txt | 4 ++--
Documentation/networking/caif/spi_porting.txt | 2 +-
Documentation/networking/dccp.txt | 4 ++--
Documentation/networking/generic_netlink.txt | 2 +-
Documentation/powerpc/booting-without-of.txt | 2 +-
Documentation/scheduler/00-INDEX | 2 +-
Documentation/scsi/ChangeLog.lpfc | 2 +-
Documentation/timers/timer_stats.txt | 2 +-
Documentation/trace/events.txt | 8 ++++----
Documentation/zh_CN/HOWTO | 4 ++--
Documentation/zh_CN/SubmittingDrivers | 2 +-
MAINTAINERS | 10 +++++-----
arch/arm/common/it8152.c | 2 +-
arch/arm/common/vic.c | 2 +-
arch/arm/mach-at91/board-ecbat91.c | 6 +++---
arch/arm/mach-at91/pm.c | 2 +-
arch/arm/mach-bcmring/csp/chipc/chipcHw.c | 2 +-
arch/arm/mach-bcmring/csp/dmac/dmacHw.c | 2 +-
arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c | 2 +-
arch/arm/mach-bcmring/csp/tmr/tmrHw.c | 2 +-
arch/arm/mach-bcmring/dma.c | 2 +-
arch/arm/mach-bcmring/include/csp/dmacHw.h | 2 +-
arch/arm/mach-bcmring/include/csp/tmrHw.h | 4 ++--
.../mach-bcmring/include/mach/csp/dmacHw_priv.h | 2 +-
.../arm/mach-bcmring/include/mach/csp/dmacHw_reg.h | 2 +-
arch/arm/mach-davinci/pm.c | 2 +-
arch/arm/mach-gemini/include/mach/hardware.h | 2 +-
arch/arm/mach-imx/pm-imx27.c | 2 +-
arch/arm/mach-lpc32xx/pm.c | 2 +-
arch/arm/mach-msm/include/mach/entry-macro-qgic.S | 2 +-
arch/arm/mach-msm/io.c | 2 +-
arch/arm/mach-omap1/pm.c | 2 +-
arch/arm/mach-omap2/cpuidle34xx.c | 2 +-
arch/arm/mach-omap2/pm24xx.c | 2 +-
arch/arm/mach-omap2/pm34xx.c | 2 +-
arch/arm/mach-omap2/pm44xx.c | 2 +-
arch/arm/mach-omap2/serial.c | 2 +-
arch/arm/mach-pnx4008/pm.c | 2 +-
arch/arm/mach-pxa/mxm8x10.c | 2 +-
arch/arm/mach-pxa/pm.c | 2 +-
arch/arm/mach-pxa/sharpsl_pm.c | 2 +-
arch/arm/mach-s3c64xx/dma.c | 2 +-
arch/arm/mach-sa1100/pm.c | 2 +-
arch/arm/mach-spear3xx/spear300.c | 4 ++--
arch/arm/mach-spear3xx/spear310.c | 2 +-
arch/arm/mach-spear3xx/spear320.c | 2 +-
arch/arm/mach-spear3xx/spear3xx.c | 6 +++---
arch/arm/mach-spear6xx/spear6xx.c | 4 ++--
arch/arm/mach-u300/Kconfig | 2 +-
arch/arm/mach-u300/include/mach/coh901318.h | 4 ++--
arch/arm/mm/flush.c | 1 -
arch/arm/plat-mxc/include/mach/irqs.h | 2 +-
arch/arm/plat-omap/include/plat/omap_hwmod.h | 2 +-
arch/arm/plat-samsung/pm.c | 2 +-
arch/avr32/mach-at32ap/pm.c | 2 +-
arch/blackfin/mach-bf537/include/mach/defBF534.h | 2 +-
arch/blackfin/mach-common/pm.c | 2 +-
arch/cris/arch-v32/lib/nand_init.S | 2 +-
arch/cris/include/asm/etraxgpio.h | 2 +-
arch/h8300/Kconfig.debug | 2 +-
arch/ia64/kvm/mmio.c | 2 +-
arch/m68k/ifpsp060/src/fpsp.S | 2 +-
arch/m68k/mac/psc.c | 2 +-
arch/mips/alchemy/common/power.c | 2 +-
arch/mips/alchemy/devboards/pm.c | 2 +-
arch/mips/include/asm/mach-powertv/ioremap.h | 2 +-
arch/mips/jz4740/board-qi_lb60.c | 4 ++--
arch/mips/jz4740/gpio.c | 2 +-
arch/mips/jz4740/pm.c | 2 +-
arch/mips/loongson/common/pm.c | 2 +-
arch/mips/mti-malta/malta-memory.c | 2 +-
arch/mips/pci/pcie-octeon.c | 2 +-
arch/mips/powertv/memory.c | 2 +-
arch/mips/txx9/generic/pci.c | 2 +-
arch/powerpc/include/asm/8xx_immap.h | 4 ++--
arch/powerpc/oprofile/op_model_cell.c | 2 +-
arch/powerpc/platforms/52xx/lite5200_pm.c | 2 +-
arch/powerpc/platforms/52xx/mpc52xx_pm.c | 2 +-
arch/powerpc/platforms/83xx/suspend-asm.S | 6 +++---
arch/powerpc/platforms/83xx/suspend.c | 2 +-
arch/powerpc/platforms/85xx/mpc85xx_mds.c | 2 +-
arch/powerpc/platforms/ps3/device-init.c | 4 ++--
arch/powerpc/platforms/ps3/interrupt.c | 2 +-
arch/powerpc/platforms/pseries/hvCall_inst.c | 2 +-
arch/powerpc/platforms/pseries/suspend.c | 2 +-
arch/powerpc/sysdev/fsl_pmc.c | 2 +-
arch/sh/boards/mach-hp6xx/pm.c | 2 +-
arch/sh/kernel/cpu/shmobile/pm.c | 2 +-
arch/sh/mm/cache-sh5.c | 2 +-
arch/sparc/kernel/traps_64.c | 2 +-
arch/x86/include/asm/pgalloc.h | 2 +-
arch/x86/include/asm/processor.h | 2 +-
arch/x86/kernel/amd_iommu.c | 4 ++--
arch/x86/kernel/early_printk_mrst.c | 2 +-
arch/x86/kernel/head_32.S | 2 +-
block/cfq-iosched.c | 2 +-
drivers/acpi/acpica/acobject.h | 2 +-
drivers/acpi/apei/einj.c | 2 +-
drivers/acpi/apei/erst.c | 2 +-
drivers/acpi/sleep.c | 8 ++++----
drivers/acpi/video.c | 2 +-
drivers/ata/libata-core.c | 4 ++--
drivers/ata/sata_vsc.c | 2 +-
drivers/atm/idt77252.h | 2 +-
drivers/atm/iphase.c | 4 ++--
drivers/base/bus.c | 2 +-
drivers/base/power/main.c | 2 +-
drivers/dma/intel_mid_dma.c | 6 +++---
drivers/edac/amd8131_edac.h | 2 +-
drivers/edac/cell_edac.c | 4 ++--
drivers/edac/edac_core.h | 2 +-
drivers/edac/i7core_edac.c | 6 +++---
drivers/edac/ppc4xx_edac.c | 6 +++---
drivers/gpu/drm/nouveau/nouveau_backlight.c | 4 ++--
drivers/gpu/drm/nouveau/nouveau_bios.c | 4 ++--
drivers/gpu/drm/radeon/atombios.h | 2 +-
drivers/i2c/busses/i2c-nomadik.c | 4 ++--
drivers/infiniband/hw/cxgb3/cxio_wr.h | 2 +-
drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 1 -
drivers/infiniband/hw/qib/qib_iba7322.c | 2 +-
drivers/input/serio/Kconfig | 2 +-
drivers/input/touchscreen/Kconfig | 2 +-
drivers/isdn/gigaset/bas-gigaset.c | 4 ++--
drivers/isdn/gigaset/ser-gigaset.c | 4 ++--
drivers/isdn/gigaset/usb-gigaset.c | 4 ++--
drivers/isdn/hardware/mISDN/ipac.h | 4 ++--
drivers/isdn/hardware/mISDN/isar.h | 2 +-
drivers/isdn/mISDN/dsp_cmx.c | 2 +-
drivers/macintosh/via-pmu-backlight.c | 4 ++--
drivers/macintosh/via-pmu.c | 2 +-
drivers/media/video/cx18/cx23418.h | 2 +-
drivers/media/video/cx25840/cx25840-ir.c | 2 +-
drivers/media/video/davinci/vpif.h | 2 +-
drivers/media/video/davinci/vpss.c | 2 +-
drivers/media/video/omap/omap_vout.c | 2 +-
drivers/media/video/saa7164/saa7164-core.c | 4 ++--
drivers/media/video/sn9c102/sn9c102_sensor.h | 2 +-
drivers/media/video/tvp7002.c | 2 +-
drivers/media/video/via-camera.c | 2 --
drivers/message/fusion/lsi/mpi_log_sas.h | 2 +-
drivers/message/fusion/mptbase.c | 2 +-
drivers/message/fusion/mptsas.c | 2 +-
drivers/message/i2o/i2o_block.c | 2 +-
drivers/misc/Kconfig | 2 +-
drivers/misc/arm-charlcd.c | 2 +-
drivers/mmc/card/block.c | 2 +-
drivers/mmc/host/Kconfig | 2 +-
drivers/mmc/host/au1xmmc.c | 2 +-
drivers/mmc/host/sdricoh_cs.c | 4 ++--
drivers/mtd/nand/nand_base.c | 2 +-
drivers/net/bnx2x/bnx2x_main.c | 2 +-
drivers/net/bnx2x/bnx2x_reg.h | 2 +-
drivers/net/bonding/bond_3ad.c | 6 +++---
drivers/net/chelsio/subr.c | 2 +-
drivers/net/cxgb3/mc5.c | 2 +-
drivers/net/cxgb3/t3_hw.c | 2 +-
drivers/net/e1000/e1000_hw.h | 2 +-
drivers/net/e1000/e1000_main.c | 2 +-
drivers/net/e1000e/82571.c | 2 +-
drivers/net/e1000e/ich8lan.c | 2 +-
drivers/net/e1000e/phy.c | 2 +-
drivers/net/eepro.c | 2 +-
drivers/net/irda/donauboe.h | 2 +-
drivers/net/ixgbe/ixgbe_82599.c | 4 ++--
drivers/net/ll_temac_main.c | 2 +-
drivers/net/sis900.c | 2 +-
drivers/net/tehuti.c | 6 +++---
drivers/net/tun.c | 2 +-
drivers/net/via-velocity.c | 2 +-
drivers/net/vxge/vxge-traffic.h | 2 +-
drivers/net/wan/dscc4.c | 2 +-
drivers/net/wimax/i2400m/driver.c | 2 +-
drivers/net/wimax/i2400m/i2400m.h | 4 ++--
drivers/net/wireless/ath/ath5k/reg.h | 6 +++---
drivers/net/wireless/b43/phy_g.c | 2 +-
drivers/net/wireless/b43legacy/phy.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-agn.c | 4 ++--
drivers/net/wireless/iwlwifi/iwl-core.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-sta.c | 2 +-
drivers/net/wireless/prism54/islpci_dev.c | 6 +++---
drivers/net/wireless/prism54/islpci_eth.c | 2 +-
drivers/net/wireless/rt2x00/rt2x00mac.c | 2 +-
drivers/net/wireless/wl1251/acx.h | 4 ++--
drivers/net/wireless/wl1251/wl1251.h | 2 +-
drivers/net/wireless/wl12xx/wl1271.h | 4 ++--
drivers/net/wireless/wl12xx/wl1271_acx.h | 4 ++--
drivers/net/wireless/wl3501_cs.c | 2 +-
drivers/pcmcia/m32r_cfc.h | 2 +-
drivers/pcmcia/m32r_pcc.h | 2 +-
drivers/pcmcia/m8xx_pcmcia.c | 2 +-
drivers/platform/x86/acer-wmi.c | 2 +-
drivers/platform/x86/asus-laptop.c | 2 +-
drivers/platform/x86/asus_acpi.c | 2 +-
drivers/platform/x86/dell-laptop.c | 2 +-
drivers/platform/x86/eeepc-laptop.c | 2 +-
drivers/platform/x86/fujitsu-laptop.c | 2 +-
drivers/platform/x86/sony-laptop.c | 2 +-
drivers/platform/x86/thinkpad_acpi.c | 4 ++--
drivers/platform/x86/toshiba_acpi.c | 2 +-
drivers/power/s3c_adc_battery.c | 4 ++--
drivers/s390/net/lcs.c | 2 +-
drivers/s390/scsi/zfcp_cfdc.c | 2 +-
drivers/scsi/a100u2w.c | 2 +-
drivers/scsi/aacraid/commsup.c | 2 +-
drivers/scsi/aic7xxx_old/aic7xxx.seq | 2 +-
drivers/scsi/aic94xx/aic94xx_reg_def.h | 4 ++--
drivers/scsi/aic94xx/aic94xx_scb.c | 2 +-
drivers/scsi/aic94xx/aic94xx_seq.c | 6 +++---
drivers/scsi/bfa/bfa_fcpim.c | 2 +-
drivers/scsi/bfa/bfa_fcs_lport.c | 2 +-
drivers/scsi/dc395x.c | 8 ++++----
drivers/scsi/libfc/fc_fcp.c | 2 +-
drivers/scsi/lpfc/lpfc_attr.c | 2 +-
drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +-
drivers/scsi/lpfc/lpfc_init.c | 2 +-
drivers/scsi/lpfc/lpfc_sli.c | 2 +-
drivers/scsi/megaraid.h | 2 +-
drivers/scsi/megaraid/megaraid_mm.c | 2 +-
drivers/scsi/pm8001/pm8001_init.c | 2 +-
drivers/scsi/scsi_netlink.c | 2 +-
drivers/scsi/scsi_sysfs.c | 6 ++++--
drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +-
drivers/spi/atmel_spi.c | 4 ++--
drivers/spi/spidev.c | 2 +-
drivers/staging/msm/msm_fb_bl.c | 2 +-
drivers/staging/olpc_dcon/olpc_dcon.c | 2 +-
drivers/staging/samsung-laptop/samsung-laptop.c | 2 +-
drivers/telephony/ixj.c | 3 ++-
drivers/usb/gadget/imx_udc.c | 2 +-
drivers/usb/gadget/langwell_udc.c | 4 ++--
drivers/usb/host/fhci-hcd.c | 4 ++--
drivers/usb/host/fhci-tds.c | 4 ++--
drivers/usb/host/imx21-hcd.c | 2 +-
drivers/usb/host/oxu210hp-hcd.c | 2 +-
drivers/usb/misc/adutux.c | 2 +-
drivers/usb/misc/iowarrior.c | 2 +-
drivers/usb/misc/ldusb.c | 2 +-
drivers/usb/musb/musb_gadget.c | 4 ++--
drivers/usb/wusbcore/wa-rpipe.c | 2 +-
drivers/video/atmel_lcdfb.c | 2 +-
drivers/video/aty/aty128fb.c | 2 +-
drivers/video/aty/atyfb_base.c | 2 +-
drivers/video/aty/radeon_backlight.c | 2 +-
drivers/video/backlight/88pm860x_bl.c | 2 +-
drivers/video/backlight/max8925_bl.c | 2 +-
drivers/video/nvidia/nv_backlight.c | 2 +-
drivers/video/omap2/displays/panel-taal.c | 2 +-
drivers/video/riva/fbdev.c | 2 +-
drivers/video/sstfb.c | 2 +-
fs/anon_inodes.c | 6 +++---
fs/coda/inode.c | 2 +-
fs/ext4/ext4.h | 2 +-
fs/ext4/extents.c | 4 ++--
fs/ext4/inode.c | 6 +++---
fs/jbd/transaction.c | 2 +-
fs/jbd2/transaction.c | 2 +-
fs/notify/fanotify/Kconfig | 2 +-
fs/ocfs2/inode.c | 2 +-
fs/ocfs2/suballoc.c | 2 +-
fs/xfs/linux-2.6/xfs_super.c | 2 +-
include/acpi/actbl1.h | 2 +-
include/linux/cgroup.h | 2 +-
include/linux/firewire-cdev.h | 2 +-
include/linux/mfd/core.h | 2 +-
include/linux/poll.h | 2 +-
include/linux/suspend.h | 8 ++++----
include/linux/u64_stats_sync.h | 12 ++++++------
include/media/davinci/vpss.h | 2 +-
include/net/sctp/user.h | 4 ++--
include/scsi/fc/fc_fcp.h | 4 ++--
init/Kconfig | 2 +-
kernel/audit.c | 2 +-
kernel/debug/kdb/kdb_main.c | 2 +-
kernel/hrtimer.c | 2 +-
kernel/kexec.c | 2 +-
kernel/perf_event.c | 2 +-
kernel/power/hibernate.c | 4 ++--
kernel/power/suspend.c | 4 ++--
kernel/power/swap.c | 2 +-
kernel/sched.c | 2 +-
kernel/sysctl_binary.c | 2 +-
kernel/time.c | 4 ++--
kernel/time/clocksource.c | 2 +-
kernel/trace/trace_entries.h | 2 +-
lib/nlattr.c | 2 +-
lib/swiotlb.c | 2 +-
mm/page-writeback.c | 2 +-
mm/page_alloc.c | 2 +-
mm/percpu.c | 2 +-
mm/rmap.c | 2 +-
mm/sparse-vmemmap.c | 2 +-
net/Kconfig | 4 +++-
net/core/dev.c | 2 +-
net/dccp/Kconfig | 4 +++-
net/decnet/dn_dev.c | 2 +-
net/ipv4/Kconfig | 4 +++-
net/ipv4/tcp_output.c | 2 +-
net/ipv6/af_inet6.c | 2 +-
net/sched/Kconfig | 2 +-
scripts/kconfig/confdata.c | 2 +-
scripts/mod/modpost.c | 2 +-
security/apparmor/include/match.h | 2 +-
sound/core/init.c | 2 +-
sound/core/pcm_native.c | 2 +-
sound/isa/opl3sa2.c | 2 +-
sound/pci/ca0106/ca0106.h | 2 +-
sound/pci/ca0106/ca0106_main.c | 2 +-
sound/pci/emu10k1/emu10k1x.c | 2 +-
sound/pci/emu10k1/p16v.h | 2 +-
sound/pci/es1968.c | 2 +-
sound/pci/rme9652/hdspm.c | 6 +++---
sound/ppc/snd_ps3.c | 2 +-
sound/soc/codecs/max98088.c | 2 +-
sound/soc/s3c24xx/smdk_spdif.c | 6 +++---
325 files changed, 439 insertions(+), 433 deletions(-)
--
Jiri Kosina
SUSE Labs, Novell Inc.
View attachment "resolution.patch" of type "TEXT/X-PATCH" (20664 bytes)
Powered by blists - more mailing lists