* [GIT] trivial
@ 2012-07-24 12:02 Jiri Kosina
0 siblings, 0 replies; 25+ messages in thread
From: Jiri Kosina @ 2012-07-24 12:02 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
Linus,
please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-linus
to receive trivial+doc updates. Trivial updates all over the place as
usual.
Thanks.
Akinobu Mita (1):
lib: correct link to the original source for div64_u64
Alan Cox (2):
lm8333: Fix check ordering
via: Remove bogus if check
Christopher L. Simons (1):
Documentation: ManagementStyle: fixed typo
Geert Uytterhoeven (2):
module.c: spelling s/postition/position/g
arm,unicore32: Remove obsolete "select MISC_DEVICES"
Jan-Simon Möller (1):
Fix typo in include/linux/clk.h .
Jesper Juhl (1):
Documentation: Add newline at end-of-file to files lacking one
Jiri Kosina (1):
Merge branch 'master' into for-next
Kazuo Moriwaka (1):
Doc: document max raw dev number
Krzysztof Wilczynski (1):
scsi: aha152x: Fix sparse warning and make printing pointer address more portable.
Liu Bo (2):
netprio_cgroup.c: fix comment typo
Btrfs: fix typo in convert_extent_bit
Martlin Ettl (1):
backlight: fix memory leak on obscure error path
Masanari Iida (5):
mach-omap2: Fix typo in debug message and comment
cpufreq: Fix typo in cpufreq driver
video: Fix typo in drivers/video
iommu: Fix typo in iommu
pci: hotplug: Fix typo in pci
Masatake YAMATO (1):
trivial: typo in comment in mksysmap
Paul Bolle (4):
renesas_usbhs: cleanup quoted includes
parisc: cleanup quoted include
treewide: Put a space between #include and FILE
ab8500-btemp: Fix typo 'AB5500'
Paul Gortmaker (1):
Documentation: asus-laptop.txt references an obsolete Kconfig item
Ralf Baechle (1):
Fix comment typo multipy -> multiply
Steve Glendinning (1):
Change email address for Steve Glendinning
Wanpeng Li (3):
mm: fix page reclaim comment error
mm: cleanup on the comments of zone_reclaim_stat
mm/vmscan: cleanup comment error in balance_pgdat
Documentation/ABI/stable/vdso | 2 +-
Documentation/ABI/testing/sysfs-block-zram | 2 +-
.../ABI/testing/sysfs-bus-usb-devices-usbsevseg | 2 +-
.../testing/sysfs-class-backlight-driver-adp8870 | 2 +-
Documentation/ManagementStyle | 2 +-
Documentation/arm/Samsung-S3C24XX/H1940.txt | 2 +-
Documentation/arm/Samsung-S3C24XX/SMDK2440.txt | 2 +-
Documentation/devices.txt | 2 ++
Documentation/laptops/asus-laptop.txt | 3 +--
Documentation/sound/alsa/hdspm.txt | 2 +-
Documentation/video4linux/cpia2_overview.txt | 2 +-
Documentation/video4linux/stv680.txt | 2 +-
MAINTAINERS | 20 ++++++++++----------
arch/arm/mach-davinci/Kconfig | 6 ------
arch/arm/mach-omap2/board-apollon.c | 2 +-
arch/arm/mach-omap2/board-omap4panda.c | 2 +-
arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 +-
arch/arm/mach-omap2/sr_device.c | 2 +-
arch/arm/mach-omap2/twl-common.c | 2 +-
arch/arm/plat-samsung/include/plat/gpio-cfg.h | 2 +-
arch/ia64/kernel/ia64_ksyms.c | 2 +-
arch/ia64/kvm/vmm.c | 6 +++---
arch/m68k/kernel/module.c | 4 ++--
arch/parisc/include/asm/compat_rt_sigframe.h | 6 +++---
arch/sh/boards/board-polaris.c | 2 +-
arch/unicore32/Kconfig | 1 -
arch/x86/kernel/module.c | 2 +-
drivers/cpufreq/s3c2416-cpufreq.c | 4 ++--
drivers/cpufreq/speedstep-ich.c | 2 +-
drivers/hwmon/emc2103.c | 2 +-
drivers/input/keyboard/lm8333.c | 2 +-
drivers/input/misc/cma3000_d0x.c | 2 +-
drivers/iommu/amd_iommu_v2.c | 2 +-
drivers/iommu/exynos-iommu.c | 2 +-
drivers/iommu/iova.c | 14 +++++++-------
drivers/media/video/zoran/zr36016.c | 4 ++--
drivers/net/phy/smsc.c | 2 +-
drivers/net/usb/smsc75xx.c | 2 +-
drivers/net/usb/smsc95xx.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-io.c | 2 +-
drivers/parisc/iosapic.c | 2 +-
drivers/pci/hotplug/ibmphp_core.c | 2 +-
drivers/pci/hotplug/ibmphp_ebda.c | 2 +-
drivers/pci/hotplug/ibmphp_pci.c | 2 +-
drivers/pci/setup-bus.c | 2 +-
drivers/power/Kconfig | 2 +-
drivers/scsi/aha152x.c | 4 ++--
drivers/scsi/aha1542.c | 2 +-
drivers/staging/comedi/drivers/s626.h | 2 +-
drivers/usb/renesas_usbhs/common.c | 2 +-
drivers/usb/renesas_usbhs/common.h | 4 ++--
drivers/usb/renesas_usbhs/fifo.c | 4 ++--
drivers/usb/renesas_usbhs/mod.c | 4 ++--
drivers/usb/renesas_usbhs/mod.h | 2 +-
drivers/usb/renesas_usbhs/pipe.c | 4 ++--
drivers/usb/renesas_usbhs/pipe.h | 4 ++--
drivers/video/arcfb.c | 4 ++--
drivers/video/atmel_lcdfb.c | 2 +-
drivers/video/aty/atyfb_base.c | 2 +-
drivers/video/aty/radeon_base.c | 2 +-
drivers/video/backlight/88pm860x_bl.c | 1 +
drivers/video/bfin_adv7393fb.c | 2 +-
drivers/video/cirrusfb.c | 2 +-
drivers/video/exynos/exynos_dp_reg.c | 2 +-
drivers/video/exynos/exynos_mipi_dsi.c | 2 +-
drivers/video/i740fb.c | 6 +++---
drivers/video/s3c-fb.c | 2 +-
drivers/video/savage/savagefb_driver.c | 6 +++---
drivers/video/sis/init.c | 3 ++-
drivers/video/smscufx.c | 8 ++++----
drivers/video/sunxvr500.c | 2 +-
fs/btrfs/extent_io.c | 3 ++-
include/linux/clk.h | 4 ++--
include/linux/mmzone.h | 2 +-
lib/div64.c | 2 +-
mm/vmscan.c | 5 +++--
net/core/netprio_cgroup.c | 2 +-
scripts/mksysmap | 2 +-
sound/oss/vwsnd.c | 2 +-
79 files changed, 119 insertions(+), 121 deletions(-)
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 25+ messages in thread
* [GIT] trivial
@ 2014-04-02 14:19 Jiri Kosina
0 siblings, 0 replies; 25+ messages in thread
From: Jiri Kosina @ 2014-04-02 14:19 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
Linus,
please pull
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-linus
to receive:
- updates from trivial tree; usual rocket science -- mostly documentation
and comment updates
Alexander Shiyan (1):
mmc: core: typo fix in printk specifier
Brian Campbell (1):
user_namespace.c: Remove duplicated word in comment
Geert Uytterhoeven (1):
CREDITS: fix formatting
Jiang Liu (1):
driver core: unexport static function create_syslog_header
Li Zhong (1):
sparse: fix comment
Masanari Iida (5):
mm: Fix warning on make htmldocs caused by slab.c
treewide: Fix typo in Documentation/DocBook
ixgbe: Fix format string in ixgbe_fcoe.
doc: DocBook: Fix typos in xml and template file
doc: fix double words
Olaf Hering (1):
Documentation: update URL to hfsplus Technote 1150
Paul Bolle (5):
Kconfig: Remove useless "default N" lines
doc: Insert MODULE_ in module-signing macros
net-sysfs: fix comment typo 'CONFIG_SYFS'
ARM: spear: clean up editing mistake
isdn: capi: fix "CAPI_VERSION" comment
Pavel Machek (1):
Bluetooth: add module name for btwilink
Richard Genoud (1):
gpio: update path to documentation
Sachin Kamat (1):
ata: ata-samsung_cf: cleanup in header file
Vladimir Davydov (1):
idr: remove unused prototype of idr_free()
CREDITS | 4 ++--
Documentation/DocBook/media/dvb/dvbproperty.xml | 2 +-
Documentation/DocBook/media/v4l/compat.xml | 2 +-
Documentation/DocBook/media_api.tmpl | 2 +-
.../filesystems/autofs4-mount-control.txt | 2 +-
Documentation/filesystems/hfsplus.txt | 2 +-
Documentation/futex-requeue-pi.txt | 2 +-
Documentation/input/multi-touch-protocol.txt | 2 +-
Documentation/kmemcheck.txt | 2 +-
Documentation/memory-barriers.txt | 2 +-
Documentation/module-signing.txt | 10 +++++-----
Documentation/networking/spider_net.txt | 2 +-
Documentation/power/devices.txt | 2 +-
Documentation/security/Smack.txt | 2 +-
Documentation/trace/ring-buffer-design.txt | 2 +-
Documentation/usb/WUSB-Design-overview.txt | 2 +-
Documentation/virtual/kvm/api.txt | 2 +-
Documentation/vm/unevictable-lru.txt | 2 +-
arch/arc/Kconfig | 1 -
arch/arm/mach-spear/Kconfig | 2 +-
arch/cris/arch-v32/drivers/Kconfig | 2 --
arch/s390/include/asm/cio.h | 2 +-
block/blk-core.c | 2 +-
block/blk-map.c | 2 +-
drivers/ata/libata-core.c | 4 ++--
drivers/base/bus.c | 2 +-
drivers/bluetooth/Kconfig | 3 ++-
drivers/gpu/drm/drm_crtc_helper.c | 2 +-
drivers/input/sparse-keymap.c | 2 +-
drivers/misc/mic/Kconfig | 2 --
drivers/mmc/core/host.c | 2 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 2 +-
drivers/regulator/core.c | 2 +-
drivers/scsi/scsi_transport_iscsi.c | 6 +++---
drivers/staging/android/Kconfig | 2 --
drivers/staging/bcm/Kconfig | 1 -
drivers/staging/frontier/Kconfig | 1 -
drivers/staging/media/go7007/Kconfig | 3 ---
drivers/staging/rtl8187se/Kconfig | 1 -
drivers/staging/rtl8188eu/Kconfig | 1 -
drivers/staging/rtl8192e/rtl8192e/Kconfig | 1 -
drivers/staging/rtl8192u/Kconfig | 1 -
drivers/staging/rtl8712/Kconfig | 2 --
drivers/staging/usbip/Kconfig | 4 ----
drivers/usb/core/Kconfig | 1 -
drivers/usb/core/message.c | 2 +-
drivers/usb/core/urb.c | 2 +-
drivers/usb/host/Kconfig | 3 ---
fs/buffer.c | 2 +-
fs/debugfs/inode.c | 6 +++---
include/drm/drm_fb_helper.h | 2 +-
include/linux/gpio.h | 2 +-
include/linux/hsi/hsi.h | 2 +-
include/linux/idr.h | 1 -
include/linux/kfifo.h | 2 +-
include/linux/pipe_fs_i.h | 2 +-
include/linux/platform_data/ata-samsung_cf.h | 9 ++++-----
include/linux/skbuff.h | 2 +-
include/linux/spi/spi.h | 8 ++++----
include/linux/usb/composite.h | 2 +-
include/net/mac80211.h | 6 +++---
include/uapi/linux/capi.h | 2 +-
kernel/relay.c | 2 +-
kernel/signal.c | 2 +-
mm/sparse.c | 2 +-
net/core/dev.c | 2 +-
net/core/net-sysfs.c | 2 +-
67 files changed, 70 insertions(+), 97 deletions(-)
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 25+ messages in thread
* [GIT] trivial
@ 2013-11-15 23:22 Jiri Kosina
0 siblings, 0 replies; 25+ messages in thread
From: Jiri Kosina @ 2013-11-15 23:22 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
Linus,
please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-linus
to receive
- usual earth-shaking, news-breaking, rocket science pile from trivial.git
You are going to encounter this merge conflict:
https://lkml.org/lkml/2013/10/15/425
The resolution is rather simple -- just replace any occurence of
'indentified' in net/netfilter/xt_set.c by 'identified' :)
If you want me to prepare a branch with this conflict resolved, just let
me know, I'll be happy to do that.
Thanks.
Anoop Thomas Mathew (1):
doc: typo on word accounting in kprobes.c in mutliple architectures
Ezequiel Garcia (1):
clk: fixed-factor: Fix a trivial typo
Geert Uytterhoeven (2):
kexec: Typo s/the/then/
mm/Kconfig: Grammar s/an/a/
Henrik Austad (2):
mm: update 00-INDEX
doc: add missing files to timers/00-INDEX
Jingoo Han (1):
SCSI: remove unnecessary pci_set_drvdata()
LABBE Corentin (1):
Correct some typos for word frequency
Masanari Iida (3):
treewide: Fix typo in Kconfig
treewide: Fix typo in printk
doc: usb: Fix typo in Documentation/usb/gadget_configs.txt
Maxime Jayat (1):
treewide: Fix common typo in "identify"
Michael Opdenacker (2):
treewide: fix "distingush" typo
treewide: fix "usefull" typo
Michael Witten (2):
Docs: Kconfig: `devlopers' -> `developers'
DRM: comment: `halve' -> `half'
Paul Gortmaker (1):
NUMA: fix typos in Kconfig help text
Raghavendra K T (1):
Documentation/kvm: Update cpuid documentation for steal time and pv eoi
Xie XiuQi (3):
irq: Fix some trivial typos in comments
mm: Fix some trivial typos in comments
timekeeping: Fix some trivial typos in comments
Xishi Qiu (1):
doc: Documentation/DMA-attributes.txt fix typo
Zhang Yanfei (1):
__page_to_pfn: Fix typo in comment
Documentation/DMA-attributes.txt | 6 +++---
Documentation/timers/00-INDEX | 4 ++++
Documentation/usb/gadget_configfs.txt | 6 +++---
Documentation/virtual/kvm/cpuid.txt | 7 +++++++
Documentation/vm/00-INDEX | 20 ++++++++++++--------
arch/arc/kernel/kprobes.c | 2 +-
arch/arm/mach-sti/Kconfig | 4 ++--
arch/ia64/kernel/kprobes.c | 2 +-
arch/m32r/include/asm/mmu_context.h | 2 +-
arch/mips/include/asm/octeon/cvmx-pip.h | 4 ++--
arch/mn10300/include/asm/mmu_context.h | 2 +-
arch/powerpc/kernel/kprobes.c | 2 +-
arch/powerpc/platforms/pseries/nvram.c | 2 +-
arch/s390/kernel/kprobes.c | 2 +-
arch/sh/include/asm/mmu_context.h | 2 +-
arch/sparc/kernel/kprobes.c | 2 +-
arch/x86/kernel/cpu/amd.c | 2 +-
arch/x86/kernel/cpu/intel_cacheinfo.c | 2 +-
arch/x86/kernel/cpu/scattered.c | 2 +-
drivers/acpi/acpica/utobject.c | 2 +-
drivers/base/dma-contiguous.c | 2 +-
drivers/clk/clk-fixed-factor.c | 2 +-
drivers/cpufreq/Kconfig.x86 | 2 +-
drivers/cpufreq/exynos-cpufreq.c | 2 +-
drivers/dma/Kconfig | 2 +-
drivers/fmc/Kconfig | 2 +-
drivers/gpu/drm/drm_irq.c | 4 ++--
drivers/infiniband/ulp/isert/Kconfig | 4 ++--
drivers/input/serio/i8042.c | 2 +-
drivers/md/raid5.h | 2 +-
drivers/media/i2c/Kconfig | 2 +-
drivers/media/i2c/adv7183.c | 2 +-
drivers/media/i2c/s5c73m3/s5c73m3-core.c | 2 +-
drivers/media/rc/keymaps/rc-dib0700-nec.c | 2 +-
drivers/media/rc/keymaps/rc-dib0700-rc5.c | 2 +-
drivers/mfd/Kconfig | 4 ++--
drivers/mtd/nand/docg4.c | 2 +-
drivers/net/ethernet/mellanox/mlx4/fw.c | 2 +-
.../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 2 +-
drivers/net/irda/ali-ircc.c | 2 +-
drivers/net/irda/nsc-ircc.c | 2 +-
drivers/net/wireless/ath/ath10k/pci.c | 2 +-
drivers/net/wireless/ath/ath5k/dma.c | 2 +-
drivers/regulator/tps65910-regulator.c | 2 +-
drivers/s390/scsi/zfcp_dbf.c | 6 +++---
drivers/scsi/arcmsr/arcmsr_hba.c | 1 -
drivers/scsi/atp870u.c | 2 --
drivers/scsi/bfa/bfad.c | 1 -
drivers/scsi/bnx2i/bnx2i_hwi.c | 16 ++++++++--------
drivers/scsi/bnx2i/bnx2i_iscsi.c | 14 +++++++-------
drivers/scsi/csiostor/csio_init.c | 2 --
drivers/scsi/dc395x.c | 1 -
drivers/scsi/fnic/fnic_main.c | 1 -
drivers/scsi/gdth.c | 2 --
drivers/scsi/hpsa.c | 1 -
drivers/scsi/lpfc/lpfc_init.c | 3 ---
drivers/scsi/megaraid/megaraid_mbox.c | 6 ------
drivers/scsi/megaraid/megaraid_sas_base.c | 5 -----
drivers/scsi/mvsas/mv_init.c | 1 -
drivers/scsi/mvsas/mv_sas.c | 2 +-
drivers/scsi/mvumi.c | 2 --
drivers/scsi/ncr53c8xx.c | 2 +-
drivers/scsi/pm8001/pm8001_init.c | 1 -
drivers/scsi/pmcraid.c | 1 -
drivers/scsi/qla2xxx/qla_os.c | 1 -
drivers/scsi/qla4xxx/ql4_os.c | 1 -
drivers/scsi/stex.c | 2 --
drivers/scsi/sym53c8xx_2/sym_glue.h | 2 +-
drivers/scsi/tmscsim.c | 1 -
drivers/scsi/ufs/ufshcd-pci.c | 1 -
drivers/scsi/vmw_pvscsi.c | 2 --
drivers/staging/iio/adc/ad7606.h | 2 +-
drivers/usb/core/Kconfig | 2 +-
fs/btrfs/Kconfig | 3 ++-
include/asm-generic/memory_model.h | 2 +-
include/linux/amba/serial.h | 2 +-
include/linux/devfreq.h | 2 +-
include/linux/mfd/si476x-core.h | 2 +-
include/linux/netdevice.h | 2 +-
include/net/bluetooth/l2cap.h | 2 +-
init/Kconfig | 4 ++--
kernel/irq/chip.c | 2 +-
kernel/irq/manage.c | 2 +-
kernel/kexec.c | 2 +-
kernel/time/timekeeping.c | 3 ++-
mm/Kconfig | 2 +-
mm/slub.c | 2 +-
net/can/af_can.c | 2 +-
net/netfilter/xt_set.c | 4 ++--
net/vmw_vsock/Kconfig | 2 +-
sound/soc/codecs/alc5632.c | 2 +-
91 files changed, 118 insertions(+), 139 deletions(-)
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 25+ messages in thread
* [GIT] trivial
@ 2013-07-04 13:26 Jiri Kosina
0 siblings, 0 replies; 25+ messages in thread
From: Jiri Kosina @ 2013-07-04 13:26 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
Linus,
please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-linus
to receive usual stuff from trivial tree.
You are going to get trivial conflict in kerneldoc comment in
kernel/irq/generic-chip.c (with ccc414f8 from your tree). Suggested
resolution is just taking the version from your tree, discarding what
comes from trivial.git.
Thanks.
Aaro Koskinen (1):
Documentation/cgroups/memory.txt: fix stat file documentation
Anatol Pomozov (1):
doc: fix misspellings with 'codespell' tool
Chen Gang (1):
spinlock_api_smp.h: fix preprocessor comments
Geert Uytterhoeven (2):
scsi: Spelling hsot -> host
treewide: relase -> release
Joe Perches (2):
sgi: xpc: Convert use of typedef ctl_table to struct ctl_table
frv: Convert use of typedef ctl_table to struct ctl_table
Masanari Iida (2):
treewide: Fix typo in printk
treewide: Fix typo in printk
Paul Bolle (4):
rcu: Fix Documentation typo 'CONFIG_RCU_NOCB_CPUS'
exynos4-is: Fix Kconfig comment
Fix warning typo "CONFIG_RELCOATABLE"
lguest: fix CONFIG_PAE -> CONFIG_x86_PAE in comment
Paul Gortmaker (1):
sysctl/net.txt: delete reference to obsolete 2.4.x kernel
Phil Viana (1):
md: bcache: Fixed a typo with the word 'arithmetic'
Robert P. J. Day (4):
kernel-doc: Update references to SGML to refs to XML instead.
include/linux/cpu.h: Update comments to reflect reality
open firmware: "/aliasas" -> "/aliases"
doc: device tree: clarify stuff in usage-model.txt.
Sachin Kamat (1):
doc: clk: Fix incorrect wording
Stefan Behrens (1):
btrfs: fix btrfs_extend_item() comment
Stefan Huber (7):
Documentation/video4linux/soc-camera.txt fix a typo
Documentation/early-userspace/README fix a typo
Documentation/virtual/kvm/api.txt fix a typo
Documentation/video4linux/si476x.txt fix a typo
Documentation/DocBook/media/v4l fix a typo
Documentation/networking/ieee802154 fix a typo
Documentation/arm/IXP4xx fix a typo
Steven Rostedt (2):
tracing: Put trace_puts() comment above trace_puts() macro for kernel doc
sprintf: hex_string(): fix comment
Thorsten Glaser (1):
update AMD powerflags comments
Uwe Kleine-König (1):
irq/generic-chip: fix a few kernel-doc entries
Zhang Yanfei (2):
mm/sparse: Remove unused ret in sparse_index_init
Documentation/kdump: Remove TODO in this document
Documentation/DocBook/drm.tmpl | 6 +++---
Documentation/DocBook/media/dvb/frontend.xml | 2 +-
Documentation/DocBook/media/v4l/controls.xml | 2 +-
Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml | 2 +-
Documentation/DocBook/writing_usb_driver.tmpl | 2 +-
Documentation/arm/IXP4xx | 2 +-
Documentation/bcache.txt | 10 +++++-----
Documentation/block/queue-sysfs.txt | 2 +-
Documentation/cgroups/memory.txt | 6 +++---
Documentation/clk.txt | 2 +-
Documentation/device-mapper/cache.txt | 2 +-
.../bindings/arm/samsung/interrupt-combiner.txt | 6 +++---
.../devicetree/bindings/arm/spear/shirq.txt | 2 +-
.../devicetree/bindings/clock/silabs,si5351.txt | 2 +-
.../devicetree/bindings/mmc/synopsis-dw-mshc.txt | 2 +-
.../devicetree/bindings/powerpc/4xx/emac.txt | 2 +-
.../devicetree/bindings/spi/brcm,bcm2835-spi.txt | 2 +-
.../bindings/timer/samsung,exynos4210-mct.txt | 2 +-
.../devicetree/bindings/usb/am33xx-usb.txt | 2 +-
Documentation/devicetree/bindings/usb/omap-usb.txt | 2 +-
Documentation/devicetree/usage-model.txt | 11 ++++++-----
Documentation/dynamic-debug-howto.txt | 2 +-
Documentation/early-userspace/README | 2 +-
Documentation/fb/cirrusfb.txt | 2 +-
Documentation/filesystems/jfs.txt | 2 +-
Documentation/filesystems/qnx6.txt | 2 +-
Documentation/filesystems/vfat.txt | 2 +-
Documentation/kdump/kdump.txt | 8 --------
Documentation/kernel-doc-nano-HOWTO.txt | 11 ++++++-----
Documentation/kernel-per-CPU-kthreads.txt | 2 +-
Documentation/laptops/dslm.c | 2 +-
Documentation/media-framework.txt | 2 +-
Documentation/metag/kernel-ABI.txt | 2 +-
Documentation/misc-devices/mei/mei.txt | 2 +-
Documentation/networking/ieee802154.txt | 2 +-
Documentation/networking/ip-sysctl.txt | 2 +-
Documentation/networking/netlink_mmap.txt | 12 ++++++------
Documentation/pinctrl.txt | 2 +-
Documentation/sysctl/net.txt | 6 +++---
Documentation/thermal/exynos_thermal_emulation | 2 +-
Documentation/video4linux/si476x.txt | 2 +-
Documentation/video4linux/soc-camera.txt | 2 +-
Documentation/virtual/kvm/api.txt | 8 ++++----
Documentation/vm/pagemap.txt | 2 +-
Documentation/w1/slaves/w1_ds28e04 | 2 +-
Makefile | 2 +-
arch/frv/kernel/pm.c | 8 ++++----
arch/frv/kernel/sysctl.c | 4 ++--
arch/powerpc/relocs_check.pl | 10 +++++-----
arch/x86/kernel/cpu/powerflags.c | 8 ++++----
drivers/cpufreq/s3c2416-cpufreq.c | 2 +-
drivers/gpu/drm/drm_fb_cma_helper.c | 4 ++--
drivers/gpu/drm/radeon/radeon_fb.c | 2 +-
drivers/infiniband/ulp/isert/ib_isert.c | 2 +-
drivers/input/misc/da9055_onkey.c | 2 +-
drivers/lguest/page_tables.c | 2 +-
drivers/md/bcache/bset.c | 4 ++--
drivers/media/dvb-frontends/stv0367.c | 2 +-
drivers/media/platform/exynos4-is/Kconfig | 2 +-
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 2 +-
drivers/misc/dummy-irq.c | 2 +-
drivers/misc/lattice-ecp3-config.c | 2 +-
drivers/misc/mei/hbm.c | 2 +-
drivers/misc/mei/init.c | 2 +-
drivers/misc/sgi-xp/xpc_main.c | 6 +++---
drivers/net/ethernet/intel/igb/e1000_phy.c | 2 +-
drivers/net/ethernet/mellanox/mlx4/main.c | 2 +-
drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 +-
.../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 2 +-
drivers/net/wireless/ath/ath9k/Kconfig | 2 +-
drivers/nfc/pn533.c | 2 +-
drivers/of/fdt.c | 2 +-
drivers/of/pdt.c | 2 +-
drivers/s390/char/vmur.c | 2 +-
drivers/scsi/aic7xxx_old/aic7xxx.seq | 2 +-
drivers/scsi/libfc/fc_fcp.c | 2 +-
drivers/scsi/libiscsi_tcp.c | 2 +-
drivers/scsi/pm8001/pm80xx_hwi.c | 2 +-
drivers/scsi/pmcraid.c | 2 +-
drivers/scsi/scsi_error.c | 2 +-
drivers/tty/serial/serial-tegra.c | 2 +-
drivers/usb/musb/musb_dsps.c | 2 +-
drivers/usb/musb/omap2430.c | 2 +-
drivers/video/omap2/displays/panel-n8x0.c | 2 +-
fs/btrfs/ctree.c | 2 +-
fs/btrfs/free-space-cache.c | 2 +-
include/linux/cpu.h | 3 +--
include/linux/kernel.h | 5 ++---
include/linux/spinlock_api_smp.h | 2 +-
kernel/irq/generic-chip.c | 6 +++---
lib/Kconfig.kgdb | 4 ++--
lib/vsprintf.c | 2 +-
mm/mmu_notifier.c | 2 +-
mm/sparse.c | 3 +--
sound/pci/hda/hda_codec.c | 2 +-
tools/testing/ktest/ktest.pl | 2 +-
96 files changed, 144 insertions(+), 153 deletions(-)
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [GIT] trivial
2013-04-30 8:31 Jiri Kosina
@ 2013-04-30 20:39 ` Jiri Kosina
0 siblings, 0 replies; 25+ messages in thread
From: Jiri Kosina @ 2013-04-30 20:39 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
On Tue, 30 Apr 2013, Jiri Kosina wrote:
> please pull from
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-linus
>
> to receive 3.10 merge window updates from trivial queue.
Unfortunately I made a mistake when merging into for-linus branch, and
omitted one pre-requisity patch for a few other patches (which have been
Acked by the appropriate maintainers) in the series. Mea culpa maxima,
sorry for that.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-linus
to receive %pSR format addition, which helps to avoid print_symbol to
improve readability.
Joe Perches (1):
vsprintf: Add extension %pSR - print_symbol replacement
Documentation/printk-formats.txt | 2 ++
lib/vsprintf.c | 18 +++++++++++++-----
2 files changed, 15 insertions(+), 5 deletions(-)
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 25+ messages in thread
* [GIT] trivial
@ 2013-04-30 8:31 Jiri Kosina
2013-04-30 20:39 ` Jiri Kosina
0 siblings, 1 reply; 25+ messages in thread
From: Jiri Kosina @ 2013-04-30 8:31 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
Linus,
please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-linus
to receive 3.10 merge window updates from trivial queue.
==
Usual stuff, mostly comment fixes, typo fixes, printk fixes and small code
cleanups.
==
You are going to get two conflicts:
drivers/clk/mvebu/clk-core.c: conflict between 07f42258893d and
4cb24e68a5af (change of '>' to '>=' in the condition).
drivers/misc/mei/interrupt.c: conflict between 393b148f9d0 and
4c6e22b8a93; the function has been renamed and the comment updated
accordingly, so the hunk coming from 393b148f9d0 could be just discarded.
Both conflicts are trivial to solve, but if you want me to prepare a
branch with this resolved for you to pull, please let me know.
Thanks.
Chen Gang (1):
drivers/isdn: delete 'break' after 'return'
Claudiu Ghioc (1):
hugetlb: fix sparse warning for hugetlb_register_node
Cody P Schafer (1):
mmzone: correct "pags" to "pages" in comment.
David P Hilton (1):
iostats.txt: add easy-to-find description for field 6
Joe Perches (3):
m32r: Convert print_symbol to %pSR
gfs2: Convert print_symbol to %pSR
mm: Convert print_symbol to %pSR
Li Zhong (1):
x86 cmpxchg.h: fix wrong comment
Marek Belisko (1):
arm: irq-armada-370-xp: fix comment typo
Masanari Iida (10):
doc: virtual: Fix typos in virtio-spec.txt
treewide: Fix typos in printk and comment
f2fs: Fix typo in comments
treewide: Fix typos in printk
doc: DocBook/media : Fix typo in dvbproperty.xml
treewide: Fix typos in kernel messages
mei: Fix comments in drivers/misc/mei
treewide: Fix typo in printks
doc: devicetree: Fix various typos
treewide: Fix typo in printk and comments
Michel Lespinasse (1):
gitignore: ignore generated hz.bc file
Paul Bolle (12):
sfc: Fix Kconfig typo "----help---"
itg3200: fix incorrect ifdef comment
arc: fix incorrect ifdef comment
doc: Remove text on tracepoint samples
irq: versatile: rename Kconfig macro in printk
doc: put proper reference to CONFIG_MODULE_SIG_ENFORCE
radio-shark: Fix printk "CONFIG_LED_CLASS"
sound: Remove stray pluses from Kconfig file
Remove spurious _H suffixes from ifdef comments
kernel-parameters: remove outdated 'noresidual' parameter
doc: Fix typo "CONFIG_CGROUP_CGROUP_MEMCG_SWAP"
pm44xx: Fix comment for "CONFIG_CPU_IDLE"
Vincent Stehlé (1):
docbook: fix 8250 naming in device-drivers
Wang YanQing (1):
pata_pdc2027x: Fix compiler warning
Zhang Yanfei (11):
driver: hv: remove cast for kmalloc return value
driver: tty: vt: remove cast for kmalloc return value
fs: ufs: remove cast for kmalloc return value
driver: gpu: drm: i915: remove cast for kzalloc return value
arm: remove cast for kzalloc return value
fs: befs: remove cast for kmalloc return value
driver: tty: serial: remove cast for kzalloc return value
ia64: remove cast for kmalloc return value
powerpc: remove cast for kmalloc/kzalloc return value
net: sctp: remove cast for kmalloc/kzalloc return value
driver: usb: storage: remove cast for kmalloc return value
Documentation/DocBook/device-drivers.tmpl | 2 +-
Documentation/DocBook/media/dvb/dvbproperty.xml | 6 ++--
Documentation/cgroups/memory.txt | 2 +-
.../devicetree/bindings/i2c/i2c-s3c2410.txt | 2 +-
Documentation/devicetree/bindings/leds/tca6507.txt | 2 +-
.../devicetree/bindings/metag/meta-intc.txt | 2 +-
.../bindings/pinctrl/atmel,at91-pinctrl.txt | 2 +-
.../bindings/pinctrl/brcm,bcm2835-gpio.txt | 2 +-
.../bindings/power_supply/qnap-poweroff.txt | 2 +-
.../bindings/regulator/max8997-regulator.txt | 2 +-
.../devicetree/bindings/usb/samsung-usbphy.txt | 2 +-
Documentation/iostats.txt | 2 +
Documentation/kernel-parameters.txt | 4 +--
Documentation/trace/tracepoints.txt | 15 ------------
Documentation/virtual/virtio-spec.txt | 6 ++--
arch/arc/kernel/disasm.c | 2 +-
arch/arc/plat-arcfpga/Kconfig | 2 +-
arch/arm/kernel/topology.c | 2 +-
arch/arm/kvm/arm.c | 2 +-
arch/arm/mach-mvebu/irq-armada-370-xp.c | 2 +-
arch/arm/mach-omap2/pm44xx.c | 4 +-
arch/blackfin/include/asm/bfin_sport3.h | 2 +-
arch/ia64/kernel/mca_drv.c | 2 +-
arch/m32r/kernel/traps.c | 6 +---
arch/powerpc/kernel/nvram_64.c | 3 +-
arch/powerpc/kvm/book3s_pr.c | 2 +-
arch/s390/kernel/irq.c | 2 +-
arch/s390/kvm/trace.h | 2 +-
arch/x86/include/asm/cmpxchg.h | 2 +-
drivers/ata/pata_pdc2027x.c | 2 +
drivers/ata/sata_fsl.c | 2 +-
drivers/clk/mvebu/clk-core.c | 4 +-
drivers/crypto/caam/ctrl.c | 2 +-
drivers/gpu/drm/i915/intel_dp.c | 2 +-
drivers/gpu/drm/i915/intel_sdvo.c | 2 +-
drivers/gpu/drm/radeon/radeon_irq_kms.c | 2 +-
drivers/hv/hv.c | 5 +--
drivers/i2c/busses/i2c-puv3.c | 2 +-
drivers/irqchip/irq-versatile-fpga.c | 2 +-
drivers/isdn/i4l/isdn_tty.c | 1 -
drivers/media/pci/saa7164/saa7164-core.c | 2 +-
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 2 +-
drivers/media/radio/radio-shark.c | 2 +-
drivers/media/radio/radio-shark2.c | 2 +-
drivers/media/usb/dvb-usb/opera1.c | 2 +-
drivers/misc/mei/amthif.c | 6 ++--
drivers/misc/mei/client.c | 24 ++++++++++----------
drivers/misc/mei/hbm.c | 9 ++++---
drivers/misc/mei/hw-me.c | 8 +++---
drivers/misc/mei/interrupt.c | 6 ++--
drivers/misc/mei/pci-me.c | 1 +
drivers/misc/mei/wd.c | 1 +
drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | 2 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 4 +-
drivers/net/ethernet/sfc/Kconfig | 2 +-
drivers/net/ethernet/ti/cpts.c | 2 +-
drivers/power/pm2301_charger.c | 2 +-
drivers/remoteproc/remoteproc_core.c | 2 +-
drivers/rtc/Kconfig | 4 +-
drivers/rtc/rtc-max8997.c | 2 +-
drivers/scsi/be2iscsi/be_iscsi.c | 2 +-
drivers/scsi/be2iscsi/be_mgmt.c | 2 +-
drivers/scsi/bnx2i/bnx2i.h | 12 +++++-----
drivers/scsi/csiostor/csio_mb.c | 12 +++++-----
drivers/scsi/lpfc/lpfc_bsg.c | 2 +-
drivers/scsi/mpt3sas/mpt3sas_config.c | 2 +-
drivers/scsi/osd/osd_initiator.c | 2 +-
drivers/scsi/qla4xxx/ql4_nx.c | 2 +-
drivers/tty/serial/icom.c | 3 +-
drivers/tty/vt/consolemap.c | 3 +-
drivers/usb/misc/iowarrior.c | 4 +-
drivers/usb/misc/uss720.c | 2 +-
drivers/usb/storage/isd200.c | 3 +-
drivers/video/amifb.c | 2 +-
drivers/video/auo_k190x.c | 2 +-
drivers/video/exynos/exynos_dp_core.c | 4 +-
drivers/video/goldfishfb.c | 2 +-
drivers/video/s1d13xxxfb.c | 2 +-
drivers/video/ssd1307fb.c | 4 +-
fs/befs/btree.c | 3 +-
fs/f2fs/f2fs.h | 2 +-
fs/f2fs/gc.c | 2 +-
fs/f2fs/super.c | 2 +-
fs/gfs2/glock.c | 4 +-
fs/gfs2/trans.c | 3 +-
fs/nfs/objlayout/objio_osd.c | 2 +-
fs/nfs/objlayout/objlayout.h | 2 +-
fs/ufs/util.c | 3 +-
include/linux/evm.h | 2 +-
include/linux/iio/gyro/itg3200.h | 2 +-
include/linux/ima.h | 4 +-
include/linux/integrity.h | 2 +-
include/linux/mmzone.h | 2 +-
include/net/sctp/sctp.h | 2 +-
include/sound/pcm.h | 2 +-
include/trace/events/timer.h | 10 ++++----
kernel/.gitignore | 1 +
mm/hugetlb.c | 4 +-
mm/memory.c | 8 +++---
mm/slab.c | 8 ++----
net/sctp/protocol.c | 2 +-
sound/pci/mixart/mixart.c | 2 +-
sound/soc/codecs/wm8974.c | 2 +-
sound/soc/ux500/Kconfig | 4 +-
tools/perf/tests/attr.c | 2 +-
tools/perf/tests/parse-events.c | 2 +-
tools/power/cpupower/debug/i386/intel_gsic.c | 2 +-
107 files changed, 166 insertions(+), 186 deletions(-)
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 25+ messages in thread
* [GIT] trivial
@ 2013-02-21 10:14 Jiri Kosina
0 siblings, 0 replies; 25+ messages in thread
From: Jiri Kosina @ 2013-02-21 10:14 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
Linus,
please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-linus
to receive assorted tiny fixes queued in trivial tree.
Andrew Murray (1):
of: fix spelling mistake in comment
Javi Merino (1):
of: add missing documentation for of_platform_populate()
Jesper Dangaard Brouer (1):
percpu_counter.h: comment code for better readability
Jesper Juhl (3):
pcmcia: avoid static analysis complaint about use-after-free
net: mvneta: remove unneeded version.h include
IB: cxgb3: delay freeing mem untill entirely done with it
Jiri Kosina (1):
time: x86: report_lost_ticks doesn't exist any more
Johan Hovold (1):
ARM: at91/ide: remove unsused at91-ide Kconfig entry
Jorrit Schippers (1):
treewide: Replace incomming with incoming in all comments and strings
Kusanagi Kouichi (1):
Revert "Documentation: ABI: /sys/devices/system/cpu/cpu#/node"
Liu Bo (1):
btrfs: fix comment typos
Masanari Iida (4):
xtensa: Fix home page URL in Kconfig
h8300: Fix home page URL in h8300/README
treewide: Fix typo in various drivers
sound: soc: Fix typo in sound/codecs
Olaf Hering (1):
x86, efi: fix comment typo in head_32.S
Paul Gortmaker (2):
Documentation: update top level 00-INDEX file with new additions
DocBook: update EXPORT_SYMBOL entry to point at export.h
Philippe De Muyter (1):
fs/jfs: Fix typo in comment : 'how may' -> 'how many'
Tim Blechmann (1):
powerpc: fix typo (utilties -> utilities)
Wade Cline (1):
Update ibmvscsi module name in Kconfig.
Wang Sheng-Hui (1):
btrfs: remove unnecessary cur_trans set before goto loop in join_transaction
Documentation/00-INDEX | 149 ++++++++++++++++++--
Documentation/ABI/testing/sysfs-devices-system-cpu | 14 --
Documentation/DocBook/kernel-hacking.tmpl | 4 +-
Documentation/x86/x86_64/boot-options.txt | 4 -
arch/h8300/README | 2 +-
.../cavium-octeon/executive/cvmx-helper-util.c | 4 +-
arch/mips/include/asm/octeon/cvmx-helper-util.h | 4 +-
arch/powerpc/platforms/85xx/p1022_ds.c | 8 +-
arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 4 +-
arch/x86/kernel/cpu/perf_event_amd_ibs.c | 2 +-
arch/xtensa/Kconfig | 2 +-
drivers/bluetooth/ath3k.c | 2 +-
drivers/devfreq/exynos4_bus.c | 2 +-
drivers/firewire/ohci.c | 2 +-
drivers/gpu/drm/i915/i915_debugfs.c | 2 +-
drivers/hid/Kconfig | 2 +-
drivers/ide/Kconfig | 5 -
drivers/infiniband/hw/cxgb3/iwch_provider.c | 2 +-
drivers/isdn/hardware/eicon/divacapi.h | 6 +-
drivers/isdn/hardware/eicon/pc.h | 4 +-
drivers/isdn/mISDN/l1oip_core.c | 2 +-
drivers/media/platform/soc_camera/mx2_camera.c | 2 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +-
drivers/net/ethernet/marvell/mvneta.c | 1 -
drivers/net/ethernet/mellanox/mlx4/en_main.c | 2 +-
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 +-
drivers/net/irda/ali-ircc.c | 2 +-
drivers/of/address.c | 2 +-
drivers/of/platform.c | 1 +
drivers/pcmcia/rsrc_nonstatic.c | 6 +-
drivers/rpmsg/virtio_rpmsg_bus.c | 2 +-
drivers/scsi/Kconfig | 2 +-
drivers/staging/android/binder.h | 2 +-
drivers/staging/octeon/ethernet.c | 2 +-
drivers/target/sbp/sbp_target.c | 2 +-
drivers/tty/ipwireless/hardware.c | 4 +-
fs/btrfs/extent-tree.c | 6 +-
fs/btrfs/relocation.c | 4 +-
fs/btrfs/transaction.c | 1 -
fs/cifs/link.c | 2 +-
fs/hpfs/inode.c | 2 +-
fs/jfs/super.c | 2 +-
fs/ocfs2/cluster/tcp.c | 2 +-
fs/qnx6/inode.c | 2 +-
include/linux/dma-buf.h | 2 +-
include/linux/percpu_counter.h | 2 +-
include/net/irda/irlmp.h | 2 +-
include/net/irda/irttp.h | 2 +-
net/bluetooth/hci_core.c | 2 +-
net/caif/cfcnfg.c | 2 +-
net/irda/timer.c | 2 +-
net/sctp/sm_make_chunk.c | 2 +-
scripts/basic/fixdep.c | 2 +-
sound/soc/codecs/ab8500-codec.c | 2 +-
sound/soc/codecs/wm8974.c | 6 +-
sound/soc/codecs/wm8978.c | 6 +-
sound/soc/codecs/wm8983.c | 6 +-
sound/soc/codecs/wm8985.c | 6 +-
58 files changed, 215 insertions(+), 110 deletions(-)
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 25+ messages in thread
* [GIT] trivial
@ 2012-12-12 21:53 Jiri Kosina
0 siblings, 0 replies; 25+ messages in thread
From: Jiri Kosina @ 2012-12-12 21:53 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
Linus,
please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-linus
to receive patches queued in trivial tree.
Usual stuff -- comment/printk typo fixes, documentation updates, dead code
elimination.
Thanks.
Adam Buchbinder (4):
various: Fix spelling of "registered" in comments.
eisa: Fix spelling of "asynchronous".
Fix misspellings of "whether" in comments.
various: Fix spelling of "asynchronous" in comments.
Alan Cox (5):
parport: dead code in pp_write
iscsi: fix check keys
rfkill: error cannot be set here so simplify
keys: Fix unreachable code
i2400m: debugfs return code is wrong
Anthony G. Basile (1):
doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c
Borislav Petkov (1):
krealloc: Fix kernel-doc comment
Cesar Eduardo Barros (1):
firmware: use noinline_for_stack
Chad Reese (1):
RapidIO: Fix comment error.
Cristian Stoica (1):
HOWTO: fix double words typo
Hyeonjun Lim (1):
doc: Update the name of profiling based on sysfs
Jesper Juhl (1):
gen_init_cpio: remove redundant empty line
Jiri Kosina (1):
Merge branch 'master' into for-next
Kees Cook (1):
README: document "make olddefconfig"
Liu Bo (1):
btrfs: unpin_extent_cache: fix the typo and unnecessary arguements
Masanari Iida (14):
tty: Fix typo in tty drivers
isdn: Fix typo in isdn drivers
md: Fix typo in drivers/md
qla2xxx: Fix typo in qla2xxx drivers
Btrfs: Fix printk and variable name
treewide: fix printk typo in multiple drivers
treewide: fix typo of "suppport" in various comments
treewide: fix typo of "suport" in various comments and Kconfig
target: iscsi: fix comment typos in target/iscsi drivers
doc: fix quite a few typos within Documentation
messages: i2o: Fix typo in messages/i2o
wireless: mwifiex: Fix typo in wireless/mwifiex driver
treewide: Fix typos in various Kconfig
treewide: Fix typos in various drivers
Nadia Yvette Chambers (1):
propagate name change to comments in kernel source
Olaf Hering (1):
x86 mtrr: fix comment typo in mtrr_bp_init
Paul Bolle (2):
x86: remove offsets.h from .gitignore and dontdiff
radeon: Fix typo and copy/paste error in comments
Sasha Levin (1):
alpha: use BUG_ON where possible
Yacine Belkadi (2):
Kernel-doc: Convention: Use a "Return" section to describe return values
scripts/kernel-doc: check that non-void fcts describe their return value
Documentation/ABI/testing/dev-kmsg | 2 +-
Documentation/ABI/testing/sysfs-devices-power | 2 +-
Documentation/ABI/testing/sysfs-driver-ppi | 2 +-
Documentation/ABI/testing/sysfs-profiling | 6 ++--
Documentation/HOWTO | 2 +-
Documentation/accounting/getdelays.c | 1 -
Documentation/dma-buf-sharing.txt | 4 +-
Documentation/dontdiff | 1 -
.../fault-injection/notifier-error-inject.txt | 4 +-
Documentation/hid/uhid.txt | 2 +-
Documentation/hwmon/pmbus | 2 +-
Documentation/input/alps.txt | 2 +-
Documentation/kbuild/modules.txt | 2 +-
Documentation/kernel-doc-nano-HOWTO.txt | 13 ++++++--
Documentation/misc-devices/mei/mei-amt-version.c | 4 +-
Documentation/video4linux/bttv/Cards | 2 +-
Documentation/video4linux/bttv/Sound-FAQ | 2 +-
Documentation/vm/frontswap.txt | 2 +-
MAINTAINERS | 2 +-
README | 4 ++
arch/alpha/include/asm/mmzone.h | 2 +-
arch/alpha/kernel/pci_iommu.c | 12 ++-----
arch/arm/kernel/kprobes-test.c | 2 +-
arch/arm/mach-netx/xc.c | 2 +-
arch/arm/mach-s3c24xx/include/mach/bast-map.h | 2 +-
arch/arm/mach-s3c24xx/include/mach/dma.h | 2 +-
arch/arm/mach-s3c24xx/include/mach/vr1000-map.h | 2 +-
arch/arm/mach-s3c24xx/pm.c | 2 +-
arch/arm/mach-tegra/Kconfig | 2 +-
arch/arm/plat-s3c24xx/dma.c | 2 +-
arch/blackfin/mach-bf609/Kconfig | 2 +-
arch/blackfin/mm/sram-alloc.c | 2 +-
arch/cris/include/arch-v10/arch/irq.h | 2 +-
arch/cris/include/arch-v32/arch/irq.h | 2 +-
arch/frv/mm/pgalloc.c | 2 +-
arch/ia64/kvm/kvm-ia64.c | 2 +-
arch/m68k/math-emu/fp_log.c | 2 +-
arch/mips/txx9/generic/pci.c | 2 +-
arch/mn10300/mm/pgtable.c | 2 +-
arch/openrisc/Kconfig | 2 +-
arch/powerpc/include/asm/oprofile_impl.h | 2 +-
arch/powerpc/include/asm/pte-hash64-64k.h | 2 +-
arch/powerpc/include/asm/smu.h | 4 +-
arch/powerpc/kernel/legacy_serial.c | 2 +-
arch/powerpc/kernel/of_platform.c | 2 +-
arch/powerpc/kernel/signal_64.c | 2 +-
arch/powerpc/mm/slice.c | 2 +-
arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 2 +-
arch/powerpc/platforms/cell/iommu.c | 2 +-
arch/powerpc/platforms/cell/spider-pic.c | 6 ++--
arch/powerpc/platforms/powermac/pic.c | 2 +-
arch/sh/boards/board-espt.c | 2 +-
arch/x86/boot/.gitignore | 1 -
arch/x86/kernel/cpu/mtrr/main.c | 2 +-
arch/x86/mm/pgtable.c | 2 +-
drivers/acpi/acpica/dsopcode.c | 2 +-
drivers/char/ipmi/ipmi_msghandler.c | 2 +-
drivers/char/ipmi/ipmi_si_intf.c | 2 +-
drivers/char/ppdev.c | 6 +---
drivers/eisa/eisa.ids | 4 +-
drivers/firewire/init_ohci1394_dma.c | 4 +-
drivers/firewire/ohci.c | 2 +-
drivers/gpio/Kconfig | 2 +-
drivers/gpu/drm/radeon/evergreen.c | 2 +-
drivers/gpu/drm/radeon/ni.c | 4 +-
drivers/gpu/drm/radeon/radeon_ring.c | 4 +-
drivers/gpu/drm/radeon/si.c | 6 ++--
drivers/i2c/busses/i2c-nuc900.c | 2 +-
drivers/i2c/busses/i2c-s3c2410.c | 4 +-
drivers/isdn/hardware/mISDN/hfcpci.c | 2 +-
drivers/isdn/hardware/mISDN/mISDNisar.c | 2 +-
drivers/isdn/hisax/amd7930_fn.c | 2 +-
drivers/isdn/hisax/hfc_pci.c | 2 +-
drivers/isdn/hisax/hfc_sx.c | 2 +-
drivers/isdn/hisax/isar.c | 2 +-
drivers/isdn/pcbit/layer2.c | 2 +-
drivers/md/md.c | 2 +-
drivers/md/persistent-data/dm-block-manager.c | 4 +-
drivers/md/persistent-data/dm-btree.h | 2 +-
drivers/md/raid5.c | 2 +-
drivers/media/dvb-frontends/drxk_hard.c | 2 +-
drivers/media/platform/mx2_emmaprp.c | 2 +-
drivers/message/i2o/README.ioctl | 12 +++---
drivers/message/i2o/i2o_block.c | 2 +-
drivers/message/i2o/i2o_config.c | 2 +-
drivers/mmc/host/Kconfig | 2 +-
drivers/mtd/maps/plat-ram.c | 2 +-
drivers/mtd/nand/s3c2410.c | 2 +-
drivers/net/bonding/bonding.h | 2 +-
drivers/net/ethernet/8390/ax88796.c | 2 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 2 +-
drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 2 +-
drivers/net/ethernet/mellanox/mlx4/eq.c | 2 +-
drivers/net/ethernet/micrel/ksz884x.c | 2 +-
.../myricom/myri10ge/myri10ge_mcp_gen_header.h | 2 +-
drivers/net/sungem_phy.c | 8 ++--
drivers/net/wimax/i2400m/debugfs.c | 1 +
drivers/net/wireless/atmel.c | 2 +-
drivers/net/wireless/ipw2x00/ipw2100.h | 2 +-
drivers/net/wireless/mwifiex/sta_ioctl.c | 2 +-
drivers/net/wireless/mwifiex/usb.c | 2 +-
drivers/net/wireless/zd1211rw/zd_chip.c | 2 +-
drivers/regulator/palmas-regulator.c | 2 +-
drivers/remoteproc/remoteproc_elf_loader.c | 4 +-
drivers/rtc/rtc-isl1208.c | 2 +-
drivers/rtc/rtc-s3c.c | 2 +-
drivers/s390/block/dasd_devmap.c | 2 +-
drivers/scsi/bnx2fc/bnx2fc_hwi.c | 2 +-
drivers/scsi/libsas/sas_expander.c | 2 +-
drivers/scsi/qla2xxx/qla_isr.c | 4 +-
drivers/scsi/qla2xxx/qla_nx.c | 4 +-
drivers/scsi/qla2xxx/qla_target.c | 12 +++---
drivers/scsi/qla2xxx/tcm_qla2xxx.c | 2 +-
drivers/staging/comedi/drivers/usbdux.c | 2 +-
drivers/staging/tidspbridge/rmgr/node.c | 2 +-
drivers/target/iscsi/iscsi_target_configfs.c | 2 +-
drivers/target/iscsi/iscsi_target_erl0.c | 6 ++--
drivers/target/iscsi/iscsi_target_parameters.c | 1 +
drivers/target/iscsi/iscsi_target_util.c | 2 +-
drivers/thermal/Kconfig | 2 +-
drivers/tty/hvc/hvc_opal.c | 2 +-
drivers/tty/hvc/hvc_vio.c | 2 +-
drivers/tty/ipwireless/setup_protocol.h | 2 +-
drivers/tty/serial/8250/Kconfig | 2 +-
drivers/tty/serial/bfin_uart.c | 2 +-
drivers/tty/serial/icom.c | 2 +-
drivers/usb/core/driver.c | 2 +-
drivers/usb/gadget/at91_udc.c | 2 +-
drivers/usb/storage/realtek_cr.c | 2 +-
drivers/vhost/tcm_vhost.c | 2 +-
drivers/watchdog/booke_wdt.c | 2 +-
drivers/xen/xen-pciback/pci_stub.c | 2 +-
fs/btrfs/ctree.h | 2 +-
fs/btrfs/extent-tree.c | 2 +-
fs/btrfs/extent_map.c | 3 +-
fs/btrfs/ordered-data.h | 2 +-
fs/btrfs/volumes.c | 2 +-
fs/cifs/README | 2 +-
fs/ext4/ext4.h | 2 +-
fs/fhandle.c | 4 +-
fs/hugetlbfs/inode.c | 2 +-
fs/jbd/transaction.c | 2 +-
fs/jbd2/transaction.c | 2 +-
fs/logfs/inode.c | 2 +-
fs/ncpfs/mmap.c | 2 +-
fs/notify/fanotify/Kconfig | 2 +-
fs/notify/notification.c | 2 +-
include/linux/dlm.h | 2 +-
include/linux/hash.h | 2 +-
include/linux/ipmi_smi.h | 2 +-
include/linux/lru_cache.h | 4 +-
include/linux/netdevice.h | 2 +-
include/linux/stmmac.h | 2 +-
include/linux/vgaarb.h | 4 +-
include/linux/watchdog.h | 2 +-
include/net/irda/irlmp.h | 2 +-
include/net/sock.h | 2 +-
kernel/pid.c | 4 +-
kernel/profile.c | 7 ++--
kernel/trace/ftrace.c | 2 +-
kernel/trace/trace.c | 2 +-
kernel/trace/trace_functions.c | 2 +-
kernel/trace/trace_irqsoff.c | 2 +-
kernel/trace/trace_sched_wakeup.c | 2 +-
kernel/wait.c | 2 +-
lib/Kconfig.debug | 10 +++---
lib/bitmap.c | 2 +-
mm/hugetlb.c | 2 +-
mm/memory_hotplug.c | 6 ++--
mm/page_alloc.c | 4 +-
mm/util.c | 2 +-
net/can/proc.c | 2 +-
net/ipv4/tcp_cong.c | 2 +-
net/mac80211/driver-ops.h | 2 +-
net/netfilter/nf_log.c | 2 +-
net/rfkill/core.c | 4 +-
net/sctp/endpointola.c | 2 +-
net/sctp/sm_statefuns.c | 2 +-
scripts/kernel-doc | 34 ++++++++++++++++++++
security/keys/process_keys.c | 2 -
sound/core/seq/seq_device.c | 2 +-
sound/pci/emu10k1/emu10k1_patch.c | 2 +-
sound/pci/es1968.c | 2 +-
sound/pci/ice1712/delta.c | 2 +-
sound/pci/sis7019.c | 2 +-
sound/usb/quirks.c | 2 +-
tools/perf/Documentation/perf-record.txt | 2 +-
usr/gen_init_cpio.c | 1 -
188 files changed, 280 insertions(+), 247 deletions(-)
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 25+ messages in thread
* [GIT] trivial
@ 2012-10-01 13:16 Jiri Kosina
0 siblings, 0 replies; 25+ messages in thread
From: Jiri Kosina @ 2012-10-01 13:16 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
Linus,
please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-linus
to receive updates queued in trivial tree.
Tiny usual fixes all over the place.
Alan Cox (1):
tmiofb: missing NULL pointer checks
Anatol Pomozov (1):
treewide: fix comment/printk/variable typos
Fengguang Wu (1):
Coccinelle: fix typo in memdup_user.cocci
Javi Merino (1):
bootmem: Fix the short description of reserve_bootmem()
Jesper Juhl (2):
doc: aliasing-test: close fd on write error
doc: getdelays.c: remember to close() socket on error in create_nl_socket()
Jiri Kosina (1):
Revert "backlight: fix memory leak on obscure error path"
Jon Mason (4):
megaraid: remove unnecessary #defines
gdt: remove unnecessary #defines
hpet: Remove unused PCI Vendor ID #define
ioat: remove unused #defines
Kleber Sacilotto de Souza (1):
ipr: fix small coding style issues
Liu Bo (3):
btrfs: fix comment typo in btrfs_finish_ordered_io
fs/fs-writeback.c: cleanup riteback_sb_inodes kerneldoc
doc: fix old config name of kprobetrace
Masanari Iida (7):
scsi: fix various printk and comment typos
tools/testing: fix comment / output typos
tools: perf: Fix typo in tools/perf
spi: fix comment/printk typos in spi
dma: fix comments
mmc: fix comment typos
mfd: printk/comment fixes
Maxim Nikulin (1):
platform/x86: fix asus_laptop.wled_type module parameter
Oskar Schirmer (1):
doc: fix broken utf8 encoding
Paul Bolle (5):
powerpc: remove four unused files from .gitignore
pci: remove unused .gitignore file
AppArmor: remove af_names.h from .gitignore
oss: remove maui_boot.h from .gitignore and dontdiff
b43: Kconfig: drop unknown symbol 'BRCMSMAC_MODULE'
Paul Gortmaker (1):
irqdesc: delete now orphaned references to timer_rand_state
Peter Meerwald (1):
nfs: comment fix
Wang Sheng-Hui (2):
btrfs: fix trivial typo for the comment of BTRFS_FREE_INO_OBJECTID
btrfs: fix the commment for the action flags in delayed-ref.h
Yanchuan Nian (1):
vfs: fix kerneldoc for generic_fh_to_parent()
Documentation/accounting/getdelays.c | 5 +-
Documentation/dontdiff | 1 -
Documentation/ia64/aliasing-test.c | 1 +
Documentation/power/swsusp.txt | 2 +-
Documentation/trace/kprobetrace.txt | 2 +-
arch/powerpc/boot/.gitignore | 4 -
arch/x86/include/asm/hpet.h | 2 -
drivers/dma/at_hdmac.c | 8 +-
drivers/dma/ep93xx_dma.c | 2 +-
drivers/dma/fsldma.c | 2 +-
drivers/dma/imx-dma.c | 4 +-
drivers/dma/intel_mid_dma.c | 2 +-
drivers/dma/intel_mid_dma_regs.h | 6 +-
drivers/dma/ioat/hw.h | 4 -
drivers/dma/pl330.c | 2 +-
drivers/dma/ppc4xx/adma.c | 2 +-
drivers/dma/ste_dma40_ll.h | 2 +-
drivers/mfd/ab8500-gpadc.c | 2 +-
drivers/mfd/rc5t583.c | 2 +-
drivers/mfd/rdc321x-southbridge.c | 2 +-
drivers/mfd/tps65911-comparator.c | 2 +-
drivers/mmc/core/sdio.c | 2 +-
drivers/mmc/host/at91_mci.c | 2 +-
drivers/mmc/host/atmel-mci.c | 2 +-
drivers/mmc/host/omap_hsmmc.c | 2 +-
drivers/mmc/host/sdhci-esdhc-imx.c | 2 +-
drivers/mmc/host/vub300.c | 2 +-
drivers/net/ethernet/3com/typhoon.c | 2 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 2 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 2 +-
drivers/net/wireless/b43/Kconfig | 4 +-
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 6 +-
drivers/net/wireless/rtlwifi/rtl8192de/fw.c | 6 +-
drivers/pci/.gitignore | 4 -
drivers/scsi/aic7xxx/aic79xx_core.c | 2 +-
drivers/scsi/bfa/bfa_ioc.c | 2 +-
drivers/scsi/bfa/bfa_ioc.h | 2 +-
drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 4 +-
drivers/scsi/gdth.h | 9 ---
drivers/scsi/ipr.c | 66 ++++++++++----------
drivers/scsi/isci/host.c | 2 +-
drivers/scsi/isci/init.c | 2 +-
drivers/scsi/isci/port.c | 2 +-
drivers/scsi/isci/request.c | 2 +-
drivers/scsi/isci/task.c | 2 +-
drivers/scsi/lpfc/lpfc_init.c | 2 +-
drivers/scsi/lpfc/lpfc_sli.c | 4 +-
drivers/scsi/megaraid.c | 5 +-
drivers/scsi/megaraid.h | 35 ----------
drivers/scsi/mvumi.c | 6 +-
drivers/scsi/qla4xxx/ql4_os.c | 6 +-
drivers/scsi/vmw_pvscsi.c | 4 +-
drivers/spi/spi-au1550.c | 2 +-
drivers/spi/spi-bfin-sport.c | 2 +-
drivers/spi/spi-oc-tiny.c | 2 +-
drivers/spi/spi-ppc4xx.c | 4 +-
drivers/spi/spi-topcliff-pch.c | 2 +-
drivers/target/iscsi/iscsi_target_parameters.c | 4 +-
drivers/video/backlight/88pm860x_bl.c | 1 -
drivers/video/exynos/exynos_mipi_dsi.c | 2 +-
drivers/video/tmiofb.c | 4 +
drivers/w1/masters/ds1wm.c | 2 +-
fs/btrfs/ctree.h | 2 +-
fs/btrfs/delayed-ref.h | 2 +-
fs/btrfs/inode.c | 4 +-
fs/ext2/balloc.c | 2 +-
fs/ext3/balloc.c | 2 +-
fs/ext3/inode.c | 2 +-
fs/ext4/inode.c | 14 ++--
fs/ext4/mballoc.c | 2 +-
fs/fs-writeback.c | 4 -
fs/libfs.c | 2 +-
fs/nfs/super.c | 2 +-
include/linux/irqdesc.h | 2 -
include/linux/mfd/max8998.h | 2 +-
include/trace/define_trace.h | 2 +-
mm/bootmem.c | 2 +-
net/8021q/vlanproc.c | 2 +-
scripts/coccinelle/api/memdup_user.cocci | 4 +-
security/apparmor/.gitignore | 1 -
sound/oss/.gitignore | 1 -
tools/perf/util/callchain.h | 2 +-
tools/perf/util/parse-events-test.c | 2 +-
tools/perf/util/python-ext-sources | 2 +-
tools/testing/ktest/examples/include/defaults.conf | 2 +-
tools/testing/ktest/examples/include/tests.conf | 2 +-
tools/testing/selftests/vm/run_vmtests | 6 +-
87 files changed, 142 insertions(+), 207 deletions(-)
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 25+ messages in thread
* [GIT] trivial
@ 2012-05-22 10:31 Jiri Kosina
0 siblings, 0 replies; 25+ messages in thread
From: Jiri Kosina @ 2012-05-22 10:31 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
Linus,
please consider pulling from
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-linus
to receive patches queued in trivial.git
As usual, it's mostly typo fixes, redundant code elimination and some
documentation updates.
There are 2 known conflicts currently in linux-next between trivial.git
and
- mips tree; arch/mips/lantiq/xway/gpio_ebu.c
arch/mips/lantiq/xway/gpio_stp.c are getting moved to drivers/gpio, but
still need the typo fix in the new place
- sound-asoc tree; sound/soc/imx/Kconfig gets folded into
sound/soc/fsl/Kconfig, and the typo fix is still needed there
Either I can wait until those two trees land in your tree, merge and
resolve the conflict myself, and redo the pull request, or let you fix the
conflict once the two trees reach you after merging trivial.git. The
conflict resolutions are completely trivial.
Thanks.
Alexandra Vintila (1):
atm: fix comments
David Mackey (1):
edac: Fix spelling errors.
Dmitry Artamonow (1):
w1: fix slave driver registration error message
Geert Uytterhoeven (1):
fbdev: s/#if CONFIG/#ifdef CONFIG/
Jesper Juhl (14):
Makefile: improve line wrapping
radeon: remove redundant ';' from radeon_vm_bo_update_pte()
btrfs: assignment in write_dev_flush() doesn't need two semi-colons
gma500: Don't needlessly include version.h in mdfld_dsi_output.h
radeon_cp: Remove unneeded tests for NULL before calling release_firmware()
typhoon: get rid of redundant conditional before all to release_firmware()
tg3: remove redundant NULL test before release_firmware() call
bna: remove redundant NULL test before release_firmware()
qlogic: get rid of a redundant test for NULL before call to release_firmware()
tehuti: delete redundant NULL check before release_firmware()
aic94xx: Get rid of redundant NULL check before release_firmware() call
qla2xxx: Remove redundant NULL check before release_firmware() call.
remoteproc: remove redundant NULL check before release_firmware()
qla1280: Remove redundant NULL check before release_firmware() call
Jiri Kosina (2):
Merge branch 'master' into for-next
edac, mips: don't change code that has been removed in edac/mips tree
Joe Perches (5):
scsi: Use vsprintf extention %pf with builtin_return_address
gadget: Use vsprintf extention %pf with builtin_return_address
alpha: Use vsprintf extention %pf with builtin_return_address
arm: Use vsprintf extention %pf with builtin_return_address
parisc: Use vsprintf extention %pf with builtin_return_address
Jonathan Woithe (1):
Email/web address change
Josh Triplett (1):
x86: Fix typo in MODULE_DEVICE_TABLE example: s/x86_cpu/x86cpu/
Justin P. Mattock (1):
r8169.c: fix comment typo
Kusanagi Kouichi (1):
x86, relocs: Remove an unused variable
Kyle McMartin (1):
net: Fix tcp_build_and_update_options comment in struct tcp_sock
Lucia Rosculete (1):
semaphore: fix improper comment reference to mutex
Masanari Iida (6):
doc: fix a few typos
mips: Fix printk typos in arc/mips
radeon: Fix typo in radeon_gem.c
Documentation: Fix typo in multiple files in Documentation
Fix typo in various Kconfig file
Fix "the the" in various Kconfig
Michael Witten (8):
README: Use `X' and `x' consistently
README: Grammar: `me has' -> `I have'
README: Better comma usage
README: `Alternately' -> `Alternatively'
README: More consistent and readable white space
README: Capitalize start of sentence
README: Consolidate discussions of -stable patches
README: Remove sporadic tabs
Octavian Moraru (1):
mtg: docg3: fix comment errors
Oskar Schirmer (5):
i2c: Change mail address of Oskar Schirmer
arm/m68k: Change mail address of Sebastian Hess
net: Change mail address of Oskar Schirmer
lib: Change mail address of Oskar Schirmer
xtensa: Change mail addresses of Hannes Weiner and Oskar Schirmer
Paul Bolle (2):
c2port: fix bogus Kconfig "default no"
Kconfig: replace "--- help ---" with "---help---"
Philipp Hahn (1):
atomic64_32.h: fix parameter naming mismatch
Santosh Y (1):
scsi: fix comment spelling fix recory->recovery
Stephen Boyd (1):
workqueue: Fix workqueue_execute_end() comment
Thomas Weber (1):
Fix typo milivolt => millivolt
Wang YanQing (1):
mmzone: fix comment typo coelesce -> coalesce
CREDITS | 4 +-
Documentation/ABI/testing/sysfs-bus-usb | 4 +-
Documentation/DocBook/kernel-hacking.tmpl | 2 +-
Documentation/DocBook/libata.tmpl | 2 +-
Documentation/DocBook/media/v4l/controls.xml | 6 +-
Documentation/blackfin/bfin-gpio-notes.txt | 2 +-
.../devicetree/bindings/net/can/fsl-flexcan.txt | 2 +-
Documentation/dvb/opera-firmware.txt | 4 +-
Documentation/edac.txt | 2 +-
Documentation/filesystems/nfs/pnfs.txt | 2 +-
Documentation/filesystems/qnx6.txt | 28 ++--
Documentation/hwmon/it87 | 2 +-
Documentation/hwmon/wm831x | 2 +-
Documentation/memory-hotplug.txt | 2 +-
Documentation/networking/can.txt | 2 +-
Documentation/parisc/debugging | 2 +-
Documentation/sound/alsa/compress_offload.txt | 2 +-
Documentation/sound/oss/ALS | 4 +-
Documentation/static-keys.txt | 2 +-
Documentation/usb/dwc3.txt | 2 +-
Documentation/usb/wusb-cbaf | 2 +-
Documentation/video4linux/README.cpia2 | 2 +-
MAINTAINERS | 2 +-
Makefile | 12 +-
README | 222 +++++++++++---------
arch/alpha/kernel/pci_iommu.c | 20 +-
arch/arm/Kconfig | 4 +-
arch/arm/mach-s3c64xx/Kconfig | 4 +-
arch/arm/nwfpe/fpmodule.c | 2 +-
arch/blackfin/Kconfig | 2 +-
arch/m68k/Kconfig.cpu | 2 +-
arch/m68k/platform/532x/config.c | 2 +-
arch/mips/Kconfig | 4 +-
arch/mips/Kconfig.debug | 2 +-
arch/mips/kernel/mips-mt.c | 2 +-
arch/mips/lantiq/xway/gpio.c | 2 +-
arch/mips/lantiq/xway/gpio_ebu.c | 2 +-
arch/mips/lantiq/xway/gpio_stp.c | 2 +-
arch/mips/sni/pcimt.c | 2 +-
arch/openrisc/Kconfig | 2 +-
arch/powerpc/platforms/Kconfig.cputype | 4 +-
arch/powerpc/platforms/pseries/Kconfig | 2 +-
arch/sh/Kconfig.cpu | 2 +-
arch/x86/boot/compressed/relocs.c | 2 -
arch/x86/include/asm/atomic64_32.h | 10 +-
arch/x86/kernel/cpu/match.c | 2 +-
arch/xtensa/variants/s6000/dmac.c | 2 +-
arch/xtensa/variants/s6000/gpio.c | 4 +-
arch/xtensa/variants/s6000/include/variant/dmac.h | 2 +-
arch/xtensa/variants/s6000/irq.c | 4 +-
drivers/devfreq/Kconfig | 2 +-
drivers/edac/edac_core.h | 4 +-
drivers/edac/edac_device.c | 8 +-
drivers/edac/i7core_edac.c | 10 +-
drivers/edac/sb_edac.c | 6 +-
drivers/gpu/drm/gma500/mdfld_dsi_output.h | 1 -
drivers/gpu/drm/radeon/radeon_cp.c | 12 +-
drivers/gpu/drm/radeon/radeon_gart.c | 2 +-
drivers/gpu/drm/radeon/radeon_gem.c | 2 +-
drivers/hid/Kconfig | 2 +-
drivers/hwmon/Kconfig | 2 +-
drivers/i2c/busses/Kconfig | 2 +-
drivers/i2c/busses/i2c-s6000.c | 2 +-
drivers/i2c/busses/i2c-s6000.h | 2 +-
drivers/iommu/Kconfig | 4 +-
drivers/mfd/Kconfig | 6 +-
drivers/mfd/tps65911-comparator.c | 2 +-
drivers/misc/c2port/Kconfig | 6 +-
drivers/mtd/devices/docg3.c | 16 +-
drivers/net/can/sja1000/Kconfig | 2 +-
drivers/net/ethernet/3com/typhoon.c | 3 +-
drivers/net/ethernet/broadcom/tg3.c | 3 +-
drivers/net/ethernet/brocade/bna/bnad.c | 4 +-
.../net/ethernet/qlogic/netxen/netxen_nic_init.c | 3 +-
drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 3 +-
drivers/net/ethernet/realtek/r8169.c | 2 +-
drivers/net/ethernet/s6gmac.c | 4 +-
drivers/net/ethernet/tehuti/tehuti.c | 4 +-
drivers/net/irda/Kconfig | 2 +-
drivers/parisc/superio.c | 2 +-
drivers/platform/x86/fujitsu-laptop.c | 2 +-
drivers/power/bq27x00_battery.c | 2 +-
drivers/ptp/Kconfig | 2 +-
drivers/regulator/tps65910-regulator.c | 20 +-
drivers/remoteproc/remoteproc_core.c | 3 +-
drivers/scsi/aic94xx/aic94xx_seq.c | 3 +-
drivers/scsi/esp_scsi.c | 2 +-
drivers/scsi/qla1280.c | 7 +-
drivers/scsi/qla2xxx/qla_os.c | 3 +-
drivers/scsi/scsi_error.c | 6 +-
drivers/usb/gadget/u_serial.c | 2 +-
drivers/usb/host/Kconfig | 2 +-
drivers/usb/storage/unusual_devs.h | 2 +-
drivers/video/au1100fb.c | 2 +-
drivers/w1/Kconfig | 2 +-
drivers/w1/w1.c | 2 +-
drivers/watchdog/Kconfig | 2 +-
drivers/xen/Kconfig | 2 +-
fs/btrfs/disk-io.c | 2 +-
include/linux/mfd/wm831x/pdata.h | 2 +-
include/linux/mmzone.h | 2 +-
include/linux/rational.h | 2 +-
include/linux/tcp.h | 2 +-
include/trace/events/workqueue.h | 2 +-
kernel/semaphore.c | 2 +-
kernel/trace/Kconfig | 2 +-
lib/rational.c | 2 +-
net/atm/lec.h | 4 +-
net/caif/Kconfig | 2 +-
sound/isa/als100.c | 2 +-
sound/pci/hda/patch_realtek.c | 2 +-
sound/soc/imx/Kconfig | 2 +-
112 files changed, 311 insertions(+), 314 deletions(-)
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 25+ messages in thread
* [GIT] trivial
@ 2012-03-20 22:57 Jiri Kosina
0 siblings, 0 replies; 25+ messages in thread
From: Jiri Kosina @ 2012-03-20 22:57 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
Linus,
please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-linus
to receive trivial queue patches listed below. It's indeed trivial --
mostly documentation updates and a bunch of typo fixes from Masanari.
There are also several linux/version.h include removals from Jesper.
I am not aware of any conflicts with other trees in linux-next.
Thanks.
Al Viro (1):
constify struct pci_dev * in obvious cases
Alexander Stein (1):
compiler.h: Fix typo
Andrew Morton (1):
writeback: fix typo in the writeback_control comment
Cong Wang (1):
kernel/resource.c: move EXPORT_SYMBOL right after definition
Danny Kukawka (1):
hdaps: fix for -Wuninitialized
Fabio Baltieri (1):
usb: gadget: Kconfig: fix typo for 'different'
Fengguang Wu (1):
writeback: fix fn name in writeback_inodes_sb_nr_if_idle() comment header
Geunsik Lim (1):
Doc: Update numastat.txt
Javier Martinez Canillas (1):
security: struct security_operations kerneldoc fix
Jesper Juhl (15):
dm-bufio.c: there's no need to include linux/version.h
ab5500-core.c: Don't needlessly include linux/version.h
Fix up version number reference in include/trace/events/power.h
drivers/media/dvb/frontends/drxk_hard.c does not need to include linux/version.h
gma500, lvds: Fix use after free and mem leak in psb_intel_lvds_init()
Remove incorrect comment from include/trace/events/power.h
ARM, KS8695: Only include linux/gpio.h once in arch/arm/mach-ks8695/leds.c
ARM: Remove duplicate asm/memblock.h include from arch/arm/mm/init.c
BTRFS: Don't include disk-io.h twice in check-integrity.c
power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c
SCSI, ISCSI: Just #include "host.h" once in host.c
Staging: The header linux/module.h is included twice in drivers/staging/iio/dac/ad5686.c
bonding: Fix misspelling of "since"
Only include linux/sched.h once in arch/arm/mach-bcmring/dma.c
NVM Express: Remove unneeded include of linux/version.h from nvme.c
Jim Cromie (3):
scx200_32: use PCI_VDEVICE
scx200_32: replace printks with pr_<level>s
init: fix wording error in mm_init comment
Jiri Kosina (5):
Merge branch 'master' into for-next
Revert "media: Fix typo in mixer_drv.c and hdmi_drv.c"
tpm_tis: fix tis_lock with respect to RCU
Revert "power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c"
Revert "char: Fix typo in viotape.c"
Justin P. Mattock (1):
Typos: change aditional to additional.
Laura Vasilescu (1):
kcore: fix spelling in read_kcore() comment
Liu Bo (1):
mm: fix comment typo of truncate_inode_pages_range
Masanari Iida (61):
tty: fix comment typo in synclink_gt.c
mpt2sas: Fix typo in mpt2sas_config.c
reiserfs: fix printk typo in lbalance.c
macintosh: fix string typo in mediabay.c
ntfs: fix printk typos in mft.c
media: Fix typo in mixer_drv.c and hdmi_drv.c
iwmc3200wifi: fix printk typo in trace.h
pm8001: fix printk typo in pm8001_hwi.c
qla2xxx: fix printk typo in qla_bsg.c
net: fix printk typo in ipw2x00/libipw_rx.c
iommu: Fix typo in intel-iommu.c
staging: Fix typo in ieee80211_rx.c
staging: Fix typo in mei/interrupt.c
aic7xxx: Fix typo in aic7xxx
media: Fix typo in lmedm04.c
dma: Fix typo in iop-adma.c
media: Fix typo in ov6650.c
mips: Fix typo in bcm63xx/setup.c
mmc: Fix typo in s3cmci.c
frontends: Fix typo in tda1004x.c
sh: Fix typo in pci-sh7780.c
score: Fix typo in Kconfig.debug
drm: Fix typo in vmwgfx_drv.c
drm: Fix typo in rv515.c
mach-omap1: Fix typo in lcd_dma.c
btrfs: Fix typo in free-space-cache.c
char: Fix typo in viotape.c
char: Fix typo in tlclk.c
mantis: Fix typo in mantis_hif.c
jffs2: Fix typo in compr.c
mm: Fix typo in unevictable-lru.txt
rds: Fix typo in iw_recv.c and ib_recv.c
aeroflex: Fix typo in greth.c
SRP: Fix typo in ib_srpt.c
Documentation: Fix typo in tcm_mod_builder.py
zd1211rw: Fix typo in zd_usb.c and zd_mac.c
mm: Fix typo in cleancache.txt
Documentation: Fix typo in watchdog-kernel-api.txt
watchdog: Fix typo in Kconfig
watchdog: Fix typo in pnx4008_wdt.c
hostap: Fix typo in hostap_hw.c
cramfs: Fix typo in inode.c
tools: Fix typo in ktest.pl
simtec: Fix typo in pm-simtec.c
mach-orion5x: Fix typo in db88f5281-setup.c and rd88f5182-setup.c
media: Fix typo in radio-sf16fmr2.c
Documentation: Fix typo in power-management.txt
scsi: Fix typo in pmcraid.h
Documentation: Fix typo in thin-provisioning.txt
ia64: Fix typo in irq_xen.c
Documentation: Fix typo in events-power.txt
wireless: Fix typo in mac80211_hwsim.c
usb: Fix typo in ehci-dbg.c
Documentation: Fix typo in proc_usb_info.txt
serial: Fix typo in sn_console.c
davinci: Fix typo in dm355_ccdvc.c
Documentation: Fix Broken URL "freshmeat"
Documentation: Fix broken URL "JF"
arm: Fix typo in spear3[012]0.c
Documentation: Fix typo in kernel-parameters.txt
Documentation: Fix multiple typo in Documentation
Michael Opdenacker (2):
Documentation: broken URL in filesystems.tmpl
Documentation: broken URL in libata.tmpl
Michael Witten (1):
drivers/char: comment fix: CMOS RTC update code is now in kernel/time/ntp.c
Petr Uzel (1):
qla4xxx: Add missing spaces to error messages
Thomas Weber (1):
power: bq27x00: Fix typos in comment
Uwe Kleine-König (1):
mtd: simplify return logic in do_map_probe()
Documentation/00-INDEX | 4 +-
Documentation/ABI/obsolete/sysfs-class-rfkill | 2 +-
Documentation/ABI/stable/sysfs-module | 2 +-
Documentation/DocBook/filesystems.tmpl | 2 +-
Documentation/DocBook/libata.tmpl | 8 +++---
Documentation/DocBook/media/v4l/compat.xml | 4 +-
Documentation/arm/kernel_user_helpers.txt | 2 +-
Documentation/cgroups/blkio-controller.txt | 18 ++++++------
Documentation/device-mapper/dm-raid.txt | 2 +-
Documentation/device-mapper/persistent-data.txt | 2 +-
Documentation/device-mapper/thin-provisioning.txt | 2 +-
.../devicetree/bindings/arm/omap/omap.txt | 2 +-
Documentation/devicetree/bindings/arm/sirf.txt | 2 +-
Documentation/devicetree/booting-without-of.txt | 2 +-
Documentation/dmaengine.txt | 2 +-
Documentation/fb/matroxfb.txt | 8 +++---
Documentation/filesystems/ext4.txt | 4 +-
Documentation/filesystems/gfs2-uevents.txt | 2 +-
.../filesystems/pohmelfs/network_protocol.txt | 2 +-
.../filesystems/ramfs-rootfs-initramfs.txt | 2 +-
Documentation/filesystems/vfs.txt | 2 +-
Documentation/hwmon/adm1275 | 2 +-
Documentation/hwmon/max16064 | 4 +-
Documentation/hwmon/max34440 | 4 +-
Documentation/hwmon/max8688 | 4 +-
Documentation/hwmon/ucd9000 | 6 ++--
Documentation/hwmon/ucd9200 | 10 +++---
Documentation/hwmon/zl6100 | 4 +-
Documentation/i2o/ioctl | 12 ++++----
Documentation/ide/ChangeLog.ide-cd.1994-2004 | 2 +-
Documentation/input/alps.txt | 4 +-
Documentation/input/joystick.txt | 2 +-
Documentation/ioctl/hdio.txt | 4 +-
Documentation/kbuild/kconfig-language.txt | 2 +-
Documentation/kernel-parameters.txt | 6 ++--
Documentation/networking/fore200e.txt | 2 +-
Documentation/numastat.txt | 27 +++++++++++--------
Documentation/scsi/ChangeLog.lpfc | 2 +-
Documentation/scsi/ChangeLog.megaraid_sas | 2 +-
Documentation/scsi/scsi-generic.txt | 2 +-
Documentation/scsi/tmscsim.txt | 2 +-
Documentation/security/Smack.txt | 2 +-
Documentation/security/keys-trusted-encrypted.txt | 2 +-
Documentation/security/keys.txt | 2 +-
Documentation/sound/alsa/ALSA-Configuration.txt | 2 +-
Documentation/target/tcm_mod_builder.py | 2 +-
Documentation/trace/events-power.txt | 2 +-
Documentation/usb/mtouchusb.txt | 2 +-
Documentation/usb/power-management.txt | 2 +-
Documentation/usb/proc_usb_info.txt | 2 +-
Documentation/video4linux/uvcvideo.txt | 2 +-
Documentation/virtual/kvm/mmu.txt | 4 +-
Documentation/virtual/virtio-spec.txt | 8 +++---
Documentation/vm/cleancache.txt | 2 +-
Documentation/vm/unevictable-lru.txt | 8 +++---
Documentation/watchdog/watchdog-kernel-api.txt | 2 +-
arch/alpha/include/asm/machvec.h | 2 +-
arch/alpha/kernel/sys_dp264.c | 2 +-
arch/arm/mach-bcmring/dma.c | 1 -
arch/arm/mach-ks8695/leds.c | 1 -
arch/arm/mach-omap1/lcd_dma.c | 2 +-
arch/arm/mach-orion5x/db88f5281-setup.c | 4 +-
arch/arm/mach-orion5x/rd88f5182-setup.c | 4 +-
arch/arm/mach-spear3xx/spear300.c | 2 +-
arch/arm/mach-spear3xx/spear310.c | 2 +-
arch/arm/mach-spear3xx/spear320.c | 2 +-
arch/arm/mm/init.c | 1 -
arch/arm/plat-s3c24xx/pm-simtec.c | 2 +-
arch/ia64/xen/irq_xen.c | 2 +-
arch/mips/bcm63xx/setup.c | 2 +-
arch/powerpc/include/asm/keylargo.h | 2 +-
arch/score/Kconfig.debug | 2 +-
arch/x86/platform/scx200/scx200_32.c | 24 ++++++++---------
drivers/block/nvme.c | 1 -
drivers/char/nvram.c | 2 +-
drivers/char/rtc.c | 4 +-
drivers/char/tlclk.c | 2 +-
drivers/char/tpm/tpm_tis.c | 10 +++---
drivers/dma/iop-adma.c | 2 +-
drivers/gpu/drm/gma500/psb_intel_lvds.c | 9 +++---
drivers/gpu/drm/radeon/rv515.c | 4 +-
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +-
drivers/hwmon/tmp401.c | 2 +-
drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +-
drivers/iommu/intel-iommu.c | 2 +-
drivers/macintosh/mediabay.c | 2 +-
drivers/md/dm-bufio.c | 1 -
drivers/media/dvb/dvb-usb/lmedm04.c | 2 +-
drivers/media/dvb/frontends/drxk_hard.c | 1 -
drivers/media/dvb/frontends/tda1004x.c | 4 +-
drivers/media/dvb/mantis/mantis_hif.c | 2 +-
drivers/media/radio/radio-sf16fmr2.c | 2 +-
drivers/media/video/davinci/dm355_ccdc.c | 2 +-
drivers/media/video/ov6650.c | 2 +-
drivers/mfd/ab5500-core.c | 1 -
drivers/mmc/host/s3cmci.c | 4 +-
drivers/mtd/chips/chipreg.c | 5 +---
drivers/net/bonding/bond_3ad.c | 2 +-
drivers/net/ethernet/aeroflex/greth.c | 2 +-
drivers/net/wireless/hostap/hostap_hw.c | 4 +-
drivers/net/wireless/ipw2x00/libipw_rx.c | 2 +-
drivers/net/wireless/iwmc3200wifi/trace.h | 2 +-
drivers/net/wireless/mac80211_hwsim.c | 8 +++---
drivers/net/wireless/zd1211rw/zd_mac.c | 2 +-
drivers/net/wireless/zd1211rw/zd_usb.c | 2 +-
drivers/platform/x86/hdaps.c | 4 +-
drivers/power/bq27x00_battery.c | 4 +-
drivers/scsi/aic7xxx/aic79xx_core.c | 4 +-
drivers/scsi/aic7xxx/aic7xxx_core.c | 2 +-
drivers/scsi/isci/host.c | 1 -
drivers/scsi/mpt2sas/mpt2sas_config.c | 2 +-
drivers/scsi/pm8001/pm8001_hwi.c | 2 +-
drivers/scsi/pmcraid.h | 6 ++--
drivers/scsi/qla2xxx/qla_bsg.c | 2 +-
drivers/scsi/qla4xxx/ql4_os.c | 4 +-
drivers/staging/iio/dac/ad5686.c | 1 -
drivers/staging/mei/interrupt.c | 2 +-
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 +-
drivers/tty/serial/sn_console.c | 4 +-
drivers/tty/synclink_gt.c | 2 +-
drivers/usb/gadget/Kconfig | 2 +-
drivers/usb/host/ehci-dbg.c | 2 +-
fs/btrfs/check-integrity.c | 1 -
fs/btrfs/free-space-cache.c | 2 +-
fs/cramfs/inode.c | 6 ++--
fs/fs-writeback.c | 2 +-
fs/jffs2/compr.c | 2 +-
fs/ntfs/layout.h | 4 +-
fs/proc/kcore.c | 2 +-
fs/reiserfs/lbalance.c | 2 +-
include/linux/compiler.h | 2 +-
include/linux/pci.h | 12 ++++----
include/linux/security.h | 2 +-
include/linux/writeback.h | 2 +-
include/trace/events/power.h | 1 -
init/main.c | 4 +-
kernel/resource.c | 3 +-
mm/truncate.c | 2 +-
net/rds/ib_recv.c | 2 +-
net/rds/iw_recv.c | 2 +-
sound/pci/hda/patch_conexant.c | 2 +-
tools/testing/ktest/ktest.pl | 2 +-
142 files changed, 232 insertions(+), 245 deletions(-)
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 25+ messages in thread
* [GIT] trivial
@ 2012-01-05 21:39 Jiri Kosina
0 siblings, 0 replies; 25+ messages in thread
From: Jiri Kosina @ 2012-01-05 21:39 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
Linus,
please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-linus
to receive updates queued in trivial tree. Apart from usual typo /
spelling / comment fixes, it includes some latin1 -> utf8 conversions from
Al, and Kconfig cleanup of unused symbols by Paul.
Thanks.
Al Viro (1):
misc latin1 to utf8 conversions
Arun Thomas (1):
tools/power turbostat: update fields in manpage
Arvind R (1):
edac:i82975x fix 32bit compile and cleanup
Axel Lin (1):
devres: Fix a typo in devm_kfree comment
Geert Uytterhoeven (1):
fat: Spelling s/obsolate/obsolete/g
Javi Merino (1):
irq: Fix comment typo ist->is
Jesper Juhl (2):
SCSI, qla2xxx: remove redundant semicolon
SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
Jiri Kosina (3):
Merge branch 'master' into for-next
MAINTAINERS: update ipwireless entry
mac80211: drop spelling fix
Justin P. Mattock (3):
treewide: Fix typos in various parts of the kernel, and fix some comments.
btrfs: free-space-cache.c: remove extra semicolon.
Kconfig: acpi: Fix typo in comment.
K. Y. Srinivasan (1):
hyper-v: Update MAINTAINERS
Kautuk Consul (1):
namespace: mnt_want_write: Remove unused label 'out'
Mark Einon (1):
types.h: fix comment spelling for 'architectures'
Michael Witten (4):
Docs: Pedantry: [Cc]ordic -> CORDIC
Docs: wording: functions -> algorithm
Docs: wording: Insert `the'
Docs: Kconfig: CORDIC description
Paul Bolle (27):
h8300: drivers/serial/Kconfig was moved
treewide: remove commented out Kconfig entries
snd-aoa: remove commented out Kconfig entry
powerpc: 4xx: remove commented out Kconfig entries
ARM: pxa: Fix typo 'CONFIG_BACKLIGHT_PWM__MODULE'
Kconfig: remove a few puzzling comments
isdn: hisax: Fix wrong macro name 'HISAX_DE_AOC'
ARM: imx: Fix typo 'MACH_MX31_3DS_MXC_NAND_USE_BBT'
Doc: cpufreq: Fix typo and outdated line
Doc: 53c700: drop never defined (Kconfig) macros
powerpc/4xx: Fix typo 'PCC4xx_MSI'
s390: drop "select HAVE_GET_USER_PAGES_FAST"
crypto: drop selects of bogus Kconfig symbol
mtd: drop select of MTD_PARTITIONS
powerpc/mpc5121: drop "select MPC5121_ADS_CPLD"
drop "select GCD" from three Kconfig files
MIPS: Sibyte: drop select of SIBYTE_CFE
usb: gadget: drop "select USB_GADGET_S3C_HSOTG_PIO"
spi: drop "select SPI_MASTER_OF"
serial: Kconfig: drop unknown symbol 'ARCH_IMX'
sound: Kconfig: drop unknown symbol ARCH_CLPS7500
leds: Kconfig: Fix typo 'D2NET_V2'
gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
treewide: Fix comment and string typo 'bufer'
decompress_bunzip2: remove invalid vi modeline
sis900: Fix enum typo 'sis900_rx_bufer_status'
Paul Menzel (1):
scripts/package/Makefile: Fix typo: an deb -> a deb
Thomas Meyer (1):
qnx4fs: Use kmemdup rather than duplicating its implementation
Vinson Lee (1):
devices.txt: Fix typo of 'VMware'.
Vsevolod Alekseev (1):
security.h: fix misc typos/grammar errors in comments
Wang Sheng-Hui (1):
mm: cleanup the comment for head/tail pages of compound pages in mm/page_alloc.c
Wang YanQing (1):
typo fixes: aera -> area, exntension -> extension
.../ABI/testing/sysfs-driver-hid-logitech-lg4ff | 2 +-
Documentation/cpu-freq/governors.txt | 4 +--
Documentation/devices.txt | 2 +-
Documentation/scsi/53c700.txt | 21 +----------
Documentation/vgaarbiter.txt | 2 +-
MAINTAINERS | 19 ++++++----
arch/arm/Kconfig | 3 +-
arch/arm/mach-pxa/colibri-pxa270-income.c | 2 +-
arch/arm/plat-omap/include/plat/serial.h | 2 +-
arch/cris/Kconfig.debug | 1 -
arch/frv/Kconfig | 10 -----
arch/mips/Kconfig | 5 ---
arch/mips/sgi-ip27/Kconfig | 6 ---
arch/mips/sibyte/Kconfig | 1 -
arch/powerpc/include/asm/io.h | 2 +-
arch/powerpc/include/asm/keylargo.h | 2 +-
arch/powerpc/mm/numa.c | 2 +-
arch/powerpc/platforms/40x/Kconfig | 38 --------------------
arch/powerpc/platforms/44x/Kconfig | 18 +---------
arch/powerpc/platforms/512x/Kconfig | 1 -
arch/s390/Kconfig | 1 -
arch/sparc/kernel/smp_64.c | 2 +-
arch/x86/pci/pcbios.c | 2 +-
crypto/Kconfig | 2 -
drivers/acpi/Kconfig | 2 +-
drivers/acpi/acpica/hwxface.c | 2 +-
drivers/base/devres.c | 2 +-
drivers/block/xen-blkback/xenbus.c | 2 +-
drivers/char/ipmi/ipmi_bt_sm.c | 2 +-
drivers/edac/i82975x_edac.c | 30 ++++++++++------
drivers/edac/ppc4xx_edac.c | 2 +-
drivers/gpio/Kconfig | 2 +-
drivers/gpu/drm/i915/intel_sdvo_regs.h | 2 +-
drivers/hid/hid-pl.c | 4 +-
drivers/hid/hid-twinhan.c | 2 +-
drivers/i2c/busses/i2c-xiic.c | 2 +-
drivers/isdn/hisax/enternow_pci.c | 2 +-
drivers/leds/Kconfig | 3 +-
drivers/media/rc/ene_ir.c | 2 +-
drivers/media/rc/ene_ir.h | 2 +-
drivers/media/rc/winbond-cir.c | 2 +-
drivers/media/video/zoran/zoran_driver.c | 2 +-
drivers/message/fusion/lsi/mpi_ioc.h | 2 +-
drivers/misc/ibmasm/command.c | 2 +-
drivers/misc/ibmasm/dot_command.c | 2 +-
drivers/misc/ibmasm/dot_command.h | 2 +-
drivers/misc/ibmasm/event.c | 2 +-
drivers/misc/ibmasm/heartbeat.c | 2 +-
drivers/misc/ibmasm/i2o.h | 2 +-
drivers/misc/ibmasm/ibmasm.h | 2 +-
drivers/misc/ibmasm/ibmasmfs.c | 2 +-
drivers/misc/ibmasm/lowlevel.c | 2 +-
drivers/misc/ibmasm/lowlevel.h | 2 +-
drivers/misc/ibmasm/module.c | 2 +-
drivers/misc/ibmasm/r_heartbeat.c | 2 +-
drivers/misc/ibmasm/remote.h | 2 +-
drivers/misc/ibmasm/uart.c | 2 +-
drivers/mmc/host/omap.c | 4 +-
drivers/mtd/nand/Kconfig | 1 -
drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 2 +-
drivers/net/ethernet/sis/sis900.h | 2 +-
drivers/net/irda/nsc-ircc.c | 2 +-
drivers/net/irda/via-ircc.c | 4 +-
drivers/net/irda/w83977af_ir.c | 2 +-
drivers/net/wimax/i2400m/i2400m.h | 2 +-
drivers/net/wireless/rtlwifi/rtl8192de/hw.c | 4 +-
drivers/parisc/Kconfig | 7 ----
drivers/parport/parport_mfc3.c | 2 +-
drivers/scsi/aic7xxx/aicasm/aicasm.c | 2 +-
drivers/scsi/gdth.h | 2 +-
drivers/scsi/ips.c | 2 +-
drivers/scsi/jazz_esp.c | 2 +-
drivers/scsi/pmcraid.c | 2 +-
drivers/scsi/qla2xxx/qla_nx.c | 2 +-
drivers/scsi/qla4xxx/ql4_fw.h | 2 +-
drivers/scsi/sni_53c710.c | 2 +-
drivers/scsi/vmw_pvscsi.c | 2 +-
drivers/spi/Kconfig | 3 +-
drivers/staging/bcm/target_params.h | 4 +-
.../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +-
drivers/staging/cxt1e1/libsbew.h | 2 +-
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 4 +-
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 2 +-
drivers/staging/iio/industrialio-trigger.c | 2 +-
drivers/staging/keucr/smilmain.c | 4 +-
drivers/staging/sep/sep_driver.c | 2 +-
drivers/staging/tidspbridge/Kconfig | 2 +-
drivers/staging/tidspbridge/rmgr/dbdcd.c | 2 +-
drivers/staging/wlags49_h2/debug.h | 2 +-
drivers/staging/wlags49_h2/dhfcfg.h | 2 +-
drivers/staging/wlags49_h2/hcf.c | 6 ++--
drivers/staging/wlags49_h2/hcf.h | 6 ++--
drivers/staging/wlags49_h2/hcfcfg.h | 6 ++--
drivers/staging/wlags49_h2/hcfdef.h | 6 ++--
drivers/staging/wlags49_h2/mdd.h | 6 ++--
drivers/staging/wlags49_h2/mmd.c | 2 +-
drivers/staging/wlags49_h2/mmd.h | 2 +-
drivers/staging/wlags49_h2/wl_cs.h | 4 +-
drivers/staging/wlags49_h2/wl_enc.c | 4 +-
drivers/staging/wlags49_h2/wl_enc.h | 4 +-
drivers/staging/wlags49_h2/wl_if.h | 4 +-
drivers/staging/wlags49_h2/wl_internal.h | 4 +-
drivers/staging/wlags49_h2/wl_main.c | 4 +-
drivers/staging/wlags49_h2/wl_main.h | 4 +-
drivers/staging/wlags49_h2/wl_netdev.c | 4 +-
drivers/staging/wlags49_h2/wl_netdev.h | 4 +-
drivers/staging/wlags49_h2/wl_pci.c | 4 +-
drivers/staging/wlags49_h2/wl_pci.h | 4 +-
drivers/staging/wlags49_h2/wl_priv.c | 4 +-
drivers/staging/wlags49_h2/wl_priv.h | 4 +-
drivers/staging/wlags49_h2/wl_profile.c | 4 +-
drivers/staging/wlags49_h2/wl_profile.h | 4 +-
drivers/staging/wlags49_h2/wl_util.c | 4 +-
drivers/staging/wlags49_h2/wl_util.h | 4 +-
drivers/staging/wlags49_h2/wl_version.h | 4 +-
drivers/staging/wlags49_h2/wl_wext.c | 4 +-
drivers/staging/wlags49_h2/wl_wext.h | 4 +-
drivers/tty/serial/Kconfig | 2 +-
drivers/usb/gadget/Kconfig | 1 -
drivers/usb/gadget/s3c2410_udc.c | 4 +-
drivers/usb/gadget/s3c2410_udc.h | 2 +-
drivers/usb/host/hwa-hc.c | 2 +-
drivers/usb/host/imx21-hcd.c | 2 +-
drivers/usb/musb/cppi_dma.c | 2 +-
drivers/usb/otg/fsl_otg.c | 2 +-
drivers/usb/serial/ftdi_sio_ids.h | 6 ++--
drivers/usb/storage/isd200.c | 2 +-
drivers/usb/storage/unusual_devs.h | 2 +-
drivers/uwb/i1480/dfu/usb.c | 2 +-
drivers/video/bf54x-lq043fb.c | 2 +-
drivers/video/bfin-t350mcqb-fb.c | 2 +-
drivers/video/console/Kconfig | 2 -
drivers/video/omap/rfbi.c | 2 +-
drivers/video/omap/sossi.c | 2 +-
drivers/watchdog/w83627hf_wdt.c | 4 +-
drivers/zorro/zorro.ids | 2 +-
fs/btrfs/free-space-cache.c | 2 +-
fs/btrfs/inode.c | 2 +-
fs/ext3/inode.c | 2 +-
fs/ext4/inode.c | 4 +-
fs/fat/inode.c | 26 +++++++-------
fs/jbd/checkpoint.c | 2 +-
fs/jbd2/checkpoint.c | 2 +-
fs/namespace.c | 2 -
fs/nfsd/nfs4state.c | 2 +-
fs/ocfs2/file.c | 2 +-
fs/qnx4/inode.c | 7 ++--
fs/xfs/xfs_buf.c | 2 +-
fs/xfs/xfs_file.c | 6 ++--
fs/xfs/xfs_log_cil.c | 2 +-
include/drm/drmP.h | 2 +-
include/linux/cordic.h | 4 +-
include/linux/security.h | 26 +++++++-------
include/linux/types.h | 2 +-
include/linux/wanrouter.h | 2 +-
include/net/mac80211.h | 2 +-
kernel/events/core.c | 2 +-
kernel/events/ring_buffer.c | 2 +-
kernel/irq/manage.c | 2 +-
kernel/time/Kconfig | 2 +-
lib/Kconfig | 7 ++--
lib/cordic.c | 2 +-
lib/decompress_bunzip2.c | 5 +--
lib/decompress_unlzma.c | 2 +-
mm/page_alloc.c | 4 +-
net/ipv4/Kconfig | 2 -
net/ipv4/ip_fragment.c | 2 +-
net/ipv4/netfilter/nf_nat_core.c | 2 +-
net/netfilter/ipvs/Kconfig | 1 -
net/sctp/endpointola.c | 2 +-
scripts/package/Makefile | 2 +-
sound/aoa/codecs/Kconfig | 8 ----
sound/core/Kconfig | 1 -
sound/oss/Kconfig | 2 +-
tools/power/x86/turbostat/turbostat.8 | 8 ++--
tools/testing/ktest/sample.conf | 2 +-
176 files changed, 266 insertions(+), 384 deletions(-)
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 25+ messages in thread
* [GIT] trivial
@ 2011-10-25 9:23 Jiri Kosina
0 siblings, 0 replies; 25+ messages in thread
From: Jiri Kosina @ 2011-10-25 9:23 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
Linus,
please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-linus
to receive patches queued in trivial tree (in case you'd like me to resend
this later during the merge window, just let me know) Thanks.
Bart Van Assche (1):
futex: Fix spelling in a source code comment
Christian Dietrich (2):
drivers/char/rtc: use printk_ratelimited instead of printk_ratelimit
scsi/sg: use printk_ratelimited instead of printk_ratelimit
Dan Carpenter (1):
USB: serial: remove duplicate returns
Jesper Juhl (12):
Documentation/ABI/: update version number references from 2.6.x to 3.x
Remove unneeded version.h include from lib/
Remove unneeded version.h includes from include/
Remove unneeded version.h include from arch/x86/
Remove unneeded version.h includes from arch/arm/
Remove unneeded version.h includes from drivers/block/
Remove unneeded version.h includes from drivers/scsi/
Remove unneeded version.h includes from drivers/target/
Remove unneeded version.h includes (and add where needed) for drivers/usb/
Remove unneeded version.h include from drivers/uwb/
viacam: Don't explode if pci_find_bus() returns NULL
CIFS: Don't free volume_info->UNC until we are entirely done with it.
Joe Perches (11):
s390: Convert vmalloc/memset to vzalloc
atm: Convert vmalloc/memset to vzalloc
drbd: Convert vmalloc/memset to vzalloc
char: Convert vmalloc/memset to vzalloc
isdn: Convert vmalloc/memset to vzalloc
fs: Convert vmalloc/memset to vzalloc
mm: Convert vmalloc/memset to vzalloc
net: Convert vmalloc/memset to vzalloc
drbd: Use angle brackets for system includes
aix94xx: Use angle brackets for system includes
treewide: Correct spelling of successfully in comments
Johann Felix Soden (2):
Fix file references in drivers/ide/
Fix file references in Kconfig files
Justin P. Mattock (4):
lib: Kconfig.debug: Typo remove extra "it"
mm/vmscan.c: fix a typo in a comment "relaimed" to "reclaimed"
ipw2x00: comment typo fix encryptiong to encryption
treewide: remove extra semicolons from various parts of the kernel
Kamalesh Babulal (1):
sched: x86_32 Fix typo in switch_to() description
Kartik Mohta (1):
libertas_tf: deb_defs.h: Fix typo in include guard
Michael Witten (1):
Kconfig: Copyedit: DEBUG_SECTION_MISMATCH
Paul Bolle (19):
eventpoll: fix comment typo 'evenpoll'
Fix kernel-doc comment typo '@id'
Fix documentation and comment typo 'no_hz'
doc: fix broken references
btmrvl_sdio: fix typo 'btmrvl_sdio_sd6888'
bcmring: drop commented out line in Kconfig
thinkpad_acpi: Fix printk typo 'bluestooth'
aic7xxx: fix Kconfig references to READMEs
ARM: mxc: fix Kconfig typo 'i.MX51'
tty: drop superfluous dependency in Kconfig
MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers
h8300: drop puzzling Kconfig dependencies
microblaze: add missing CONFIG_ prefixes
cris: remove arch/cris/arch-v32/lib/nand_init.S
Kconfig: remove redundant CONFIG_ prefix on two symbols
parisc: Kconfig: cleanup Kernel page size default
Drop default from "DM365 codec select" choice
linux@lists.openrisc.net is moderated for non-subscribers
MAINTAINERS: linux-m32r is moderated for non-subscribers
Sean M. Collins (1):
doc: raw1394: Trivial typo fix
Vitaliy Ivanov (3):
treewide: typo 'interrrupt' word corrections.
async: uninitialized warning corrections
futex: uninitialized warning corrections
Documentation/ABI/removed/o2cb | 2 +-
Documentation/ABI/removed/raw1394 | 2 +-
Documentation/ABI/testing/sysfs-bus-bcma | 8 +-
.../testing/sysfs-class-backlight-driver-adp8870 | 16 +-
Documentation/PCI/pci.txt | 2 +-
Documentation/blackfin/bfin-gpio-notes.txt | 2 +-
Documentation/block/biodoc.txt | 2 +-
Documentation/bus-virt-phys-mapping.txt | 2 +-
Documentation/cdrom/packet-writing.txt | 2 +-
Documentation/cpu-freq/governors.txt | 2 +-
Documentation/development-process/4.Coding | 2 +-
Documentation/devicetree/bindings/gpio/led.txt | 2 +-
Documentation/filesystems/caching/object.txt | 6 +-
Documentation/filesystems/locks.txt | 11 +-
Documentation/filesystems/nfs/idmapper.txt | 2 +-
.../filesystems/pohmelfs/design_notes.txt | 5 +-
Documentation/filesystems/proc.txt | 2 +-
Documentation/filesystems/vfs.txt | 3 -
Documentation/frv/booting.txt | 6 -
Documentation/input/input.txt | 2 +-
Documentation/kernel-docs.txt | 4 +-
Documentation/kernel-parameters.txt | 12 +-
Documentation/laptops/thinkpad-acpi.txt | 4 +-
Documentation/media-framework.txt | 4 +-
Documentation/memory-barriers.txt | 2 +-
Documentation/networking/scaling.txt | 2 +-
Documentation/power/basic-pm-debugging.txt | 2 +-
Documentation/power/userland-swsusp.txt | 3 +-
Documentation/rfkill.txt | 3 +-
Documentation/scsi/aic7xxx_old.txt | 2 +-
Documentation/scsi/scsi_mid_low_api.txt | 5 -
Documentation/security/keys-trusted-encrypted.txt | 3 +-
Documentation/sound/oss/PAS16 | 3 +-
Documentation/spi/pxa2xx | 4 +-
Documentation/timers/highres.txt | 2 +-
Documentation/usb/dma.txt | 6 +-
Documentation/virtual/lguest/lguest.c | 2 +-
Documentation/vm/numa | 4 +-
Documentation/vm/slub.txt | 2 +-
MAINTAINERS | 6 +-
arch/alpha/kernel/srm_env.c | 5 +-
arch/arm/Kconfig | 2 +-
arch/arm/include/asm/io.h | 2 +-
arch/arm/mach-bcmring/Kconfig | 2 -
arch/arm/mach-bcmring/irq.c | 1 -
arch/arm/mach-bcmring/timer.c | 1 -
arch/arm/mach-nuc93x/time.c | 2 +-
arch/arm/mach-omap2/smartreflex.c | 2 +-
arch/arm/mach-pxa/xcep.c | 3 +-
arch/arm/mach-w90x900/cpu.c | 2 +-
arch/arm/plat-mxc/Kconfig | 2 +-
arch/cris/Kconfig | 4 +-
arch/cris/arch-v10/Kconfig | 12 +-
arch/cris/arch-v32/lib/nand_init.S | 178 --------------------
arch/h8300/Kconfig | 2 +-
arch/ia64/hp/common/sba_iommu.c | 12 +-
arch/m68k/q40/README | 2 +-
arch/microblaze/include/asm/dma-mapping.h | 2 +-
arch/microblaze/mm/init.c | 6 +-
arch/mips/include/asm/lasat/lasat.h | 6 +-
arch/mn10300/Kconfig | 2 +-
arch/mn10300/kernel/irq.c | 1 -
arch/openrisc/Kconfig | 2 +-
arch/openrisc/include/asm/dma-mapping.h | 2 +-
arch/parisc/Kconfig | 4 +-
arch/parisc/include/asm/dma-mapping.h | 2 +-
arch/parisc/kernel/pci-dma.c | 2 +-
arch/powerpc/include/asm/qe.h | 2 +-
arch/powerpc/platforms/85xx/Kconfig | 2 +-
arch/powerpc/platforms/embedded6xx/storcenter.c | 2 +-
arch/powerpc/sysdev/qe_lib/qe.c | 2 +-
arch/s390/hypfs/hypfs_diag.c | 3 +-
arch/unicore32/include/asm/io.h | 2 +-
arch/x86/Kconfig | 2 +-
arch/x86/Kconfig.debug | 2 +-
arch/x86/boot/header.S | 2 +-
arch/x86/include/asm/dma-mapping.h | 2 +-
arch/x86/kernel/amd_gart_64.c | 2 +-
arch/x86/kernel/apm_32.c | 2 -
arch/x86/kernel/pci-dma.c | 4 +-
arch/x86/kernel/process_32.c | 2 +-
arch/x86/mm/mmio-mod.c | 1 -
drivers/atm/idt77252.c | 11 +-
drivers/atm/lanai.c | 3 +-
drivers/block/drbd/drbd_bitmap.c | 5 +-
drivers/block/drbd/drbd_int.h | 3 +-
drivers/block/drbd/drbd_nl.c | 4 +-
drivers/block/rbd.c | 2 +-
drivers/block/xen-blkback/common.h | 1 -
drivers/bluetooth/btmrvl_sdio.c | 4 +-
drivers/char/agp/backend.c | 3 +-
drivers/char/apm-emulation.c | 5 +-
drivers/char/raw.c | 3 +-
drivers/char/rtc.c | 7 +-
drivers/cpufreq/cpufreq_ondemand.c | 2 +-
drivers/gpu/drm/radeon/radeon_fence.c | 2 +-
drivers/i2c/busses/i2c-designware.c | 2 +-
drivers/ide/Kconfig | 2 +-
drivers/input/misc/rotary_encoder.c | 2 +-
drivers/isdn/i4l/isdn_common.c | 4 +-
drivers/isdn/mISDN/dsp_core.c | 3 +-
drivers/isdn/mISDN/l1oip_codec.c | 6 +-
drivers/leds/Kconfig | 2 +-
drivers/media/dvb/dvb-usb/af9005-remote.c | 2 +-
drivers/media/dvb/dvb-usb/af9005.c | 2 +-
drivers/media/dvb/frontends/dib3000.h | 2 +-
drivers/media/dvb/frontends/dib3000mb.c | 2 +-
drivers/media/radio/wl128x/fmdrv_v4l2.c | 2 +-
drivers/media/video/cx18/cx18-mailbox.h | 2 +-
drivers/mtd/Kconfig | 2 +-
drivers/net/Kconfig | 3 +-
drivers/net/arm/ks8695net.c | 2 +-
drivers/net/atlx/atl1.c | 2 +-
drivers/net/bnx2.h | 12 +-
drivers/net/can/sja1000/sja1000_of_platform.c | 2 +-
drivers/net/igb/e1000_mbx.c | 2 +-
drivers/net/igbvf/mbx.c | 2 +-
drivers/net/irda/Kconfig | 2 +-
drivers/net/ixgbe/ixgbe_mbx.c | 2 +-
drivers/net/ixgbevf/mbx.c | 2 +-
drivers/net/phy/broadcom.c | 2 +-
drivers/net/sky2.c | 2 +-
drivers/net/tile/tilepro.c | 2 +-
drivers/net/tulip/21142.c | 3 -
drivers/net/tulip/eeprom.c | 2 -
drivers/net/tulip/interrupt.c | 3 -
drivers/net/tulip/media.c | 3 -
drivers/net/tulip/pnic.c | 3 -
drivers/net/tulip/pnic2.c | 3 -
drivers/net/tulip/timer.c | 3 -
drivers/net/tulip/tulip.h | 3 -
drivers/net/tulip/tulip_core.c | 3 -
drivers/net/wireless/ipw2x00/libipw_tx.c | 2 +-
drivers/net/wireless/libertas_tf/deb_defs.h | 2 +-
drivers/net/wireless/rtlwifi/pci.c | 6 +-
drivers/parisc/sba_iommu.c | 16 +-
drivers/platform/x86/Kconfig | 5 +-
drivers/platform/x86/thinkpad_acpi.c | 2 +-
drivers/s390/cio/blacklist.c | 3 +-
drivers/scsi/aacraid/src.c | 1 -
drivers/scsi/aic7xxx/Kconfig.aic79xx | 3 +-
drivers/scsi/aic7xxx/Kconfig.aic7xxx | 3 +-
drivers/scsi/aic94xx/aic94xx_dump.c | 2 +-
drivers/scsi/bfa/bfad_drv.h | 1 -
drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 1 -
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 1 -
drivers/scsi/fcoe/fcoe.c | 1 -
drivers/scsi/isci/phy.c | 2 +-
drivers/scsi/megaraid/megaraid_mbox.c | 2 +-
drivers/scsi/mpt2sas/mpt2sas_base.c | 1 -
drivers/scsi/mpt2sas/mpt2sas_config.c | 1 -
drivers/scsi/mpt2sas/mpt2sas_ctl.c | 1 -
drivers/scsi/mpt2sas/mpt2sas_scsih.c | 1 -
drivers/scsi/mvsas/mv_sas.h | 1 -
drivers/scsi/pmcraid.c | 1 -
drivers/scsi/pmcraid.h | 1 -
drivers/scsi/sg.c | 18 +-
drivers/staging/cxt1e1/Kconfig | 3 +-
drivers/staging/iio/addac/adt7316-i2c.c | 2 +-
drivers/staging/iio/dds/ad9832.c | 2 +-
drivers/target/iscsi/iscsi_target_nego.c | 2 +-
drivers/target/target_core_alua.c | 1 -
drivers/target/target_core_configfs.c | 1 -
drivers/target/target_core_fabric_configfs.c | 1 -
drivers/target/target_core_file.c | 1 -
drivers/target/target_core_iblock.c | 1 -
drivers/target/target_core_pr.c | 1 -
drivers/target/target_core_pscsi.c | 1 -
drivers/target/target_core_rd.c | 1 -
drivers/target/target_core_stat.c | 1 -
drivers/target/target_core_tmr.c | 1 -
drivers/target/target_core_tpg.c | 2 +-
drivers/target/target_core_transport.c | 1 -
drivers/target/target_core_ua.c | 1 -
drivers/target/tcm_fc/tfc_cmd.c | 1 -
drivers/target/tcm_fc/tfc_conf.c | 1 -
drivers/target/tcm_fc/tfc_io.c | 1 -
drivers/target/tcm_fc/tfc_sess.c | 1 -
drivers/tty/Kconfig | 2 +-
drivers/tty/serial/mrst_max3110.c | 2 +-
drivers/usb/gadget/langwell_udc.c | 2 +-
drivers/usb/gadget/mv_udc_core.c | 4 +-
drivers/usb/gadget/net2280.c | 2 +-
drivers/usb/gadget/uvc.h | 1 +
drivers/usb/gadget/uvc_v4l2.c | 1 -
drivers/usb/musb/musb_gadget.c | 2 +-
drivers/usb/serial/digi_acceleport.c | 2 +-
drivers/usb/serial/mos7720.c | 1 -
drivers/usb/serial/mos7840.c | 1 -
drivers/usb/storage/realtek_cr.c | 1 -
drivers/uwb/uwb-internal.h | 1 -
drivers/video/igafb.c | 2 +-
drivers/watchdog/smsc37b787_wdt.c | 2 +-
fs/cifs/connect.c | 2 +-
fs/coda/coda_linux.h | 5 +-
fs/configfs/inode.c | 3 +-
fs/configfs/item.c | 2 +-
fs/eventpoll.c | 2 +-
fs/locks.c | 2 +-
fs/reiserfs/journal.c | 9 +-
fs/reiserfs/resize.c | 4 +-
fs/squashfs/Kconfig | 6 +-
fs/xfs/kmem.h | 7 +-
include/linux/ceph/messenger.h | 1 -
include/linux/drbd_tag_magic.h | 2 +-
include/linux/io-mapping.h | 2 +-
include/linux/isdn.h | 2 +-
include/linux/platform_data/ntc_thermistor.h | 2 +-
include/media/pwc-ioctl.h | 1 -
include/media/videobuf-dma-sg.h | 2 +-
include/target/configfs_macros.h | 4 +-
kernel/async.c | 4 +-
kernel/futex.c | 10 +-
kernel/sched.c | 2 +-
lib/Kconfig.debug | 40 +++---
lib/dynamic_debug.c | 1 -
lib/idr.c | 2 +-
mm/page_cgroup.c | 3 +-
mm/vmscan.c | 2 +-
net/netfilter/Kconfig | 2 +-
net/netfilter/x_tables.c | 5 +-
net/rds/ib_cm.c | 6 +-
scripts/checkpatch.pl | 4 +-
sound/core/memalloc.c | 4 +-
sound/oss/Kconfig | 4 +-
sound/soc/davinci/Kconfig | 1 -
tools/perf/util/config.c | 4 +-
227 files changed, 293 insertions(+), 594 deletions(-)
delete mode 100644 arch/cris/arch-v32/lib/nand_init.S
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 25+ messages in thread
* [GIT] trivial
@ 2011-07-30 19:24 Jiri Kosina
0 siblings, 0 replies; 25+ messages in thread
From: Jiri Kosina @ 2011-07-30 19:24 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
Linus,
please pull from for-linus branch at
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-linus
to receive the fix below. It fixes a compilation failure introduced by
tree-wide duplicate include removal (caused by overlooking that one
particular include is in ifdefed section, making the removal
non-equivalent change).
Thanks.
Jiri Kosina (1):
sungem: fix compile failure caused by trivial #include consolidation
drivers/net/sungem.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 25+ messages in thread
* [GIT] trivial
@ 2011-07-25 20:26 Jiri Kosina
0 siblings, 0 replies; 25+ messages in thread
From: Jiri Kosina @ 2011-07-25 20:26 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
Linus,
please pull from 'for-linus' branch at
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-linus
to receive trivial tree patches queued for this merge window.
It's usual trivial stuff all over the tree with nothing really standing
out.
You'll receive two conflicts easy to fix:
1) the one updating Ryan Malons' e-mail address in
drivers/gpio/gpio-ep93xx.c. Just context changes.
You can as well drop this on the floor completely, as this
file is going to be removed anyway in this merge window
(see https://lkml.org/lkml/2011/6/16/913)
2) the one in drivers/net/r8169.c. Context changes as well -- correct
resolution is to use the version from your HEAD and remove the
trailing semicolon from RTL_FIRMWARE_UNKNOWN there.
If you want me to update the tree first and resolve the conflicts, let me
know.
Thanks.
Andrew Lunn (1):
ARM: remove duplicate include from arch/arm/mach-dove/common.c
Andrew Murray (1):
bootgraph.pl: relax timing information requirements
Deepak Saxena (1):
Update feature-removal-update.txt with 3.x versioning
Jan Engelhardt (1):
lib/vsprintf: replace link to Draft by final RFC number
Jean Delvare (1):
fs: Merge split strings
Jesper Juhl (10):
docproc: cleanup brace placement
ARM: static should be at beginning of declaration
MIPS: static should be at beginning of declaration
SH: static should be at beginning of declaration
XTENSA: static should be at beginning of declaration
drivers/i2c: static should be at beginning of declaration
drivers/media: static should be at beginning of declaration
drivers/net: static should be at beginning of declaration
net, netfilter: Remove redundant goto in ebt_ulog_packet
uwb: Fix misspelling of neighbourhood in comment
Jiri Kosina (4):
trivial: don't touch fsi_ssl.c with ioremap fixes
s390: do not touch sie64a.S with duplicate include removal
gma500: push through device driver tree
trivial: don't touch files that are removed in the staging tree
Joe Perches (3):
treewide: Convert uses of struct resource to resource_size(ptr)
treewide: Fix recieve/receive typos
treewide: transciever/transceiver spelling fixes
Jonathan Neuschäfer (2):
scripts/gcc-goto.sh: fix a typo ("suport")
stop_machine.h: "disables preeempt" -> "disables preemption"
Justin P. Mattock (4):
doc: i2o: fix typo 'Settting'
Input: libps2.c: fix comment typo arrrives.
ata: sata_dwc_460ex.c: fix comment typo corrresponding
scsi: qla_isr.c: fix comment typo 'hammmer'
Michael Buesch (1):
Update my e-mail address
Michael Witten (5):
mm Kconfig typo: cleancacne -> cleancache
PCIe ASPM: forcedly -> forcibly
doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
doc: Kconfig: Typo: square -> squared
doc: Kconfig: `to be' -> `be'
Michal Hocko (1):
rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
Mike Frysinger (1):
doc: powerpc: drop +x perms on text file
Nikanth Karthikesan (1):
viafbdev: fix compilation warning for unused variable
Phil Carmody (1):
treewide: fix potentially dangerous trailing ';' in #defined values/expressions
Ryan Mallon (1):
Change Ryan Mallon's email address across the kernel
Sasha Levin (1):
hwrng: fix spelling mistake in header comment
Vitaliy Ivanov (2):
treewide: remove duplicate includes
treewide: fix kernel-doc warnings
Wanlong Gao (1):
doc: fix wrong arch/i386 references
.mailmap | 3 +-
Documentation/DocBook/v4l/io.xml | 2 +-
Documentation/RCU/NMI-RCU.txt | 4 +-
Documentation/blockdev/README.DAC960 | 2 +-
Documentation/blockdev/ramdisk.txt | 8 ++--
Documentation/cpu-freq/cpu-drivers.txt | 2 +-
Documentation/feature-removal-schedule.txt | 20 +++++-----
Documentation/filesystems/nfs/nfsroot.txt | 2 +-
Documentation/i2o/ioctl | 2 +-
Documentation/isdn/README.HiSax | 2 +-
Documentation/kbuild/makefiles.txt | 38 ++++++++++----------
Documentation/magic-number.txt | 2 +-
Documentation/mca.txt | 4 +-
Documentation/scheduler/sched-arch.txt | 2 +-
Documentation/scsi/BusLogic.txt | 2 +-
Documentation/serial/computone.txt | 2 +-
Documentation/zh_CN/magic-number.txt | 2 +-
MAINTAINERS | 6 ++--
arch/alpha/include/asm/floppy.h | 2 +-
arch/arm/common/scoop.c | 2 +-
arch/arm/mach-at91/at91sam9261_devices.c | 2 +-
arch/arm/mach-at91/board-snapper9260.c | 2 +-
arch/arm/mach-dove/common.c | 2 -
arch/arm/mach-ep93xx/dma-m2p.c | 2 +-
arch/arm/mach-ep93xx/gpio.c | 2 +-
arch/arm/mach-ep93xx/simone.c | 4 +-
arch/arm/mach-ep93xx/snappercl15.c | 4 +-
arch/arm/mach-mv78xx0/pcie.c | 8 ++--
arch/arm/mach-pxa/include/mach/corgi.h | 2 +-
arch/arm/mach-pxa/include/mach/pxa27x-udc.h | 4 +-
arch/arm/mach-s3c2410/h1940-bluetooth.c | 1 -
arch/arm/mach-shmobile/board-ap4evb.c | 2 +-
arch/arm/mach-u300/core.c | 2 +-
arch/arm/mach-ux500/board-mop500-regulators.c | 2 +-
arch/arm/plat-mxc/pwm.c | 8 ++--
arch/arm/plat-s5p/sysmmu.c | 6 ++--
arch/arm/plat-samsung/pm-check.c | 2 +-
arch/avr32/kernel/setup.c | 10 +++---
arch/avr32/mach-at32ap/extint.c | 2 +-
arch/avr32/mach-at32ap/hsmc.c | 2 +-
arch/avr32/mach-at32ap/intc.c | 2 +-
arch/avr32/mach-at32ap/pio.c | 2 +-
arch/h8300/kernel/setup.c | 2 +-
arch/ia64/include/asm/sn/tioce.h | 2 +-
arch/microblaze/pci/pci-common.c | 2 +-
arch/mips/bcm47xx/setup.c | 2 +-
arch/mips/include/asm/floppy.h | 2 +-
arch/mips/include/asm/mach-jz4740/gpio.h | 5 +--
arch/mips/lantiq/devices.c | 2 -
arch/mips/lantiq/xway/devices.c | 2 -
arch/mips/pci/pci-rc32434.c | 2 +-
arch/mips/pci/pci-vr41xx.c | 2 +-
arch/mips/powertv/asic/asic_devices.c | 10 ++---
arch/parisc/include/asm/dma-mapping.h | 2 +-
arch/parisc/math-emu/decode_exc.c | 2 +-
arch/powerpc/include/asm/elf.h | 4 +-
arch/powerpc/include/asm/macio.h | 2 +-
arch/powerpc/include/asm/smu.h | 2 +-
arch/powerpc/kernel/machine_kexec.c | 4 +-
arch/powerpc/kernel/pci-common.c | 2 +-
arch/powerpc/platforms/52xx/mpc52xx_pci.c | 8 ++--
arch/powerpc/platforms/83xx/km83xx.c | 2 +-
arch/powerpc/platforms/83xx/mpc832x_mds.c | 2 +-
arch/powerpc/platforms/83xx/mpc834x_mds.c | 2 +-
arch/powerpc/platforms/83xx/mpc836x_mds.c | 2 +-
arch/powerpc/platforms/83xx/usb.c | 2 +-
arch/powerpc/platforms/85xx/sbc8560.c | 2 +-
arch/powerpc/platforms/85xx/xes_mpc85xx.c | 2 +-
arch/powerpc/platforms/cell/celleb_scc_epci.c | 8 ++--
arch/powerpc/platforms/cell/celleb_scc_pciex.c | 2 +-
arch/powerpc/platforms/cell/spu_manage.c | 2 +-
arch/powerpc/platforms/chrp/pci.c | 2 +-
arch/powerpc/platforms/pasemi/dma_lib.c | 2 +-
arch/powerpc/platforms/powermac/nvram.c | 4 +-
arch/powerpc/platforms/powermac/pci.c | 6 +--
arch/powerpc/platforms/powermac/time.c | 2 +-
arch/powerpc/platforms/pseries/smp.c | 1 -
arch/powerpc/sysdev/axonram.c | 2 +-
arch/powerpc/sysdev/cpm1.c | 2 +-
arch/powerpc/sysdev/cpm_common.c | 2 +-
arch/powerpc/sysdev/dart_iommu.c | 2 +-
arch/powerpc/sysdev/fsl_msi.c | 2 +-
arch/powerpc/sysdev/fsl_pci.c | 12 +++---
arch/powerpc/sysdev/fsl_rio.c | 2 +-
arch/powerpc/sysdev/ipic.c | 2 +-
arch/powerpc/sysdev/mmio_nvram.c | 2 +-
arch/powerpc/sysdev/mpc8xx_pic.c | 2 +-
arch/powerpc/sysdev/mv64x60_udbg.c | 4 +-
arch/powerpc/sysdev/ppc4xx_pci.c | 16 ++++----
arch/powerpc/sysdev/qe_lib/qe_ic.c | 2 +-
arch/powerpc/sysdev/qe_lib/qe_io.c | 2 +-
arch/powerpc/sysdev/xics/icp-native.c | 2 +-
arch/s390/oprofile/init.c | 2 -
arch/sh/boards/mach-ap325rxa/setup.c | 2 +-
arch/sh/boards/mach-ecovec24/setup.c | 4 +-
arch/sh/boards/mach-kfr2r09/setup.c | 2 +-
arch/sh/boards/mach-migor/setup.c | 2 +-
arch/sh/boards/mach-se/7724/setup.c | 4 +-
arch/sh/kernel/io_trapped.c | 8 ++--
arch/sh/kernel/machine_kexec.c | 2 +-
arch/sparc/include/asm/elf_64.h | 2 +-
arch/sparc/kernel/ioport.c | 12 +++---
arch/sparc/kernel/pci.c | 6 +--
arch/tile/kernel/setup.c | 3 +-
arch/um/sys-i386/signal.c | 2 +-
arch/x86/Kconfig | 4 +-
arch/x86/kernel/i387.c | 2 +-
arch/x86/kernel/pci-calgary_64.c | 2 +-
arch/x86/kernel/probe_roms.c | 2 +-
arch/x86/kvm/mmu.c | 1 -
arch/xtensa/include/asm/uaccess.h | 3 +-
arch/xtensa/variants/s6000/include/variant/dmac.h | 2 +-
crypto/Kconfig | 2 +-
drivers/acpi/ac.c | 2 +-
drivers/acpi/battery.c | 2 +-
drivers/acpi/sbs.c | 2 +-
drivers/bcma/driver_chipcommon.c | 2 +-
drivers/bcma/driver_chipcommon_pmu.c | 2 +-
drivers/bcma/driver_pci.c | 2 +-
drivers/char/bsr.c | 2 +-
drivers/char/hw_random/core.c | 2 +-
drivers/char/xilinx_hwicap/xilinx_hwicap.c | 2 +-
drivers/dma/mv_xor.c | 5 +--
drivers/edac/cell_edac.c | 2 +-
drivers/edac/mpc85xx_edac.c | 12 +++---
drivers/gpio/ab8500-gpio.c | 1 -
drivers/gpio/bt8xxgpio.c | 2 +-
drivers/gpio/gpio-u300.c | 8 ++--
drivers/gpu/drm/nouveau/nv50_graph.c | 1 -
drivers/gpu/drm/sis/sis_drv.h | 4 +-
drivers/hwmon/gl520sm.c | 2 +-
drivers/i2c/Kconfig | 2 +-
drivers/i2c/busses/i2c-highlander.c | 2 +-
drivers/i2c/busses/i2c-omap.c | 4 +-
drivers/ide/palm_bk3710.c | 2 +-
drivers/ide/tx4939ide.c | 4 +-
drivers/input/serio/libps2.c | 2 +-
drivers/input/serio/sa1111ps2.c | 6 +--
drivers/isdn/i4l/isdn_bsdcomp.c | 2 +-
drivers/media/rc/ite-cir.c | 1 -
drivers/media/video/davinci/vpif.c | 2 +-
drivers/media/video/m5mols/m5mols_capture.c | 1 -
drivers/media/video/omap/omap_vout.c | 2 +-
drivers/media/video/omap24xxcam.c | 5 +--
drivers/media/video/videobuf2-memops.c | 1 -
drivers/message/i2o/iop.c | 8 ++--
drivers/mfd/tc6387xb.c | 2 +-
drivers/misc/atmel-ssc.c | 2 +-
drivers/misc/atmel_pwm.c | 2 +-
drivers/mmc/host/dw_mmc.c | 2 +-
drivers/mmc/host/vub300.c | 4 +-
drivers/mtd/devices/sst25l.c | 4 +-
drivers/mtd/maps/bfin-async-flash.c | 2 +-
drivers/mtd/maps/ixp2000.c | 11 +++---
drivers/mtd/maps/pxa2xx-flash.c | 2 +-
drivers/mtd/nand/atmel_nand.c | 4 +-
drivers/mtd/nand/bcm_umi_nand.c | 2 +-
drivers/mtd/nand/mpc5121_nfc.c | 2 +-
drivers/net/b44.c | 2 +-
drivers/net/bcm63xx_enet.c | 8 ++--
drivers/net/bsd_comp.c | 2 +-
drivers/net/can/c_can/c_can.c | 1 -
drivers/net/can/c_can/c_can_platform.c | 1 -
drivers/net/can/softing/softing_main.c | 2 +-
drivers/net/davinci_emac.c | 6 ++--
drivers/net/eexpress.c | 2 +-
drivers/net/ethoc.c | 2 +-
drivers/net/fec_mpc52xx.c | 7 ++--
drivers/net/fs_enet/mii-bitbang.c | 4 +-
drivers/net/fs_enet/mii-fec.c | 2 +-
drivers/net/gianfar_ptp.c | 2 +-
drivers/net/ibm_newemac/core.c | 2 +-
drivers/net/irda/toim3232-sir.c | 2 +-
drivers/net/macb.c | 2 +-
drivers/net/mv643xx_eth.c | 2 +-
drivers/net/natsemi.c | 4 +-
drivers/net/pxa168_eth.c | 2 +-
drivers/net/r8169.c | 2 +-
drivers/net/s2io.h | 4 +-
drivers/net/sb1250-mac.c | 2 +-
drivers/net/sungem.c | 3 +-
drivers/net/usb/kalmia.c | 12 +++---
drivers/net/wan/lmc/lmc_var.h | 2 +-
drivers/net/wireless/ath/ath5k/ahb.c | 1 -
drivers/net/wireless/b43/debugfs.c | 2 +-
drivers/net/wireless/b43/dma.c | 2 +-
drivers/net/wireless/b43/leds.c | 2 +-
drivers/net/wireless/b43/lo.c | 2 +-
drivers/net/wireless/b43/main.c | 2 +-
drivers/net/wireless/b43/main.h | 2 +-
drivers/net/wireless/b43/pcmcia.c | 2 +-
drivers/net/wireless/b43/phy_a.c | 2 +-
drivers/net/wireless/b43/phy_common.c | 2 +-
drivers/net/wireless/b43/phy_g.c | 2 +-
drivers/net/wireless/b43/phy_lp.c | 2 +-
drivers/net/wireless/b43/phy_n.c | 2 +-
drivers/net/wireless/b43/pio.c | 2 +-
drivers/net/wireless/b43/radio_2055.c | 2 +-
drivers/net/wireless/b43/rfkill.c | 2 +-
drivers/net/wireless/b43/sdio.c | 2 +-
drivers/net/wireless/b43/sysfs.c | 2 +-
drivers/net/wireless/b43/tables.c | 2 +-
drivers/net/wireless/b43/tables_lpphy.c | 2 +-
drivers/net/wireless/b43/tables_nphy.c | 2 +-
drivers/net/wireless/b43/wa.c | 2 +-
drivers/net/wireless/b43/xmit.c | 2 +-
drivers/net/wireless/b43legacy/debugfs.c | 2 +-
drivers/net/wireless/b43legacy/dma.c | 2 +-
drivers/net/wireless/b43legacy/ilt.c | 2 +-
drivers/net/wireless/b43legacy/leds.c | 2 +-
drivers/net/wireless/b43legacy/main.c | 2 +-
drivers/net/wireless/b43legacy/main.h | 2 +-
drivers/net/wireless/b43legacy/phy.c | 2 +-
drivers/net/wireless/b43legacy/phy.h | 2 +-
drivers/net/wireless/b43legacy/pio.c | 2 +-
drivers/net/wireless/b43legacy/radio.c | 2 +-
drivers/net/wireless/b43legacy/radio.h | 2 +-
drivers/net/wireless/b43legacy/rfkill.c | 2 +-
drivers/net/wireless/b43legacy/sysfs.c | 2 +-
drivers/net/wireless/b43legacy/xmit.c | 2 +-
drivers/net/wireless/iwlegacy/iwl-commands.h | 4 +-
drivers/net/wireless/iwlwifi/iwl-commands.h | 4 +-
drivers/net/wireless/rtlwifi/rtl8192ce/reg.h | 4 +-
drivers/parport/parport_ax88796.c | 2 +-
drivers/pci/hotplug/shpchp_sysfs.c | 21 +++++------
drivers/pci/pcie/aspm.c | 2 +-
drivers/pcmcia/at91_cf.c | 7 ++--
drivers/pcmcia/electra_cf.c | 4 +-
drivers/pcmcia/rsrc_iodyn.c | 6 ++--
drivers/pcmcia/rsrc_nonstatic.c | 6 ++--
drivers/pnp/pnpacpi/rsparser.c | 10 +++---
drivers/pnp/pnpbios/rsparser.c | 12 +++---
drivers/power/ds2782_battery.c | 4 +-
drivers/rtc/rtc-at32ap700x.c | 2 +-
drivers/rtc/rtc-cmos.c | 6 ++--
drivers/rtc/rtc-ds1286.c | 2 +-
drivers/rtc/rtc-ds1511.c | 2 +-
drivers/rtc/rtc-ds1742.c | 2 +-
drivers/rtc/rtc-m48t35.c | 2 +-
drivers/rtc/rtc-m48t59.c | 2 +-
drivers/rtc/rtc-mrst.c | 5 +--
drivers/rtc/rtc-puv3.c | 5 +--
drivers/rtc/rtc-s3c.c | 5 +--
drivers/scsi/device_handler/scsi_dh_rdac.c | 2 +-
drivers/scsi/lpfc/lpfc_hw.h | 8 ++--
drivers/scsi/qla2xxx/qla_isr.c | 4 +-
drivers/ssb/b43_pci_bridge.c | 2 +-
drivers/ssb/driver_chipcommon.c | 2 +-
drivers/ssb/driver_chipcommon_pmu.c | 2 +-
drivers/ssb/driver_extif.c | 2 +-
drivers/ssb/driver_gige.c | 2 +-
drivers/ssb/driver_mipscore.c | 2 +-
drivers/ssb/driver_pcicore.c | 2 +-
drivers/ssb/embedded.c | 2 +-
drivers/ssb/main.c | 2 +-
drivers/ssb/pci.c | 2 +-
drivers/ssb/pcihost_wrapper.c | 2 +-
drivers/ssb/pcmcia.c | 2 +-
drivers/ssb/scan.c | 2 +-
drivers/ssb/sdio.c | 2 +-
drivers/ssb/sprom.c | 2 +-
.../staging/ath6kl/os/linux/include/ar6000_drv.h | 1 -
drivers/staging/bcm/headers.h | 7 +---
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 1 -
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h | 1 -
drivers/staging/brcm80211/brcmfmac/wl_iw.c | 9 +----
drivers/staging/hv/hv_mouse.c | 1 -
drivers/staging/hv/tools/hv_kvp_daemon.c | 1 -
drivers/staging/nvec/nvec.c | 1 -
drivers/staging/rtl8712/drv_types.h | 1 -
drivers/staging/rtl8712/osdep_service.h | 1 -
drivers/staging/sep/sep_driver.c | 1 -
drivers/staging/usbip/userspace/src/utils.h | 1 -
drivers/target/loopback/tcm_loop.c | 1 -
drivers/target/tcm_fc/tfc_cmd.c | 1 -
drivers/target/tcm_fc/tfc_conf.c | 1 -
drivers/target/tcm_fc/tfc_io.c | 1 -
drivers/target/tcm_fc/tfc_sess.c | 2 -
drivers/tty/serial/8250_pci.c | 2 +-
drivers/tty/serial/bfin_5xx.c | 5 +--
drivers/tty/serial/imx.c | 5 +--
drivers/tty/serial/m32r_sio.c | 2 +-
drivers/tty/serial/omap-serial.c | 6 ++--
drivers/tty/serial/pxa.c | 2 +-
drivers/tty/serial/sunsu.c | 2 +-
drivers/tty/serial/vt8500_serial.c | 3 +-
drivers/uio/uio_pdrv.c | 2 +-
drivers/uio/uio_pdrv_genirq.c | 2 +-
drivers/usb/gadget/atmel_usba_udc.c | 2 +-
drivers/usb/gadget/fsl_udc_core.c | 6 ++--
drivers/usb/gadget/pxa27x_udc.h | 4 +-
drivers/usb/host/ehci-ath79.c | 2 +-
drivers/usb/host/ehci-cns3xxx.c | 2 +-
drivers/usb/host/ehci-fsl.c | 2 +-
drivers/usb/host/ehci-grlib.c | 2 +-
drivers/usb/host/ehci-ixp4xx.c | 2 +-
drivers/usb/host/ehci-octeon.c | 2 +-
drivers/usb/host/ehci-pmcmsp.c | 10 +++---
drivers/usb/host/ehci-ppc-of.c | 2 +-
drivers/usb/host/ehci-w90x900.c | 2 +-
drivers/usb/host/ehci-xilinx-of.c | 2 +-
drivers/usb/host/fhci-hcd.c | 2 +-
drivers/usb/host/ohci-ath79.c | 4 +-
drivers/usb/host/ohci-cns3xxx.c | 2 +-
drivers/usb/host/ohci-da8xx.c | 2 +-
drivers/usb/host/ohci-octeon.c | 2 +-
drivers/usb/host/ohci-ppc-of.c | 2 +-
drivers/usb/host/ohci-ppc-soc.c | 2 +-
drivers/usb/host/ohci-sa1111.c | 2 +-
drivers/usb/host/ohci-sm501.c | 11 +++---
drivers/usb/host/ohci-ssb.c | 2 +-
drivers/usb/host/ohci-tmio.c | 6 ++--
drivers/usb/host/oxu210hp-hcd.c | 2 +-
drivers/usb/host/uhci-grlib.c | 2 +-
drivers/usb/host/whci/init.c | 2 +-
drivers/usb/misc/ftdi-elan.c | 28 +++++++-------
drivers/usb/musb/musb_core.c | 2 +-
drivers/usb/otg/isp1301_omap.c | 4 +-
drivers/usb/otg/otg_fsm.c | 1 -
drivers/usb/otg/twl4030-usb.c | 2 +-
drivers/uwb/uwbd.c | 2 +-
drivers/uwb/whc-rc.c | 2 +-
drivers/video/atmel_lcdfb.c | 4 +-
drivers/video/aty/atyfb_base.c | 7 ++--
drivers/video/au1100fb.c | 2 +-
drivers/video/cobalt_lcdfb.c | 2 +-
drivers/video/controlfb.c | 4 +-
drivers/video/ep93xx-fb.c | 4 +-
drivers/video/i810/i810.h | 2 +-
drivers/video/mb862xx/mb862xxfbdrv.c | 4 +-
drivers/video/msm/mdp.c | 3 +-
drivers/video/msm/msm_fb.c | 7 ++--
drivers/video/nuc900fb.c | 2 +-
drivers/video/platinumfb.c | 5 +--
drivers/video/pxa168fb.c | 2 +-
drivers/video/udlfb.c | 1 -
drivers/video/via/viafbdev.c | 4 +-
fs/ecryptfs/keystore.c | 2 +-
fs/jffs2/readinode.c | 2 +-
fs/nfs/idmap.c | 7 +---
fs/ocfs2/move_extents.c | 1 -
fs/xfs/xfs_dir2_node.c | 2 +-
include/linux/ceph/libceph.h | 2 +-
include/linux/cgroup.h | 1 -
include/linux/cred.h | 1 -
include/linux/dio.h | 2 +-
include/linux/fdtable.h | 1 -
include/linux/fs.h | 1 -
include/linux/hw_random.h | 2 +-
include/linux/mfd/tps65910.h | 2 +-
include/linux/nl80211.h | 2 +-
include/linux/pnp.h | 2 +-
include/linux/rtnetlink.h | 3 +-
include/linux/ssb/ssb_driver_chipcommon.h | 2 +-
include/linux/stop_machine.h | 2 +-
include/linux/zorro.h | 2 +-
include/net/sock.h | 3 +-
include/scsi/osd_initiator.h | 2 +-
include/scsi/scsi.h | 2 +-
include/sound/soundfont.h | 2 +-
kernel/cgroup.c | 8 +---
kernel/exit.c | 1 -
kernel/kexec.c | 2 +-
kernel/pid.c | 1 -
kernel/power/Kconfig | 4 +-
kernel/rcutorture.c | 2 -
kernel/sched.c | 1 -
lib/vsprintf.c | 3 +-
mm/Kconfig | 2 +-
mm/slub.c | 2 +-
net/bridge/netfilter/ebt_ulog.c | 1 -
net/mac80211/mesh_hwmp.c | 20 +++++-----
net/mac80211/sta_info.c | 4 --
net/netlabel/netlabel_domainhash.c | 3 +-
net/netlabel/netlabel_unlabeled.c | 3 +-
scripts/bootgraph.pl | 2 +-
scripts/docproc.c | 17 +++------
scripts/gcc-goto.sh | 2 +-
security/keys/keyring.c | 1 -
sound/aoa/soundbus/i2sbus/core.c | 9 ++---
sound/atmel/abdac.c | 2 +-
sound/atmel/ac97c.c | 2 +-
sound/pci/ice1712/ice1712.c | 2 +-
sound/ppc/pmac.c | 9 ++---
sound/soc/ep93xx/ep93xx-i2s.c | 4 +-
sound/soc/ep93xx/ep93xx-pcm.c | 4 +-
sound/soc/ep93xx/snappercl15.c | 4 +-
sound/soc/fsl/mpc5200_dma.c | 2 +-
sound/soc/omap/ams-delta.c | 2 +-
389 files changed, 580 insertions(+), 690 deletions(-)
mode change 100755 => 100644 Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
^ permalink raw reply [flat|nested] 25+ messages in thread
* [GIT] trivial
@ 2011-05-23 12:33 Jiri Kosina
0 siblings, 0 replies; 25+ messages in thread
From: Jiri Kosina @ 2011-05-23 12:33 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
Linus,
please pull from 'for-linus' branch from
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-linus
to receive fixes queued in trivial tree for .40 merge window.
It's as usual mostly small typo fixes in comments and simple documentation
updates.
Thanks.
Alessio Igor Bogani (2):
ufs: Fix a typo
xtensa: remove obsolete BKL kernel option from defconfig
Antonio Ospite (1):
include/linux/leds-regulator.h: fix syntax in example code
Jean Delvare (1):
Haavard Skinnemoen has left Atmel
Jesper Juhl (3):
ARM: Remove duplicate linux/sched.h include from arch/arm/plat-iop/time.c
md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
Jim Cromie (2):
add printk.time=1 boot-time hint to Kconfig.debug help text
b43: fix comment typo reqest -> request
Jiri Kosina (3):
ath9k_hw: don't touch with treewide double semicolon removal
rtlwifi: don't touch with treewide double semicolon removal
Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
Joe Perches (4):
MAINTAINERS: Add "K:" pattern for trivial
arm: mach-u300/gpio: Fix mem_region resource size miscalculations
treewide: Fix iomap resource size miscalculations
treewide: cleanup continuations and remove logging message whitespace
Johannes Berg (1):
CREDITS: update Johannes Berg's gpg key
Jonathan Neuschäfer (1):
doc: timers-howto: fix a typo ("unsgined")
Justin P. Mattock (7):
doc: stable_api_nonsense.txt: fix paragraph to make more sense.
update David Miller's old email address
ibmasm: fix comment typo
treewide: remove extra semicolons
arch:Kconfig.locks Remove unused config option.
m68k: fix comment typo 'occcured'
treewide: fix a few typos in comments
Nikanth Karthikesan (4):
mm: Fix section mismatch for setup_zone_pageset()
cs5535: Fix section mismatch
ldm: Silence "ldm_validate_partition_table(): Disk read failed" when booting with "quiet"
sysfs-memory: fix uninitialized variable warning and clean-up code.
Paul Bolle (4):
doc: fix 3 typos in sysctl/vm.txt
openezx-devel is moderated for non-subscribers
drm: minor kref_put() nits
drm: radeon: Fix printk typo 'ib poll'
Rafi Rubin (1):
Kconfig: fix copy/paste-ism for dell-wmi-aio driver
Sarah Nadi (1):
cris: typo in mach-fs Makefile
Tony Jones (1):
audit: acquire creds selectively to reduce atomic op overhead
Uwe Kleine-König (2):
vsprintf: make comment about vs{n,cn,}printf more understandable
tty: fix typo in descripton of tty_termios_encode_baud_rate
Wanlong Gao (1):
regulator: change debug statement be consistent with the style of the rest
CREDITS | 2 +-
.../devicetree/bindings/powerpc/nintendo/wii.txt | 2 +-
Documentation/feature-removal-schedule.txt | 2 +-
Documentation/stable_api_nonsense.txt | 2 +-
Documentation/sysctl/vm.txt | 4 +-
Documentation/timers/timers-howto.txt | 2 +-
MAINTAINERS | 3 +-
arch/Kconfig | 3 --
arch/arm/mach-at91/at91cap9_devices.c | 2 +-
arch/arm/mach-at91/at91sam9g45_devices.c | 2 +-
arch/arm/mach-at91/at91sam9rl_devices.c | 2 +-
arch/arm/mach-msm/include/mach/msm_iomap.h | 2 +-
arch/arm/mach-omap2/control.h | 2 +-
arch/arm/mach-tegra/tegra2_clocks.c | 2 +-
arch/arm/mach-ux500/mbox-db5500.c | 6 +---
arch/arm/plat-iop/time.c | 1 -
arch/arm/plat-mxc/cpufreq.c | 4 +-
arch/cris/arch-v32/mach-fs/Makefile | 2 +-
arch/ia64/hp/common/sba_iommu.c | 2 +-
arch/m68k/include/asm/MC68EZ328.h | 2 +-
arch/m68k/include/asm/MC68VZ328.h | 2 +-
arch/mips/fw/arc/cmdline.c | 2 +-
arch/mips/fw/arc/env.c | 2 +-
arch/mips/fw/arc/identify.c | 2 +-
arch/mips/fw/arc/init.c | 2 +-
arch/mips/fw/arc/misc.c | 2 +-
arch/mips/fw/arc/salone.c | 2 +-
arch/mips/fw/arc/time.c | 2 +-
arch/mips/fw/arc/tree.c | 2 +-
arch/mips/include/asm/asmmacro-32.h | 2 +-
arch/mips/include/asm/asmmacro-64.h | 2 +-
arch/mips/include/asm/cpu.h | 2 +-
arch/mips/include/asm/r4kcache.h | 2 +-
arch/mips/include/asm/sgialib.h | 2 +-
arch/mips/include/asm/sgiarcs.h | 2 +-
arch/mips/kernel/octeon_switch.S | 2 +-
arch/mips/kernel/r2300_fpu.S | 2 +-
arch/mips/kernel/r2300_switch.S | 2 +-
arch/mips/kernel/r4k_fpu.S | 2 +-
arch/mips/kernel/r4k_switch.S | 2 +-
arch/mips/kernel/r6000_fpu.S | 2 +-
arch/mips/mm/c-r3k.c | 2 +-
arch/mips/mm/c-r4k.c | 2 +-
arch/mips/mm/c-tx39.c | 2 +-
arch/mips/mm/sc-ip22.c | 2 +-
arch/mips/mm/sc-r5k.c | 2 +-
arch/mips/mm/tlb-r3k.c | 2 +-
arch/mips/mm/tlb-r4k.c | 2 +-
arch/mips/mm/tlb-r8k.c | 2 +-
arch/mips/sgi-ip22/ip22-hpc.c | 2 +-
arch/mips/sgi-ip22/ip22-int.c | 2 +-
arch/mips/sgi-ip22/ip22-mc.c | 2 +-
arch/mips/sgi-ip22/ip22-setup.c | 2 +-
arch/powerpc/include/asm/pte-hash64-64k.h | 2 +-
arch/powerpc/kernel/kgdb.c | 2 +-
arch/s390/hypfs/hypfs.h | 2 +-
arch/um/drivers/mmapper_kern.c | 2 +-
arch/x86/xen/pci-swiotlb-xen.c | 2 +-
arch/xtensa/configs/s6105_defconfig | 1 -
drivers/acpi/acpica/utresrc.c | 2 +-
drivers/acpi/video.c | 2 +-
drivers/base/memory.c | 9 +++---
drivers/dma/dmatest.c | 6 ++--
drivers/dma/dw_dmac.c | 2 +-
drivers/firmware/efivars.c | 2 +-
drivers/firmware/iscsi_ibft.c | 4 +-
drivers/gpio/ab8500-gpio.c | 7 ++---
drivers/gpio/langwell_gpio.c | 2 +-
drivers/gpu/drm/radeon/radeon_fence.c | 2 +-
drivers/gpu/drm/radeon/radeon_ring.c | 2 +-
drivers/gpu/drm/ttm/ttm_object.c | 2 +-
drivers/i2c/busses/i2c-gpio.c | 2 +-
drivers/leds/leds-mc13783.c | 2 +-
drivers/macintosh/therm_pm72.c | 4 +-
drivers/md/raid5.c | 2 +-
drivers/media/dvb/dvb-usb/dw2102.c | 2 +-
drivers/media/video/msp3400-driver.c | 2 +-
drivers/media/video/saa7164/saa7164-encoder.c | 2 +-
drivers/media/video/saa7164/saa7164-vbi.c | 2 +-
drivers/media/video/usbvision/usbvision-video.c | 5 ++-
drivers/message/fusion/mptbase.c | 22 +++++++---------
drivers/message/i2o/README.ioctl | 2 +-
drivers/misc/bh1780gli.c | 8 +++---
drivers/misc/cs5535-mfgpt.c | 4 +-
drivers/misc/ibmasm/ibmasmfs.c | 2 +-
drivers/misc/spear13xx_pcie_gadget.c | 4 +-
drivers/mmc/host/atmel-mci.c | 2 +-
drivers/net/atlx/atl1.c | 5 ++-
drivers/net/can/pch_can.c | 2 +-
drivers/net/can/softing/softing_main.c | 2 +-
drivers/net/irda/ali-ircc.c | 2 +-
drivers/net/macb.c | 2 +-
drivers/net/s2io.c | 2 +-
drivers/net/sgiseeq.c | 2 +-
drivers/net/sgiseeq.h | 2 +-
drivers/net/ucc_geth_ethtool.c | 2 +-
drivers/net/usb/usbnet.c | 2 +-
drivers/net/wan/pc300_drv.c | 2 +-
drivers/net/wireless/airo.c | 27 ++++++++++---------
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 8 +++---
drivers/net/wireless/b43/b43.h | 4 +-
drivers/net/wireless/ipw2x00/ipw2200.c | 2 +-
drivers/net/wireless/iwlegacy/iwl-4965-calib.c | 4 +-
drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 4 +-
drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +-
drivers/net/wireless/rtlwifi/core.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 4 +-
drivers/platform/x86/Kconfig | 2 +-
drivers/power/intel_mid_battery.c | 2 +-
drivers/regulator/max8998.c | 4 +-
drivers/regulator/mc13783-regulator.c | 2 +-
drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c | 2 +-
drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h | 2 +-
drivers/scsi/be2iscsi/be_main.c | 4 +-
drivers/scsi/constants.c | 2 +-
drivers/scsi/esp_scsi.c | 2 +-
drivers/scsi/lpfc/lpfc_attr.c | 2 +-
drivers/scsi/lpfc/lpfc_bsg.c | 2 +-
drivers/scsi/lpfc/lpfc_hw.h | 2 +-
drivers/scsi/lpfc/lpfc_sli.c | 2 +-
drivers/scsi/nsp32_debug.c | 2 +-
drivers/scsi/pcmcia/nsp_debug.c | 2 +-
drivers/scsi/pm8001/pm8001_init.c | 2 +-
drivers/scsi/qla2xxx/qla_isr.c | 4 +-
drivers/scsi/qla4xxx/ql4_mbx.c | 2 +-
drivers/scsi/sgiwd93.c | 2 +-
drivers/spi/atmel_spi.c | 2 +-
drivers/target/target_core_alua.c | 4 +-
drivers/target/target_core_transport.c | 2 +-
drivers/tty/n_gsm.c | 2 +-
drivers/tty/serial/bfin_sport_uart.c | 3 +-
drivers/tty/serial/mfd.c | 4 +-
drivers/tty/serial/mrst_max3110.c | 2 +-
drivers/tty/tty_ioctl.c | 2 +-
drivers/usb/gadget/atmel_usba_udc.c | 2 +-
drivers/usb/host/imx21-dbg.c | 2 +-
drivers/usb/host/uhci-hcd.c | 7 +++--
drivers/usb/misc/usbtest.c | 2 +-
drivers/usb/storage/ene_ub6250.c | 4 +-
drivers/video/backlight/ltv350qv.c | 2 +-
drivers/video/console/newport_con.c | 2 +-
drivers/video/msm/mddi.c | 2 +-
drivers/video/mxsfb.c | 2 +-
drivers/watchdog/bcm63xx_wdt.c | 2 +-
drivers/xen/evtchn.c | 2 +-
drivers/xen/swiotlb-xen.c | 2 +-
fs/btrfs/relocation.c | 2 +-
fs/freevxfs/vxfs_inode.c | 2 +-
fs/logfs/readwrite.c | 2 +-
fs/nfsd/stats.c | 2 +-
fs/ocfs2/refcounttree.c | 2 +-
fs/partitions/ldm.c | 2 +-
fs/squashfs/Kconfig | 4 +-
fs/squashfs/cache.c | 2 +-
fs/ufs/inode.c | 2 +-
fs/xfs/xfs_inode.c | 2 +-
include/linux/leds-regulator.h | 2 +-
include/linux/posix-clock.h | 2 +-
include/net/genetlink.h | 2 +-
include/net/netlink.h | 2 +-
include/video/newport.h | 2 +-
kernel/Kconfig.locks | 2 +-
kernel/auditsc.c | 27 ++++++++++++-------
kernel/pm_qos_params.c | 2 +-
lib/Kconfig.debug | 3 +-
lib/vsprintf.c | 9 ++----
mm/hugetlb.c | 2 +-
mm/page_alloc.c | 2 +-
net/netfilter/ipset/ip_set_bitmap_ip.c | 2 +-
net/sunrpc/addr.c | 2 +-
net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 +-
scripts/checkstack.pl | 2 +-
security/selinux/selinuxfs.c | 8 +++---
tools/perf/util/ui/browsers/annotate.c | 1 -
tools/power/x86/turbostat/turbostat.c | 2 +-
175 files changed, 254 insertions(+), 257 deletions(-)
^ permalink raw reply [flat|nested] 25+ messages in thread
* [GIT] trivial
@ 2011-03-18 13:24 Jiri Kosina
0 siblings, 0 replies; 25+ messages in thread
From: Jiri Kosina @ 2011-03-18 13:24 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
Linus,
please pull from 'for-linus' branch from
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-linus
to receive merge window updates from trivial tree.
It's mostly documentation updates, comment/printk typo fixes, and a few
minor patches from respective maintainers in re-transmission mode (dcdbas,
edac).
You are going to get one super-simple conflict in fs/eventpoll.c, as the
context for 'toepoll_ctl -> to epoll_ctl' change has been changed in your
tree recently.
Thanks.
Alexander Kurz (1):
Documentation/filesystems/romfs.txt: fixing link to genromfs
Andrea Gelmini (1):
Documentation: dm-crypt: update cryptsetup homepage
Arvind R (4):
edac: i82975x author/maintainer email address change
edac: correct commented info
edac: correct i82975x mci initialisation
edac: correct i82975x error-info reported
Daniel Baluta (1):
fs/eventpoll.c: fix spelling
GeunSik Lim (1):
Update cpuset info & webiste for cgroups
Gilles Espinasse (1):
kbuild, mtd, net: a few comment typo fixes and rewording
Greg Thelen (1):
memcg: clarify use_hierarchy documentation
Harry Wei (1):
MAINTAINERS: fix sorting
Jesper Juhl (7):
GPU DRM: Remove unnecessary casts of void ptr returning alloc function return values
drivers/message/, i2o: Remove unnecessary casts of void ptr returning alloc function return values
scsi: Remove unnecessary casts of void ptr returning alloc function return values
Kill off warning: ‘inline’ is not at beginning of declaration
X86, Acer, WMI: Do not double include linux/dmi.h in acer-wmi.c
target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
serial, pch uart: Remove duplicate inclusion of linux/pci.h header
Jim Cromie (1):
replace obsolete CONFIG_DYNAMIC_PRINTK_DEBUG with CONFIG_DYNAMIC_DEBUG
Justin P. Mattock (8):
Comment typo fixes for 'descriptor'
fix typos 'comamnd' -> 'command' in comments
cris: fix comment typo occationally to occasionally
mbox-db5500.c Change initate to initiate.
coh901318.c: Change initate to initiate.
drivers:scsi Change printk typo initate -> initiate
Remove one to many n's in a word
arch/arm/Kconfig: remove one to many l's in the word.
Michael Witten (2):
Kconfig: Typo: seti -> set
Kconfig: BLK_THROTTLE -> BLK_DEV_THROTTLING
Michal Hocko (1):
doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
Namhyung Kim (2):
dio: fix typos in comments
fs: update comments to point correct document
Paul Bolle (9):
Documentation: default_message_level is a typo
x86: Fix printk typo WARING
hvcs: fix typo in comment
mISDN: fix printk typo fushing
fuse/cuse: fix comment typo initilaization
doc: Fix numbering of KVM API description sections
ext4: fix comment typo uninitized
drm: Fix printk typo 'failled'
drm: fix printk typo 'sracth'
Pete Zaitcev (1):
fix comment spelling becausse => because
Ryota Ozaki (1):
mm: Fix out-of-date comments which refers non-existent functions
Stuart Hayes (1):
dcdbas: force SMI to happen when expected
Tao Ma (1):
ext4: Fix comment typo "especiially".
Tobias Klauser (1):
asm-generic/user.h: Fix spelling in comment
Wolfram Sang (1):
MAINTAINERS: add second list for IRDA
Documentation/cgroups/cpusets.txt | 17 +++---
Documentation/cgroups/memory.txt | 5 +-
Documentation/device-mapper/dm-crypt.txt | 2 +-
Documentation/filesystems/romfs.txt | 3 +-
Documentation/kbuild/kbuild.txt | 2 +-
Documentation/kbuild/makefiles.txt | 3 +-
Documentation/kvm/api.txt | 96 ++++++++++++++--------------
Documentation/sysctl/kernel.txt | 2 +-
Documentation/vm/unevictable-lru.txt | 3 +-
MAINTAINERS | 15 +++--
Makefile | 2 +-
arch/alpha/include/asm/cacheflush.h | 2 +-
arch/arm/mach-ux500/mbox-db5500.c | 2 +-
arch/arm/plat-omap/Kconfig | 2 +-
arch/avr32/mm/cache.c | 2 +-
arch/cris/arch-v10/mm/init.c | 2 +-
arch/ia64/include/asm/perfmon.h | 2 +-
arch/x86/kernel/apic/io_apic.c | 2 +-
arch/x86/oprofile/op_model_p4.c | 2 +-
arch/xtensa/configs/s6105_defconfig | 2 +-
drivers/atm/firestream.c | 2 +-
drivers/block/smart1,2.h | 2 +-
drivers/bluetooth/btusb.c | 4 +-
drivers/cpuidle/sysfs.c | 2 +-
drivers/dma/coh901318.c | 4 +-
drivers/dma/shdma.c | 2 +-
drivers/dma/timb_dma.c | 2 +-
drivers/edac/i7300_edac.c | 2 +-
drivers/edac/i82975x_edac.c | 69 +++++++++++++--------
drivers/firmware/dcdbas.c | 4 +-
drivers/gpu/drm/drm_sman.c | 4 +-
drivers/gpu/drm/radeon/evergreen.c | 2 +-
drivers/gpu/drm/radeon/r100.c | 10 ++--
drivers/gpu/drm/radeon/r300.c | 4 +-
drivers/gpu/drm/radeon/r420.c | 4 +-
drivers/gpu/drm/radeon/r520.c | 4 +-
drivers/gpu/drm/radeon/r600.c | 2 +-
drivers/gpu/drm/radeon/radeon_ring.c | 2 +-
drivers/gpu/drm/radeon/rs400.c | 4 +-
drivers/gpu/drm/radeon/rs600.c | 4 +-
drivers/gpu/drm/radeon/rs690.c | 4 +-
drivers/gpu/drm/radeon/rv515.c | 4 +-
drivers/gpu/drm/radeon/rv770.c | 2 +-
drivers/isdn/mISDN/hwchannel.c | 6 +-
drivers/message/i2o/i2o_config.c | 3 +-
drivers/mtd/nand/mxc_nand.c | 5 +-
drivers/net/atl1c/atl1c.h | 4 +-
drivers/net/qla3xxx.c | 2 +-
drivers/net/sungem.h | 2 +-
drivers/net/wireless/ipw2x00/ipw2100.c | 2 +-
drivers/platform/x86/acer-wmi.c | 1 -
drivers/scsi/aic7xxx/aic79xx.h | 2 +-
drivers/scsi/aic7xxx/aic7xxx.h | 2 +-
drivers/scsi/aic7xxx/aic7xxx_core.c | 2 +-
drivers/scsi/megaraid.c | 4 +-
drivers/scsi/megaraid/megaraid_sas_base.c | 2 +-
drivers/scsi/osst.c | 10 +--
drivers/scsi/qla4xxx/ql4_isr.c | 2 +-
drivers/scsi/qla4xxx/ql4_os.c | 2 +-
drivers/target/target_core_hba.c | 1 -
drivers/tty/hvc/hvcs.c | 2 +-
drivers/tty/serial/pch_uart.c | 1 -
drivers/usb/core/hub.c | 2 +-
drivers/usb/host/uhci-hcd.c | 2 +-
drivers/usb/wusbcore/rh.c | 2 +-
drivers/watchdog/sbc_epx_c3.c | 2 +-
fs/btrfs/disk-io.c | 2 +-
fs/dcache.c | 4 +-
fs/direct-io.c | 6 +-
fs/eventpoll.c | 12 ++--
fs/ext4/extents.c | 4 +-
fs/fuse/cuse.c | 2 +-
fs/notify/fanotify/fanotify_user.c | 2 +-
fs/notify/inotify/inotify_user.c | 2 +-
fs/ocfs2/dir.c | 2 +-
include/asm-generic/user.h | 4 +-
include/linux/mmzone.h | 2 +-
init/Kconfig | 6 +-
kernel/trace/ring_buffer.c | 2 +-
mm/memory.c | 6 +-
mm/mempolicy.c | 2 +-
mm/shmem.c | 2 +-
net/core/dev_addr_lists.c | 4 +-
net/ipv6/inet6_hashtables.c | 2 +-
net/mac80211/tx.c | 2 +-
sound/pci/au88x0/au88x0.h | 4 +-
sound/pci/au88x0/au88x0_core.c | 4 +-
87 files changed, 232 insertions(+), 218 deletions(-)
^ permalink raw reply [flat|nested] 25+ messages in thread
* [GIT] trivial
@ 2011-01-12 8:49 Jiri Kosina
0 siblings, 0 replies; 25+ messages in thread
From: Jiri Kosina @ 2011-01-12 8:49 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
[-- Attachment #1: Type: TEXT/PLAIN, Size: 23818 bytes --]
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.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: TEXT/X-PATCH; NAME=resolution.patch, Size: 20664 bytes --]
diff --cc drivers/net/wireless/iwlwifi/iwl-legacy.c
index a08b4e5,0000000..bb1a742
mode 100644,000000..100644
--- a/drivers/net/wireless/iwlwifi/iwl-legacy.c
+++ b/drivers/net/wireless/iwlwifi/iwl-legacy.c
@@@ -1,662 -1,0 +1,662 @@@
+/******************************************************************************
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2008 - 2010 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
+ * USA
+ *
+ * The full GNU General Public License is included in this distribution
+ * in the file called LICENSE.GPL.
+ *
+ * Contact Information:
+ * Intel Linux Wireless <ilw@linux.intel.com>
+ * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+ *****************************************************************************/
+
+#include <linux/kernel.h>
+#include <net/mac80211.h>
+
+#include "iwl-dev.h"
+#include "iwl-core.h"
+#include "iwl-helpers.h"
+#include "iwl-legacy.h"
+
+static void iwl_update_qos(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
+{
+ if (test_bit(STATUS_EXIT_PENDING, &priv->status))
+ return;
+
+ if (!ctx->is_active)
+ return;
+
+ ctx->qos_data.def_qos_parm.qos_flags = 0;
+
+ if (ctx->qos_data.qos_active)
+ ctx->qos_data.def_qos_parm.qos_flags |=
+ QOS_PARAM_FLG_UPDATE_EDCA_MSK;
+
+ if (ctx->ht.enabled)
+ ctx->qos_data.def_qos_parm.qos_flags |= QOS_PARAM_FLG_TGN_MSK;
+
+ IWL_DEBUG_QOS(priv, "send QoS cmd with Qos active=%d FLAGS=0x%X\n",
+ ctx->qos_data.qos_active,
+ ctx->qos_data.def_qos_parm.qos_flags);
+
+ iwl_send_cmd_pdu_async(priv, ctx->qos_cmd,
+ sizeof(struct iwl_qosparam_cmd),
+ &ctx->qos_data.def_qos_parm, NULL);
+}
+
+/**
+ * iwl_legacy_mac_config - mac80211 config callback
+ */
+int iwl_legacy_mac_config(struct ieee80211_hw *hw, u32 changed)
+{
+ struct iwl_priv *priv = hw->priv;
+ const struct iwl_channel_info *ch_info;
+ struct ieee80211_conf *conf = &hw->conf;
+ struct ieee80211_channel *channel = conf->channel;
+ struct iwl_ht_config *ht_conf = &priv->current_ht_config;
+ struct iwl_rxon_context *ctx;
+ unsigned long flags = 0;
+ int ret = 0;
+ u16 ch;
+ int scan_active = 0;
+ bool ht_changed[NUM_IWL_RXON_CTX] = {};
+
+ if (WARN_ON(!priv->cfg->ops->legacy))
+ return -EOPNOTSUPP;
+
+ mutex_lock(&priv->mutex);
+
+ IWL_DEBUG_MAC80211(priv, "enter to channel %d changed 0x%X\n",
+ channel->hw_value, changed);
+
+ if (unlikely(!priv->cfg->mod_params->disable_hw_scan &&
+ test_bit(STATUS_SCANNING, &priv->status))) {
+ scan_active = 1;
+ IWL_DEBUG_MAC80211(priv, "leave - scanning\n");
+ }
+
+ if (changed & (IEEE80211_CONF_CHANGE_SMPS |
+ IEEE80211_CONF_CHANGE_CHANNEL)) {
+ /* mac80211 uses static for non-HT which is what we want */
+ priv->current_ht_config.smps = conf->smps_mode;
+
+ /*
+ * Recalculate chain counts.
+ *
+ * If monitor mode is enabled then mac80211 will
+ * set up the SM PS mode to OFF if an HT channel is
+ * configured.
+ */
+ if (priv->cfg->ops->hcmd->set_rxon_chain)
+ for_each_context(priv, ctx)
+ priv->cfg->ops->hcmd->set_rxon_chain(priv, ctx);
+ }
+
+ /* during scanning mac80211 will delay channel setting until
+ * scan finish with changed = 0
+ */
+ if (!changed || (changed & IEEE80211_CONF_CHANGE_CHANNEL)) {
+ if (scan_active)
+ goto set_ch_out;
+
+ ch = channel->hw_value;
+ ch_info = iwl_get_channel_info(priv, channel->band, ch);
+ if (!is_channel_valid(ch_info)) {
+ IWL_DEBUG_MAC80211(priv, "leave - invalid channel\n");
+ ret = -EINVAL;
+ goto set_ch_out;
+ }
+
+ spin_lock_irqsave(&priv->lock, flags);
+
+ for_each_context(priv, ctx) {
+ /* Configure HT40 channels */
+ if (ctx->ht.enabled != conf_is_ht(conf)) {
+ ctx->ht.enabled = conf_is_ht(conf);
+ ht_changed[ctx->ctxid] = true;
+ }
+ if (ctx->ht.enabled) {
+ if (conf_is_ht40_minus(conf)) {
+ ctx->ht.extension_chan_offset =
+ IEEE80211_HT_PARAM_CHA_SEC_BELOW;
+ ctx->ht.is_40mhz = true;
+ } else if (conf_is_ht40_plus(conf)) {
+ ctx->ht.extension_chan_offset =
+ IEEE80211_HT_PARAM_CHA_SEC_ABOVE;
+ ctx->ht.is_40mhz = true;
+ } else {
+ ctx->ht.extension_chan_offset =
+ IEEE80211_HT_PARAM_CHA_SEC_NONE;
+ ctx->ht.is_40mhz = false;
+ }
+ } else
+ ctx->ht.is_40mhz = false;
+
+ /*
+ * Default to no protection. Protection mode will
+ * later be set from BSS config in iwl_ht_conf
+ */
+ ctx->ht.protection = IEEE80211_HT_OP_MODE_PROTECTION_NONE;
+
+ /* if we are switching from ht to 2.4 clear flags
+ * from any ht related info since 2.4 does not
+ * support ht */
+ if ((le16_to_cpu(ctx->staging.channel) != ch))
+ ctx->staging.flags = 0;
+
+ iwl_set_rxon_channel(priv, channel, ctx);
+ iwl_set_rxon_ht(priv, ht_conf);
+
+ iwl_set_flags_for_band(priv, ctx, channel->band,
+ ctx->vif);
+ }
+
+ spin_unlock_irqrestore(&priv->lock, flags);
+
+ if (priv->cfg->ops->legacy->update_bcast_stations)
+ ret = priv->cfg->ops->legacy->update_bcast_stations(priv);
+
+ set_ch_out:
+ /* The list of supported rates and rate mask can be different
+ * for each band; since the band may have changed, reset
+ * the rate mask to what mac80211 lists */
+ iwl_set_rate(priv);
+ }
+
+ if (changed & (IEEE80211_CONF_CHANGE_PS |
+ IEEE80211_CONF_CHANGE_IDLE)) {
+ ret = iwl_power_update_mode(priv, false);
+ if (ret)
+ IWL_DEBUG_MAC80211(priv, "Error setting sleep level\n");
+ }
+
+ if (changed & IEEE80211_CONF_CHANGE_POWER) {
+ IWL_DEBUG_MAC80211(priv, "TX Power old=%d new=%d\n",
+ priv->tx_power_user_lmt, conf->power_level);
+
+ iwl_set_tx_power(priv, conf->power_level, false);
+ }
+
+ if (!iwl_is_ready(priv)) {
+ IWL_DEBUG_MAC80211(priv, "leave - not ready\n");
+ goto out;
+ }
+
+ if (scan_active)
+ goto out;
+
+ for_each_context(priv, ctx) {
+ if (memcmp(&ctx->active, &ctx->staging, sizeof(ctx->staging)))
+ iwlcore_commit_rxon(priv, ctx);
+ else
+ IWL_DEBUG_INFO(priv,
+ "Not re-sending same RXON configuration.\n");
+ if (ht_changed[ctx->ctxid])
+ iwl_update_qos(priv, ctx);
+ }
+
+out:
+ IWL_DEBUG_MAC80211(priv, "leave\n");
+ mutex_unlock(&priv->mutex);
+ return ret;
+}
+EXPORT_SYMBOL(iwl_legacy_mac_config);
+
+void iwl_legacy_mac_reset_tsf(struct ieee80211_hw *hw)
+{
+ struct iwl_priv *priv = hw->priv;
+ unsigned long flags;
+ /* IBSS can only be the IWL_RXON_CTX_BSS context */
+ struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
+
+ if (WARN_ON(!priv->cfg->ops->legacy))
+ return;
+
+ mutex_lock(&priv->mutex);
+ IWL_DEBUG_MAC80211(priv, "enter\n");
+
+ spin_lock_irqsave(&priv->lock, flags);
+ memset(&priv->current_ht_config, 0, sizeof(struct iwl_ht_config));
+ spin_unlock_irqrestore(&priv->lock, flags);
+
+ spin_lock_irqsave(&priv->lock, flags);
+
+ /* new association get rid of ibss beacon skb */
+ if (priv->beacon_skb)
+ dev_kfree_skb(priv->beacon_skb);
+
+ priv->beacon_skb = NULL;
+
+ priv->timestamp = 0;
+
+ spin_unlock_irqrestore(&priv->lock, flags);
+
+ iwl_scan_cancel_timeout(priv, 100);
+ if (!iwl_is_ready_rf(priv)) {
+ IWL_DEBUG_MAC80211(priv, "leave - not ready\n");
+ mutex_unlock(&priv->mutex);
+ return;
+ }
+
+ /* we are restarting association process
+ * clear RXON_FILTER_ASSOC_MSK bit
+ */
+ ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
+ iwlcore_commit_rxon(priv, ctx);
+
+ iwl_set_rate(priv);
+
+ mutex_unlock(&priv->mutex);
+
+ IWL_DEBUG_MAC80211(priv, "leave\n");
+}
+EXPORT_SYMBOL(iwl_legacy_mac_reset_tsf);
+
+static void iwl_ht_conf(struct iwl_priv *priv,
+ struct ieee80211_vif *vif)
+{
+ struct iwl_ht_config *ht_conf = &priv->current_ht_config;
+ struct ieee80211_sta *sta;
+ struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
+ struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif);
+
+ IWL_DEBUG_ASSOC(priv, "enter:\n");
+
+ if (!ctx->ht.enabled)
+ return;
+
+ ctx->ht.protection =
+ bss_conf->ht_operation_mode & IEEE80211_HT_OP_MODE_PROTECTION;
+ ctx->ht.non_gf_sta_present =
+ !!(bss_conf->ht_operation_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT);
+
+ ht_conf->single_chain_sufficient = false;
+
+ switch (vif->type) {
+ case NL80211_IFTYPE_STATION:
+ rcu_read_lock();
+ sta = ieee80211_find_sta(vif, bss_conf->bssid);
+ if (sta) {
+ struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;
+ int maxstreams;
+
+ maxstreams = (ht_cap->mcs.tx_params &
+ IEEE80211_HT_MCS_TX_MAX_STREAMS_MASK)
+ >> IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT;
+ maxstreams += 1;
+
+ if ((ht_cap->mcs.rx_mask[1] == 0) &&
+ (ht_cap->mcs.rx_mask[2] == 0))
+ ht_conf->single_chain_sufficient = true;
+ if (maxstreams <= 1)
+ ht_conf->single_chain_sufficient = true;
+ } else {
+ /*
+ * If at all, this can only happen through a race
+ * when the AP disconnects us while we're still
+ * setting up the connection, in that case mac80211
+ * will soon tell us about that.
+ */
+ ht_conf->single_chain_sufficient = true;
+ }
+ rcu_read_unlock();
+ break;
+ case NL80211_IFTYPE_ADHOC:
+ ht_conf->single_chain_sufficient = true;
+ break;
+ default:
+ break;
+ }
+
+ IWL_DEBUG_ASSOC(priv, "leave\n");
+}
+
+static inline void iwl_set_no_assoc(struct iwl_priv *priv,
+ struct ieee80211_vif *vif)
+{
+ struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif);
+
+ iwl_led_disassociate(priv);
+ /*
+ * inform the ucode that there is no longer an
+ * association and that no more packets should be
+ * sent
+ */
+ ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
+ ctx->staging.assoc_id = 0;
+ iwlcore_commit_rxon(priv, ctx);
+}
+
+static void iwlcore_beacon_update(struct ieee80211_hw *hw,
+ struct ieee80211_vif *vif)
+{
+ struct iwl_priv *priv = hw->priv;
+ unsigned long flags;
+ __le64 timestamp;
+ struct sk_buff *skb = ieee80211_beacon_get(hw, vif);
+
+ if (!skb)
+ return;
+
+ IWL_DEBUG_MAC80211(priv, "enter\n");
+
+ lockdep_assert_held(&priv->mutex);
+
+ if (!priv->beacon_ctx) {
+ IWL_ERR(priv, "update beacon but no beacon context!\n");
+ dev_kfree_skb(skb);
+ return;
+ }
+
+ spin_lock_irqsave(&priv->lock, flags);
+
+ if (priv->beacon_skb)
+ dev_kfree_skb(priv->beacon_skb);
+
+ priv->beacon_skb = skb;
+
+ timestamp = ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp;
+ priv->timestamp = le64_to_cpu(timestamp);
+
+ IWL_DEBUG_MAC80211(priv, "leave\n");
+ spin_unlock_irqrestore(&priv->lock, flags);
+
+ if (!iwl_is_ready_rf(priv)) {
+ IWL_DEBUG_MAC80211(priv, "leave - RF not ready\n");
+ return;
+ }
+
+ priv->cfg->ops->legacy->post_associate(priv);
+}
+
+void iwl_legacy_mac_bss_info_changed(struct ieee80211_hw *hw,
+ struct ieee80211_vif *vif,
+ struct ieee80211_bss_conf *bss_conf,
+ u32 changes)
+{
+ struct iwl_priv *priv = hw->priv;
+ struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif);
+ int ret;
+
+ if (WARN_ON(!priv->cfg->ops->legacy))
+ return;
+
+ IWL_DEBUG_MAC80211(priv, "changes = 0x%X\n", changes);
+
+ if (!iwl_is_alive(priv))
+ return;
+
+ mutex_lock(&priv->mutex);
+
+ if (changes & BSS_CHANGED_QOS) {
+ unsigned long flags;
+
+ spin_lock_irqsave(&priv->lock, flags);
+ ctx->qos_data.qos_active = bss_conf->qos;
+ iwl_update_qos(priv, ctx);
+ spin_unlock_irqrestore(&priv->lock, flags);
+ }
+
+ if (changes & BSS_CHANGED_BEACON_ENABLED) {
+ /*
+ * the add_interface code must make sure we only ever
+ * have a single interface that could be beaconing at
+ * any time.
+ */
+ if (vif->bss_conf.enable_beacon)
+ priv->beacon_ctx = ctx;
+ else
+ priv->beacon_ctx = NULL;
+ }
+
+ if (changes & BSS_CHANGED_BEACON && vif->type == NL80211_IFTYPE_AP) {
+ dev_kfree_skb(priv->beacon_skb);
+ priv->beacon_skb = ieee80211_beacon_get(hw, vif);
+ }
+
+ if (changes & BSS_CHANGED_BEACON_INT && vif->type == NL80211_IFTYPE_AP)
+ iwl_send_rxon_timing(priv, ctx);
+
+ if (changes & BSS_CHANGED_BSSID) {
+ IWL_DEBUG_MAC80211(priv, "BSSID %pM\n", bss_conf->bssid);
+
+ /*
+ * If there is currently a HW scan going on in the
+ * background then we need to cancel it else the RXON
+ * below/in post_associate will fail.
+ */
+ if (iwl_scan_cancel_timeout(priv, 100)) {
+ IWL_WARN(priv, "Aborted scan still in progress after 100ms\n");
+ IWL_DEBUG_MAC80211(priv, "leaving - scan abort failed.\n");
+ mutex_unlock(&priv->mutex);
+ return;
+ }
+
+ /* mac80211 only sets assoc when in STATION mode */
+ if (vif->type == NL80211_IFTYPE_ADHOC || bss_conf->assoc) {
+ memcpy(ctx->staging.bssid_addr,
+ bss_conf->bssid, ETH_ALEN);
+
+ /* currently needed in a few places */
+ memcpy(priv->bssid, bss_conf->bssid, ETH_ALEN);
+ } else {
+ ctx->staging.filter_flags &=
+ ~RXON_FILTER_ASSOC_MSK;
+ }
+
+ }
+
+ /*
+ * This needs to be after setting the BSSID in case
+ * mac80211 decides to do both changes at once because
+ * it will invoke post_associate.
+ */
+ if (vif->type == NL80211_IFTYPE_ADHOC && changes & BSS_CHANGED_BEACON)
+ iwlcore_beacon_update(hw, vif);
+
+ if (changes & BSS_CHANGED_ERP_PREAMBLE) {
+ IWL_DEBUG_MAC80211(priv, "ERP_PREAMBLE %d\n",
+ bss_conf->use_short_preamble);
+ if (bss_conf->use_short_preamble)
+ ctx->staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;
+ else
+ ctx->staging.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;
+ }
+
+ if (changes & BSS_CHANGED_ERP_CTS_PROT) {
+ IWL_DEBUG_MAC80211(priv, "ERP_CTS %d\n", bss_conf->use_cts_prot);
+ if (bss_conf->use_cts_prot && (priv->band != IEEE80211_BAND_5GHZ))
+ ctx->staging.flags |= RXON_FLG_TGG_PROTECT_MSK;
+ else
+ ctx->staging.flags &= ~RXON_FLG_TGG_PROTECT_MSK;
+ if (bss_conf->use_cts_prot)
+ ctx->staging.flags |= RXON_FLG_SELF_CTS_EN;
+ else
+ ctx->staging.flags &= ~RXON_FLG_SELF_CTS_EN;
+ }
+
+ if (changes & BSS_CHANGED_BASIC_RATES) {
+ /* XXX use this information
+ *
+ * To do that, remove code from iwl_set_rate() and put something
+ * like this here:
+ *
+ if (A-band)
+ ctx->staging.ofdm_basic_rates =
+ bss_conf->basic_rates;
+ else
+ ctx->staging.ofdm_basic_rates =
+ bss_conf->basic_rates >> 4;
+ ctx->staging.cck_basic_rates =
+ bss_conf->basic_rates & 0xF;
+ */
+ }
+
+ if (changes & BSS_CHANGED_HT) {
+ iwl_ht_conf(priv, vif);
+
+ if (priv->cfg->ops->hcmd->set_rxon_chain)
+ priv->cfg->ops->hcmd->set_rxon_chain(priv, ctx);
+ }
+
+ if (changes & BSS_CHANGED_ASSOC) {
+ IWL_DEBUG_MAC80211(priv, "ASSOC %d\n", bss_conf->assoc);
+ if (bss_conf->assoc) {
+ priv->timestamp = bss_conf->timestamp;
+
+ iwl_led_associate(priv);
+
+ if (!iwl_is_rfkill(priv))
+ priv->cfg->ops->legacy->post_associate(priv);
+ } else
+ iwl_set_no_assoc(priv, vif);
+ }
+
+ if (changes && iwl_is_associated_ctx(ctx) && bss_conf->aid) {
+ IWL_DEBUG_MAC80211(priv, "Changes (%#x) while associated\n",
+ changes);
+ ret = iwl_send_rxon_assoc(priv, ctx);
+ if (!ret) {
+ /* Sync active_rxon with latest change. */
+ memcpy((void *)&ctx->active,
+ &ctx->staging,
+ sizeof(struct iwl_rxon_cmd));
+ }
+ }
+
+ if (changes & BSS_CHANGED_BEACON_ENABLED) {
+ if (vif->bss_conf.enable_beacon) {
+ memcpy(ctx->staging.bssid_addr,
+ bss_conf->bssid, ETH_ALEN);
+ memcpy(priv->bssid, bss_conf->bssid, ETH_ALEN);
+ iwl_led_associate(priv);
+ priv->cfg->ops->legacy->config_ap(priv);
+ } else
+ iwl_set_no_assoc(priv, vif);
+ }
+
+ if (changes & BSS_CHANGED_IBSS) {
+ ret = priv->cfg->ops->legacy->manage_ibss_station(priv, vif,
+ bss_conf->ibss_joined);
+ if (ret)
+ IWL_ERR(priv, "failed to %s IBSS station %pM\n",
+ bss_conf->ibss_joined ? "add" : "remove",
+ bss_conf->bssid);
+ }
+
+ mutex_unlock(&priv->mutex);
+
+ IWL_DEBUG_MAC80211(priv, "leave\n");
+}
+EXPORT_SYMBOL(iwl_legacy_mac_bss_info_changed);
+
+irqreturn_t iwl_isr_legacy(int irq, void *data)
+{
+ struct iwl_priv *priv = data;
+ u32 inta, inta_mask;
+ u32 inta_fh;
+ unsigned long flags;
+ if (!priv)
+ return IRQ_NONE;
+
+ spin_lock_irqsave(&priv->lock, flags);
+
+ /* Disable (but don't clear!) interrupts here to avoid
+ * back-to-back ISRs and sporadic interrupts from our NIC.
+ * If we have something to service, the tasklet will re-enable ints.
+ * If we *don't* have something, we'll re-enable before leaving here. */
+ inta_mask = iwl_read32(priv, CSR_INT_MASK); /* just for debug */
+ iwl_write32(priv, CSR_INT_MASK, 0x00000000);
+
+ /* Discover which interrupts are active/pending */
+ inta = iwl_read32(priv, CSR_INT);
+ inta_fh = iwl_read32(priv, CSR_FH_INT_STATUS);
+
+ /* Ignore interrupt if there's nothing in NIC to service.
+ * This may be due to IRQ shared with another device,
+ * or due to sporadic interrupts thrown from our NIC. */
+ if (!inta && !inta_fh) {
+ IWL_DEBUG_ISR(priv,
+ "Ignore interrupt, inta == 0, inta_fh == 0\n");
+ goto none;
+ }
+
+ if ((inta == 0xFFFFFFFF) || ((inta & 0xFFFFFFF0) == 0xa5a5a5a0)) {
+ /* Hardware disappeared. It might have already raised
+ * an interrupt */
+ IWL_WARN(priv, "HARDWARE GONE?? INTA == 0x%08x\n", inta);
+ goto unplugged;
+ }
+
+ IWL_DEBUG_ISR(priv, "ISR inta 0x%08x, enabled 0x%08x, fh 0x%08x\n",
+ inta, inta_mask, inta_fh);
+
+ inta &= ~CSR_INT_BIT_SCD;
+
+ /* iwl_irq_tasklet() will service interrupts and re-enable them */
+ if (likely(inta || inta_fh))
+ tasklet_schedule(&priv->irq_tasklet);
+
+unplugged:
+ spin_unlock_irqrestore(&priv->lock, flags);
+ return IRQ_HANDLED;
+
+none:
+ /* re-enable interrupts here since we don't have anything to service. */
- /* only Re-enable if diabled by irq */
++ /* only Re-enable if disabled by irq */
+ if (test_bit(STATUS_INT_ENABLED, &priv->status))
+ iwl_enable_interrupts(priv);
+ spin_unlock_irqrestore(&priv->lock, flags);
+ return IRQ_NONE;
+}
+EXPORT_SYMBOL(iwl_isr_legacy);
+
+/*
+ * iwl_legacy_tx_cmd_protection: Set rts/cts. 3945 and 4965 only share this
+ * function.
+ */
+void iwl_legacy_tx_cmd_protection(struct iwl_priv *priv,
+ struct ieee80211_tx_info *info,
+ __le16 fc, __le32 *tx_flags)
+{
+ if (info->control.rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS) {
+ *tx_flags |= TX_CMD_FLG_RTS_MSK;
+ *tx_flags &= ~TX_CMD_FLG_CTS_MSK;
+ *tx_flags |= TX_CMD_FLG_FULL_TXOP_PROT_MSK;
+
+ if (!ieee80211_is_mgmt(fc))
+ return;
+
+ switch (fc & cpu_to_le16(IEEE80211_FCTL_STYPE)) {
+ case cpu_to_le16(IEEE80211_STYPE_AUTH):
+ case cpu_to_le16(IEEE80211_STYPE_DEAUTH):
+ case cpu_to_le16(IEEE80211_STYPE_ASSOC_REQ):
+ case cpu_to_le16(IEEE80211_STYPE_REASSOC_REQ):
+ *tx_flags &= ~TX_CMD_FLG_RTS_MSK;
+ *tx_flags |= TX_CMD_FLG_CTS_MSK;
+ break;
+ }
+ } else if (info->control.rates[0].flags &
+ IEEE80211_TX_RC_USE_CTS_PROTECT) {
+ *tx_flags &= ~TX_CMD_FLG_RTS_MSK;
+ *tx_flags |= TX_CMD_FLG_CTS_MSK;
+ *tx_flags |= TX_CMD_FLG_FULL_TXOP_PROT_MSK;
+ }
+}
+EXPORT_SYMBOL(iwl_legacy_tx_cmd_protection);
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [GIT] trivial
2010-10-24 20:47 ` Linus Torvalds
@ 2010-10-24 21:37 ` Jiri Kosina
0 siblings, 0 replies; 25+ messages in thread
From: Jiri Kosina @ 2010-10-24 21:37 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
On Sun, 24 Oct 2010, Linus Torvalds wrote:
> > please pull from 'for-next' branch at
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-next
>
> Pulled. With one modification: I didn't take the top merge commit.
>
> I _really_ prefer to see the clashes myself, and the extra merges just
> make history less readable. So if the conflicts are trivial, please
> don't pre-merge stuff - it just hides things from me.
>
> Now, admittedly the things it hides shouldn't matter for something
> like the trivial tree, but at the same time, exactly because it's the
> trivial tree I would also expect the conflicts to be really trivial,
> so I'd rather just have people follow the general rule of "please
> don't pre-merge" regardless.
>
> It's a good idea to perhaps do a private merge just to see how nasty
> things are, and to perhaps give me a heads-up (and maybe even export
> the pre-merged thing as a "btw, if you're lazy and don't care about
> the conflicts, you can pull this other pre-merged branch" branch). But
> on the whole, I tend to find the conflicts to be the most telling
> parts of any merge, and be a good hint about what development trees
> clashed with each other.
OK, I always do private merge with your latest tree to see what actually
happens, and only merge with latest state of your tree whenever there is
conflict. But deferring this to you (with warning in the pull request) is
obviously fine with me as well.
--
Jiri Kosina
SUSE Labs, Novell Inc.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [GIT] trivial
2010-10-23 21:39 Jiri Kosina
@ 2010-10-24 20:47 ` Linus Torvalds
2010-10-24 21:37 ` Jiri Kosina
0 siblings, 1 reply; 25+ messages in thread
From: Linus Torvalds @ 2010-10-24 20:47 UTC (permalink / raw)
To: Jiri Kosina; +Cc: linux-kernel
On Sat, Oct 23, 2010 at 2:39 PM, Jiri Kosina <jkosina@suse.cz> wrote:
>
> please pull from 'for-next' branch at
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-next
Pulled. With one modification: I didn't take the top merge commit.
I _really_ prefer to see the clashes myself, and the extra merges just
make history less readable. So if the conflicts are trivial, please
don't pre-merge stuff - it just hides things from me.
Now, admittedly the things it hides shouldn't matter for something
like the trivial tree, but at the same time, exactly because it's the
trivial tree I would also expect the conflicts to be really trivial,
so I'd rather just have people follow the general rule of "please
don't pre-merge" regardless.
It's a good idea to perhaps do a private merge just to see how nasty
things are, and to perhaps give me a heads-up (and maybe even export
the pre-merged thing as a "btw, if you're lazy and don't care about
the conflicts, you can pull this other pre-merged branch" branch). But
on the whole, I tend to find the conflicts to be the most telling
parts of any merge, and be a good hint about what development trees
clashed with each other.
Linus
^ permalink raw reply [flat|nested] 25+ messages in thread
* [GIT] trivial
@ 2010-10-23 21:39 Jiri Kosina
2010-10-24 20:47 ` Linus Torvalds
0 siblings, 1 reply; 25+ messages in thread
From: Jiri Kosina @ 2010-10-23 21:39 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
Linus,
please pull from 'for-next' branch at
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-next
to receive patches queued in trivial tree. Mostly spelling fixes, removals
of unnecessary casts and update of broken URLs all over the tree.
Anton Blanchard (1):
Fix spelling mistake in jhash
H Hartley Sweeten (2):
arm: scoop.c: remove C99 comments
arm: uengine.c: remove C99 comments
Jiri Kosina (4):
paravirt: noreplace-paravirt is implemented for x86 and ia-64
Revert "drivers/usb: Remove unnecessary return's from void functions" partially
Revert "Fix typo: configuation => configuration" partially
Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
Joe Perches (9):
drivers/usb: Remove unnecessary return's from void functions
fs/seq_file.c: Remove unnecessary casts of private_data
fs/ecryptfs: Remove unnecessary casts of private_data
kernel/pm_qos_params.c: Remove unnecessary casts of private_data
drivers/gpu/drm: Remove unnecessary casts of private_data
drivers/infiniband: Remove unnecessary casts of private_data
net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
drivers/s390: Remove unnecessary casts of private_data
drivers/scsi: Remove unnecessary casts of private_data
Justin P. Mattock (5):
vesafb: fix comment a typo
include/video/vga.h: update web address.
MAINTAINERS: update broken web address
Update broken web addresses in the kernel.
Update broken web addresses in arch directory.
Namhyung Kim (3):
fix a typo on comments in mm/percpu.c
ext2: fix a typo on comment in ext2/inode.c
ida: document IDA_BITMAP_LONGS calculation
Naohiro Aota (2):
idr: fix kernel-doc warnings.
idr: describe how nextidp works in idr_get_next().
Niels de Vos (1):
parport_pc: show the detection of a 2 serial port ITE8874 chip
Nikanth Karthikesan (3):
Fix typo s/contenious/continuous in comment
Doc: Fix typo s/packages/packaged
Fix various typos of valid in comments
Paul Bolle (1):
fix printk typo 'faild'
Stefan Weil (2):
Fix spelling fuction -> function in comments
Doc: Fix spelling
Stephan Sperber (1):
Kconfig: delete duplicate word
Tao Ma (1):
Use kzalloc in idedisk_prep_fn.
Thomas Weber (4):
Fix typo in Kconfig help text
Fix typo interrest[ing|ed] => interest[ing|ed]
Fix typo: configuation => configuration
Fix typo configue => configure in comments
Documentation/arm/SA1100/FreeBird | 4 ++--
Documentation/kernel-parameters.txt | 2 +-
Documentation/vm/numa_memory_policy.txt | 2 +-
MAINTAINERS | 2 +-
arch/arm/Kconfig | 2 +-
arch/arm/common/icst.c | 2 +-
arch/arm/common/scoop.c | 12 ++++++------
arch/arm/common/uengine.c | 18 +++++++++---------
arch/arm/include/asm/hardware/icst.h | 2 +-
arch/arm/mach-at91/Kconfig | 6 +++---
arch/arm/mach-omap1/Kconfig | 2 +-
arch/arm/mach-omap2/hsmmc.h | 2 +-
arch/arm/mach-s3c2440/mach-at2440evb.c | 2 +-
arch/arm/mach-sa1100/Kconfig | 6 +++---
arch/arm/mach-sa1100/cpu-sa1100.c | 2 +-
arch/arm/nwfpe/milieu.h | 4 ++--
arch/arm/nwfpe/softfloat-macros | 4 ++--
arch/arm/nwfpe/softfloat-specialize | 4 ++--
arch/arm/nwfpe/softfloat.c | 4 ++--
arch/arm/nwfpe/softfloat.h | 4 ++--
arch/arm/plat-samsung/include/plat/adc.h | 2 +-
arch/avr32/Kconfig | 2 +-
arch/blackfin/mach-bf527/boards/ezkit.c | 2 +-
arch/blackfin/mach-bf537/boards/stamp.c | 2 +-
arch/h8300/Kconfig.cpu | 8 ++++----
arch/h8300/README | 1 +
arch/m32r/Kconfig | 2 +-
arch/m68k/mac/macboing.c | 3 ++-
arch/m68k/q40/README | 2 +-
arch/mips/Kconfig | 12 ++++++++----
arch/mips/math-emu/cp1emu.c | 1 -
arch/mips/math-emu/dp_add.c | 1 -
arch/mips/math-emu/dp_cmp.c | 1 -
arch/mips/math-emu/dp_div.c | 1 -
arch/mips/math-emu/dp_fint.c | 1 -
arch/mips/math-emu/dp_flong.c | 1 -
arch/mips/math-emu/dp_frexp.c | 1 -
arch/mips/math-emu/dp_fsp.c | 1 -
arch/mips/math-emu/dp_logb.c | 1 -
arch/mips/math-emu/dp_modf.c | 1 -
arch/mips/math-emu/dp_mul.c | 1 -
arch/mips/math-emu/dp_scalb.c | 1 -
arch/mips/math-emu/dp_simple.c | 1 -
arch/mips/math-emu/dp_sqrt.c | 1 -
arch/mips/math-emu/dp_sub.c | 1 -
arch/mips/math-emu/dp_tint.c | 1 -
arch/mips/math-emu/dp_tlong.c | 1 -
arch/mips/math-emu/ieee754.c | 1 -
arch/mips/math-emu/ieee754.h | 1 -
arch/mips/math-emu/ieee754d.c | 1 -
arch/mips/math-emu/ieee754dp.c | 1 -
arch/mips/math-emu/ieee754dp.h | 1 -
arch/mips/math-emu/ieee754int.h | 1 -
arch/mips/math-emu/ieee754m.c | 1 -
arch/mips/math-emu/ieee754sp.c | 1 -
arch/mips/math-emu/ieee754sp.h | 1 -
arch/mips/math-emu/ieee754xcpt.c | 1 -
arch/mips/math-emu/sp_add.c | 1 -
arch/mips/math-emu/sp_cmp.c | 1 -
arch/mips/math-emu/sp_div.c | 1 -
arch/mips/math-emu/sp_fdp.c | 1 -
arch/mips/math-emu/sp_fint.c | 1 -
arch/mips/math-emu/sp_flong.c | 1 -
arch/mips/math-emu/sp_frexp.c | 1 -
arch/mips/math-emu/sp_logb.c | 1 -
arch/mips/math-emu/sp_modf.c | 1 -
arch/mips/math-emu/sp_mul.c | 1 -
arch/mips/math-emu/sp_scalb.c | 1 -
arch/mips/math-emu/sp_simple.c | 1 -
arch/mips/math-emu/sp_sqrt.c | 1 -
arch/mips/math-emu/sp_sub.c | 1 -
arch/mips/math-emu/sp_tint.c | 1 -
arch/mips/math-emu/sp_tlong.c | 1 -
arch/mips/pci/fixup-fuloong2e.c | 2 +-
arch/mips/sibyte/common/sb_tbprof.c | 2 +-
arch/powerpc/include/asm/hydra.h | 2 +-
arch/x86/kernel/apm_32.c | 4 ++--
arch/x86/kernel/microcode_core.c | 2 +-
arch/x86/kernel/microcode_intel.c | 2 +-
arch/xtensa/include/asm/uaccess.h | 2 +-
block/blk-core.c | 2 +-
drivers/ata/pata_bf54x.c | 2 +-
drivers/ata/pata_it821x.c | 4 ++--
drivers/atm/Kconfig | 2 +-
drivers/base/core.c | 2 +-
drivers/char/agp/Kconfig | 2 +-
drivers/char/agp/i460-agp.c | 2 +-
drivers/char/apm-emulation.c | 4 ++--
drivers/char/ipmi/ipmi_bt_sm.c | 2 +-
drivers/char/ipmi/ipmi_si_intf.c | 3 +--
drivers/char/n_r3964.c | 1 -
drivers/char/pcmcia/Kconfig | 4 ++--
drivers/char/pcmcia/cm4000_cs.c | 2 +-
drivers/char/stallion.c | 4 ++--
drivers/char/tpm/Kconfig | 2 +-
drivers/char/tpm/tpm_infineon.c | 2 +-
drivers/edac/edac_device_sysfs.c | 2 +-
drivers/edac/i82443bxgx_edac.c | 2 +-
drivers/firmware/Kconfig | 3 ++-
drivers/firmware/edd.c | 2 +-
drivers/firmware/pcdp.h | 4 ++--
drivers/gpu/drm/drm_modes.c | 2 +-
drivers/gpu/drm/radeon/radeon_cs.c | 2 +-
drivers/gpu/drm/radeon/radeon_ttm.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 2 +-
drivers/hwmon/adm1025.c | 2 +-
drivers/hwmon/adm1026.c | 2 +-
drivers/hwmon/f75375s.c | 4 ++--
drivers/hwmon/g760a.c | 2 +-
drivers/hwmon/hwmon-vid.c | 2 +-
drivers/ide/hpt366.c | 2 +-
drivers/ide/ht6560b.c | 1 -
drivers/ide/ide-disk.c | 3 +--
drivers/infiniband/Kconfig | 4 ++--
drivers/infiniband/hw/cxgb3/Kconfig | 2 +-
drivers/infiniband/hw/cxgb4/Kconfig | 2 +-
drivers/infiniband/hw/qib/qib_file_ops.c | 4 ++--
drivers/infiniband/ulp/iser/Kconfig | 2 +-
drivers/input/joystick/gamecon.c | 3 +--
drivers/input/misc/cm109.c | 2 +-
drivers/input/mouse/Kconfig | 1 +
drivers/input/mouse/touchkit_ps2.c | 4 ++--
drivers/input/touchscreen/mk712.c | 2 +-
drivers/isdn/i4l/isdn_audio.c | 2 +-
drivers/macintosh/therm_adt746x.c | 6 +++---
drivers/media/IR/keymaps/rc-manli.c | 1 -
drivers/media/dvb/ttpci/av7110.c | 9 ++-------
drivers/media/dvb/ttpci/av7110_av.c | 2 +-
drivers/media/dvb/ttpci/av7110_ca.c | 2 +-
drivers/media/dvb/ttpci/av7110_hw.c | 2 +-
drivers/media/dvb/ttpci/av7110_v4l.c | 2 +-
drivers/media/dvb/ttpci/budget-av.c | 2 +-
drivers/media/dvb/ttpci/budget-ci.c | 2 +-
drivers/media/dvb/ttpci/budget-core.c | 2 +-
drivers/media/dvb/ttpci/budget-patch.c | 2 +-
drivers/media/dvb/ttpci/budget.c | 2 +-
drivers/media/radio/radio-maxiradio.c | 2 +-
drivers/media/radio/radio-typhoon.c | 3 ---
drivers/media/video/Kconfig | 2 +-
drivers/media/video/cafe_ccic.c | 2 +-
drivers/media/video/cx18/cx18-cards.c | 2 +-
drivers/media/video/cx23885/cx23885-417.c | 2 +-
drivers/media/video/cx88/cx88-blackbird.c | 2 +-
drivers/media/video/ivtv/ivtv-cards.c | 2 +-
drivers/media/video/mxb.c | 2 +-
drivers/media/video/sn9c102/sn9c102_pas202bcb.c | 1 -
drivers/media/video/zoran/videocodec.h | 2 +-
drivers/media/video/zoran/zoran_driver.c | 2 +-
drivers/misc/Kconfig | 6 +++---
drivers/mtd/chips/cfi_cmdset_0002.c | 4 ++--
drivers/mtd/devices/lart.c | 2 +-
drivers/mtd/ftl.c | 2 +-
drivers/mtd/maps/Kconfig | 4 ++--
drivers/mtd/nand/cafe_nand.c | 2 +-
drivers/net/Kconfig | 21 ++++++++++-----------
drivers/net/appletalk/Kconfig | 2 +-
drivers/net/atp.c | 2 +-
drivers/net/depca.c | 2 +-
drivers/net/epic100.c | 4 ++--
drivers/net/hamradio/Kconfig | 2 +-
drivers/net/ibmlana.c | 2 +-
drivers/net/igb/igb_main.c | 2 +-
drivers/net/irda/ali-ircc.c | 2 +-
drivers/net/irda/donauboe.h | 2 +-
drivers/net/pci-skeleton.c | 2 +-
drivers/net/pcmcia/3c574_cs.c | 2 +-
drivers/net/ps3_gelic_net.c | 4 ++--
drivers/net/sb1250-mac.c | 6 +++---
drivers/net/sc92031.c | 2 +-
drivers/net/skfp/hwt.c | 2 +-
drivers/net/skfp/skfddi.c | 2 +-
drivers/net/tlan.c | 2 +-
drivers/net/tokenring/tms380tr.c | 2 +-
drivers/net/tulip/Kconfig | 2 +-
drivers/net/tulip/pnic2.c | 2 +-
drivers/net/usb/plusb.c | 2 +-
drivers/net/wan/Kconfig | 2 +-
drivers/net/wan/hdlc.c | 2 +-
drivers/net/wireless/ath/ath5k/ath5k.h | 2 +-
drivers/net/wireless/ath/ath5k/reg.h | 1 -
drivers/net/wireless/hostap/hostap_hw.c | 2 +-
drivers/net/wireless/p54/Kconfig | 6 +++---
drivers/net/wireless/prism54/islpci_hotplug.c | 2 +-
drivers/parisc/README.dino | 3 +--
drivers/parport/parport_pc.c | 2 +-
drivers/pci/quirks.c | 3 ++-
drivers/pcmcia/yenta_socket.c | 2 +-
drivers/pnp/pnpbios/proc.c | 1 -
drivers/rtc/rtc-nuc900.c | 2 +-
drivers/s390/block/dasd_3990_erp.c | 2 +-
drivers/s390/block/dasd_eckd.c | 4 ++--
drivers/s390/char/tape_3590.c | 6 +++---
drivers/s390/char/vmcp.c | 6 +++---
drivers/scsi/Kconfig | 9 +++++----
drivers/scsi/aacraid/linit.c | 2 +-
drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +-
drivers/scsi/sg.c | 2 +-
drivers/serial/8250.c | 2 +-
drivers/serial/bfin_sport_uart.c | 2 +-
drivers/serial/bfin_sport_uart.h | 2 +-
drivers/serial/uartlite.c | 2 +-
drivers/staging/asus_oled/README | 2 +-
drivers/staging/asus_oled/asus_oled.c | 2 +-
drivers/staging/comedi/drivers/cb_pcimdas.c | 2 +-
drivers/staging/comedi/drivers/daqboard2000.c | 4 ++--
drivers/staging/comedi/drivers/ni_labpc.c | 2 +-
drivers/staging/comedi/drivers/ni_mio_common.c | 2 +-
drivers/staging/comedi/drivers/plx9080.h | 2 +-
drivers/staging/comedi/drivers/rtd520.c | 2 +-
drivers/staging/quickstart/quickstart.c | 3 +--
drivers/uio/Kconfig | 6 +++---
drivers/usb/gadget/at91_udc.c | 1 -
drivers/usb/gadget/f_audio.c | 2 --
drivers/usb/gadget/f_hid.c | 4 ----
drivers/usb/gadget/fsl_udc_core.c | 6 ------
drivers/usb/gadget/pxa27x_udc.c | 2 --
drivers/usb/gadget/rndis.c | 2 --
drivers/usb/host/ehci-hcd.c | 1 -
drivers/usb/host/imx21-hcd.c | 4 ++--
drivers/usb/host/ohci-hcd.c | 1 -
drivers/usb/host/oxu210hp-hcd.c | 9 ---------
drivers/usb/host/pci-quirks.c | 2 --
drivers/usb/host/u132-hcd.c | 8 ++------
drivers/usb/image/microtek.c | 9 ---------
drivers/usb/misc/ftdi-elan.c | 2 --
drivers/usb/mon/mon_main.c | 2 --
drivers/usb/serial/Kconfig | 4 ++--
drivers/usb/serial/cypress_m8.c | 2 --
drivers/usb/serial/ftdi_sio.c | 1 -
drivers/usb/serial/ftdi_sio_ids.h | 12 ++++++------
drivers/usb/serial/garmin_gps.c | 1 -
drivers/usb/serial/io_edgeport.c | 11 -----------
drivers/usb/serial/io_ti.c | 4 ----
drivers/usb/serial/iuu_phoenix.c | 1 -
drivers/usb/serial/keyspan.c | 2 +-
drivers/usb/serial/keyspan.h | 2 +-
drivers/usb/serial/keyspan_pda.c | 1 -
drivers/usb/serial/mct_u232.h | 9 ++++-----
drivers/usb/serial/mos7720.c | 6 ------
drivers/usb/serial/mos7840.c | 7 -------
drivers/usb/serial/omninet.c | 2 --
drivers/usb/serial/sierra.c | 2 --
drivers/usb/serial/spcp8x5.c | 1 -
drivers/usb/serial/usb_wwan.c | 1 -
drivers/usb/serial/whiteheat.c | 6 ------
drivers/usb/storage/Kconfig | 2 +-
drivers/video/Kconfig | 10 +++++-----
drivers/video/arcfb.c | 1 -
drivers/video/bf54x-lq043fb.c | 6 +++---
drivers/video/bfin-t350mcqb-fb.c | 2 +-
drivers/video/epson1355fb.c | 2 +-
drivers/video/fbcvt.c | 2 +-
drivers/video/metronomefb.c | 2 +-
drivers/video/vesafb.c | 2 +-
firmware/keyspan_pda/keyspan_pda.S | 2 +-
firmware/keyspan_pda/xircom_pgs.S | 2 +-
fs/ecryptfs/ecryptfs_kernel.h | 2 +-
fs/exofs/inode.c | 14 +++++++-------
fs/exofs/ios.c | 10 +++++-----
fs/ext2/inode.c | 4 ++--
fs/hostfs/hostfs.h | 7 +------
fs/jfs/jfs_logmgr.c | 6 ++----
fs/jfs/jfs_mount.c | 4 ++--
fs/ocfs2/cluster/tcp_internal.h | 2 +-
fs/partitions/ldm.c | 2 +-
fs/partitions/ldm.h | 2 +-
fs/reiserfs/Kconfig | 6 ++++--
fs/reiserfs/README | 2 +-
fs/seq_file.c | 6 +++---
include/crypto/gf128mul.h | 4 ++--
include/linux/fdreg.h | 2 +-
include/linux/idr.h | 7 +++++--
include/linux/if_infiniband.h | 2 +-
include/linux/jhash.h | 2 +-
include/linux/n_r3964.h | 1 -
include/video/vga.h | 2 +-
init/Kconfig | 2 +-
kernel/pm_qos_params.c | 2 +-
kernel/trace/trace_kprobe.c | 2 +-
lib/idr.c | 13 +++++++------
mm/percpu.c | 2 +-
mm/vmscan.c | 4 ++--
net/ax25/Kconfig | 8 ++++----
net/ipv4/Kconfig | 4 ++--
net/ipv4/cipso_ipv4.c | 2 +-
net/ipv4/fib_trie.c | 2 +-
net/ipv4/netfilter/Kconfig | 2 +-
net/ipv4/tcp_illinois.c | 2 +-
net/ipv4/tcp_input.c | 4 ++--
net/ipv4/tcp_veno.c | 2 +-
net/irda/irnet/irnet_ppp.c | 2 +-
net/mac80211/mesh.h | 2 +-
net/netfilter/nf_conntrack_proto_tcp.c | 4 ++--
net/sunrpc/rpc_pipe.c | 4 ++--
net/wanrouter/wanmain.c | 4 ++--
sound/oss/ac97_codec.c | 7 ++-----
sound/pci/ens1370.c | 2 +-
sound/pci/intel8x0.c | 2 +-
sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 2 +-
sound/soc/s3c24xx/neo1973_wm8753.c | 2 +-
usr/Kconfig | 2 +-
302 files changed, 359 insertions(+), 512 deletions(-)
^ permalink raw reply [flat|nested] 25+ messages in thread
* [GIT] trivial
@ 2010-08-04 14:34 Jiri Kosina
0 siblings, 0 replies; 25+ messages in thread
From: Jiri Kosina @ 2010-08-04 14:34 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
Linus,
could you please pull from 'for-linus' branch at
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-next
to receive updates which are sitting in the trivial queue. Mostly comment
typo fixes, obvious dead code removals, and tree-wide update of broken
URLs.
Thanks.
Christoph Egger (2):
Remove dead CONFIG_SIBYTE_BCM1480_PROF
Removing dead MACH_U300_BS26
Davidlohr Bueso (2):
reiserfs: typo comment fix
arm: plat-spear: fix typo in kerneldoc
Jim Cromie (1):
variable name fix to Documentation/rt-mutex-design.txt
Jiri Kosina (3):
trivial: don't touch drivers/staging
Revert "Remove dead CONFIG_SIBYTE_BCM1480_PROF"
trivial: no changes to ov511 driver
Joe Perches (3):
arch/cris: Remove unnecessary kmalloc casts
fs/ocfs2: Remove unnecessary casts of private_data
drivers/infiniband: Remove unnecessary casts of private_data
Justin P. Mattock (5):
fix comment typo in netdevice.h
fix #warning about using kernel headers in userpsace
Documentation update broken web addresses
hostap:hostap_hw.c Fix typo in comment
Documentation: update broken web addresses.
Kulikov Vasiliy (9):
Documentation/sysctl/vm.txt typo
lib/devres.c: fix comment typo
Documentation: pci.txt: fix typo
block: cciss: use ARRAY_SIZE
synclink: use ARRAY_SIZE
drm: drm_edid: use ARRAY_SIZE
drm: i915: use ARRAY_SIZE
scsi: bfa: use ARRAY_SIZE
libfc: use ARRAY_SIZE
Matthew Whitworth (1):
Fix comment spelling errors in ncpfs/inode.c
Michael Witten (1):
Kconfig: fixo typo in "Xilinx'"
Pavel Machek (1):
update email address
Stefan Weil (1):
Fix spelling contorller -> controller in comments
Stephen Boyd (1):
fs/Kconfig: Fix typo Userpace -> Userspace
Suresh Jayaraman (2):
fscache: fix a trivial typo in the comment
fscache: fix missing kerneldoc annotation
Takuya Yoshikawa (1):
Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -> Fault
Thomas Weber (1):
comment typo fixes: charater => character
Uwe Kleine-König (14):
fix typos concerning "hierarchy"
fix typos concerning "acquire"
fix typos concerning "first"
fix typos concerning "management"
fix typos concerning "initiali[zs]e"
fix typos concerning "instead"
fix typos concerning "associate"
fix typos concerning "precedence"
fix comment typos concerning "sequential"
fix comment/printk typos concerning "already"
remove a duplicated comment line
fix comnment/printk typos concerning "empty"
fix comment typos concerning "challenge"
fix comment typo "choosed" -> "chosen"
Documentation/ABI/testing/sysfs-devices-memory | 6 +-
Documentation/ABI/testing/sysfs-devices-system-cpu | 2 +-
Documentation/Changes | 12 ++--
Documentation/DocBook/scsi.tmpl | 2 +-
Documentation/DocBook/v4l/compat.xml | 5 +-
Documentation/DocBook/v4l/fdl-appendix.xml | 2 +-
Documentation/HOWTO | 6 +-
Documentation/PCI/pci.txt | 2 +-
Documentation/RCU/RTFP.txt | 2 +-
Documentation/SubmittingDrivers | 2 +-
Documentation/aoe/aoe.txt | 2 +-
Documentation/arm/IXP2000 | 2 +-
Documentation/arm/IXP4xx | 14 ++--
Documentation/arm/README | 4 +-
Documentation/arm/SA1100/Assabet | 5 +-
Documentation/arm/SA1100/Brutus | 2 +-
Documentation/arm/SA1100/FreeBird | 2 +-
Documentation/arm/SA1100/GraphicsClient | 2 +-
Documentation/arm/SA1100/GraphicsMaster | 2 +-
Documentation/arm/SA1100/Itsy | 2 +-
Documentation/arm/SA1100/PLEB | 2 +-
Documentation/arm/SA1100/Victor | 2 +-
Documentation/arm/SA1100/nanoEngine | 2 +-
Documentation/binfmt_misc.txt | 2 +-
Documentation/blockdev/paride.txt | 2 +-
Documentation/cdrom/packet-writing.txt | 2 +-
Documentation/cgroups/cpusets.txt | 2 +-
Documentation/development-process/4.Coding | 2 +-
Documentation/device-mapper/dm-crypt.txt | 2 +-
Documentation/devices.txt | 9 ++-
Documentation/dvb/faq.txt | 2 +-
Documentation/fb/framebuffer.txt | 2 +-
Documentation/feature-removal-schedule.txt | 2 +-
Documentation/filesystems/9p.txt | 2 +-
Documentation/filesystems/affs.txt | 2 +-
Documentation/filesystems/befs.txt | 4 +-
Documentation/filesystems/isofs.txt | 2 +-
Documentation/filesystems/proc.txt | 4 +-
Documentation/filesystems/vfat.txt | 3 +-
Documentation/hwmon/adm1026 | 2 +-
Documentation/hwmon/g760a | 2 +-
Documentation/hwmon/gl518sm | 3 +-
Documentation/hwmon/hpfall.c | 2 +-
Documentation/hwmon/k8temp | 2 +-
Documentation/hwmon/lm85 | 6 +-
Documentation/hwmon/smsc47m1 | 11 +--
Documentation/hwmon/thmc50 | 2 +-
Documentation/hwmon/via686a | 2 +-
Documentation/hwmon/w83627hf | 6 +--
Documentation/hwmon/w83781d | 2 +-
Documentation/hwmon/w83792d | 2 +-
Documentation/i2c/busses/i2c-ali1535 | 2 +-
Documentation/i2c/busses/i2c-ali1563 | 2 +-
Documentation/i2c/busses/i2c-ali15x3 | 2 +-
Documentation/i2c/busses/i2c-piix4 | 2 +-
Documentation/i2c/busses/i2c-sis630 | 2 +-
Documentation/ia64/aliasing.txt | 2 -
Documentation/ia64/serial.txt | 2 +-
Documentation/infiniband/user_verbs.txt | 2 +-
Documentation/input/appletouch.txt | 2 +-
Documentation/input/bcm5974.txt | 2 +-
Documentation/input/iforce-protocol.txt | 2 +-
Documentation/input/sentelic.txt | 2 +-
Documentation/input/xpad.txt | 2 +-
Documentation/intel_txt.txt | 12 ++--
Documentation/ioctl/ioctl-number.txt | 10 ++--
Documentation/isdn/README | 2 +-
Documentation/isdn/README.HiSax | 2 +-
Documentation/ja_JP/HOWTO | 2 +-
Documentation/ja_JP/SubmittingPatches | 6 +-
Documentation/kernel-docs.txt | 39 +++++------
Documentation/ko_KR/HOWTO | 8 +-
Documentation/laptops/acer-wmi.txt | 2 +-
Documentation/ldm.txt | 2 +-
Documentation/md.txt | 2 +-
Documentation/misc-devices/c2port.txt | 4 +-
Documentation/mtd/nand_ecc.txt | 2 +-
Documentation/networking/3c509.txt | 2 +-
Documentation/networking/README.ipw2100 | 3 +-
Documentation/networking/README.ipw2200 | 2 +-
Documentation/networking/README.sb1000 | 4 +-
Documentation/networking/arcnet.txt | 4 +-
Documentation/networking/bonding.txt | 2 +-
Documentation/networking/decnet.txt | 2 +-
Documentation/networking/fore200e.txt | 2 +-
Documentation/networking/ipddp.txt | 5 --
Documentation/networking/iphase.txt | 2 +-
Documentation/networking/packet_mmap.txt | 4 +-
Documentation/networking/ray_cs.txt | 4 +-
Documentation/networking/s2io.txt | 3 +-
Documentation/networking/tlan.txt | 4 +-
Documentation/networking/udplite.txt | 13 ++--
Documentation/networking/wavelan.txt | 3 +-
Documentation/power/apm-acpi.txt | 2 +-
Documentation/power/basic-pm-debugging.txt | 3 +-
Documentation/power/tricks.txt | 2 +-
Documentation/power/video.txt | 12 ++--
Documentation/powerpc/booting-without-of.txt | 2 +-
Documentation/rt-mutex-design.txt | 2 +-
Documentation/s390/Debugging390.txt | 2 +-
Documentation/scsi/BusLogic.txt | 2 +-
Documentation/scsi/ChangeLog.lpfc | 2 +-
Documentation/scsi/ChangeLog.megaraid | 2 +-
Documentation/scsi/FlashPoint.txt | 4 +-
Documentation/scsi/Mylex.txt | 2 +-
Documentation/scsi/NinjaSCSI.txt | 2 -
Documentation/scsi/aic79xx.txt | 2 +-
Documentation/scsi/aic7xxx.txt | 2 +-
Documentation/scsi/ibmmca.txt | 2 +-
Documentation/scsi/osst.txt | 2 +-
Documentation/scsi/ppa.txt | 6 +-
Documentation/scsi/scsi-generic.txt | 8 +-
Documentation/scsi/scsi.txt | 4 +-
Documentation/scsi/scsi_mid_low_api.txt | 2 +-
Documentation/serial/moxa-smartio | 2 +-
Documentation/sound/alsa/ALSA-Configuration.txt | 2 +-
Documentation/sound/alsa/HD-Audio.txt | 2 +-
Documentation/sound/alsa/soc/DAI.txt | 2 +-
Documentation/sound/alsa/soc/codec.txt | 2 +-
Documentation/sound/alsa/soc/platform.txt | 2 +-
Documentation/sound/oss/README.OSS | 5 +-
Documentation/sparse.txt | 2 +-
Documentation/sysctl/vm.txt | 2 +-
Documentation/telephony/ixj.txt | 9 +--
Documentation/uml/UserModeLinux-HOWTO.txt | 73 ++-----------------
Documentation/usb/linux.inf | 2 +-
Documentation/usb/mtouchusb.txt | 6 +--
Documentation/usb/usb-serial.txt | 4 +-
Documentation/video4linux/API.html | 2 +-
Documentation/video4linux/CQcam.txt | 4 +-
Documentation/video4linux/README.cpia | 2 +-
Documentation/video4linux/README.ivtv | 2 +-
Documentation/video4linux/Zoran | 6 +-
Documentation/video4linux/bttv/Cards | 6 +-
Documentation/video4linux/bttv/MAKEDEV | 2 +-
Documentation/video4linux/bttv/Specs | 4 +-
.../video4linux/cx88/hauppauge-wintv-cx88-ir.txt | 2 +-
.../video4linux/hauppauge-wintv-cx88-ir.txt | 2 +-
Documentation/video4linux/ibmcam.txt | 5 +-
Documentation/video4linux/se401.txt | 2 +-
Documentation/video4linux/w9966.txt | 2 +-
Documentation/w1/masters/ds2482 | 4 +-
Documentation/w1/masters/mxc-w1 | 3 +-
Documentation/w1/masters/omap-hdq | 2 +-
Documentation/zh_CN/HOWTO | 8 +-
Documentation/zh_CN/SubmittingDrivers | 2 +-
Documentation/zh_CN/SubmittingPatches | 6 +-
Documentation/zh_CN/sparse.txt | 2 +-
arch/arm/mach-imx/dma-v1.c | 3 +-
arch/arm/mach-msm/acpuclock-arm11.c | 4 +-
arch/arm/mach-omap2/dpll3xxx.c | 2 +-
arch/arm/mach-omap2/sleep34xx.S | 2 +-
arch/arm/mach-sa1100/collie.c | 2 +-
arch/arm/mach-u300/core.c | 7 --
arch/arm/mach-u300/gpio.c | 2 +-
arch/arm/plat-s3c24xx/clock.c | 2 +-
arch/arm/plat-samsung/clock.c | 2 +-
arch/arm/plat-spear/padmux.c | 2 +-
arch/cris/arch-v32/mm/intmem.c | 13 ++--
arch/h8300/kernel/timer/itu.c | 2 +-
arch/h8300/kernel/timer/timer16.c | 2 +-
arch/h8300/kernel/timer/timer8.c | 2 +-
arch/ia64/kvm/kvm-ia64.c | 6 +-
arch/ia64/sn/kernel/setup.c | 2 +-
arch/microblaze/Makefile | 2 +-
arch/powerpc/kernel/suspend.c | 2 +-
arch/powerpc/platforms/ps3/htab.c | 2 +-
arch/sh/kernel/clkdev.c | 2 +-
arch/sparc/boot/btfixupprep.c | 4 +-
arch/x86/kernel/acpi/sleep.c | 2 +-
arch/x86/kernel/apic/apic.c | 2 +-
arch/x86/kernel/apm_32.c | 2 +-
arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 2 +-
arch/x86/kernel/head32.c | 2 +-
arch/x86/mm/init_64.c | 2 +-
arch/x86/power/cpu.c | 2 +-
arch/x86/power/hibernate_64.c | 2 +-
drivers/block/cciss.c | 2 +-
drivers/block/drbd/drbd_receiver.c | 2 +-
drivers/block/nbd.c | 2 +-
drivers/char/synclink_gt.c | 2 +-
drivers/crypto/amcc/crypto4xx_reg_def.h | 2 +-
drivers/dma/at_hdmac.c | 2 +-
drivers/dma/fsldma.c | 2 +-
drivers/gpu/drm/drm_edid.c | 7 +--
drivers/gpu/drm/i915/intel_sdvo.c | 4 +-
drivers/gpu/drm/i915/intel_tv.c | 2 +-
drivers/gpu/drm/savage/savage_bci.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 2 +-
drivers/ide/ide-gd.c | 2 +-
drivers/infiniband/hw/cxgb3/iwch_qp.c | 4 +-
drivers/infiniband/hw/cxgb4/qp.c | 4 +-
drivers/infiniband/hw/ehca/hcp_if.h | 2 +-
drivers/infiniband/hw/ipath/ipath_file_ops.c | 2 +-
drivers/input/misc/ad714x.c | 2 +-
drivers/isdn/hardware/mISDN/avmfritz.c | 2 +-
drivers/isdn/hardware/mISDN/hfcmulti.c | 4 +-
drivers/isdn/hardware/mISDN/hfcpci.c | 2 +-
drivers/isdn/hardware/mISDN/mISDNinfineon.c | 2 +-
drivers/isdn/hardware/mISDN/speedfax.c | 2 +-
drivers/isdn/hardware/mISDN/w6692.c | 2 +-
drivers/isdn/hisax/callc.c | 2 +-
drivers/isdn/hisax/tei.c | 2 +-
drivers/isdn/mISDN/tei.c | 2 +-
drivers/media/dvb/siano/smscoreapi.c | 2 +-
drivers/media/video/gspca/sunplus.c | 4 +-
drivers/media/video/usbvideo/vicam.c | 2 +-
drivers/media/video/v4l2-compat-ioctl32.c | 2 +-
drivers/media/video/zoran/zoran.h | 2 +-
drivers/media/video/zoran/zoran_device.c | 2 +-
drivers/media/video/zoran/zr36050.c | 2 +-
drivers/media/video/zoran/zr36060.c | 2 +-
drivers/message/fusion/mptbase.c | 4 +-
drivers/mtd/nand/denali.c | 2 +-
drivers/net/3c527.c | 4 +-
drivers/net/appletalk/ipddp.c | 2 +-
drivers/net/benet/be_hw.h | 2 +-
drivers/net/gianfar.c | 2 +-
drivers/net/hp100.c | 2 +-
drivers/net/ibm_newemac/core.c | 2 +-
drivers/net/ksz884x.c | 2 +-
drivers/net/ll_temac_main.c | 2 +-
drivers/net/sh_eth.c | 2 +-
drivers/net/tulip/dmfe.c | 20 +++---
drivers/net/wimax/i2400m/control.c | 2 +-
drivers/net/wireless/hostap/hostap_ap.c | 2 +-
drivers/net/wireless/hostap/hostap_hw.c | 2 +-
drivers/parisc/ccio-dma.c | 4 +-
drivers/pcmcia/sa11xx_base.c | 2 +-
drivers/rapidio/rio.c | 2 +-
drivers/rtc/rtc-fm3130.c | 2 +-
drivers/rtc/rtc-rx8025.c | 2 +-
drivers/scsi/advansys.c | 2 +-
drivers/scsi/aic7xxx_old/aic7xxx.seq | 2 +-
drivers/scsi/aic94xx/aic94xx_seq.c | 4 +-
drivers/scsi/bfa/bfa_core.c | 2 +-
drivers/scsi/bfa/bfa_fcs.c | 10 +--
drivers/scsi/bfa/bfa_ioim.c | 2 +-
drivers/scsi/bfa/vport.c | 2 +-
drivers/scsi/fcoe/fcoe.c | 4 +-
drivers/scsi/libfc/fc_exch.c | 4 +-
drivers/scsi/libfc/fc_lport.c | 6 +-
drivers/scsi/libfc/fc_rport.c | 2 +-
drivers/scsi/mpt2sas/mpt2sas_base.h | 2 +-
drivers/scsi/mpt2sas/mpt2sas_scsih.c | 4 +-
drivers/scsi/pm8001/pm8001_hwi.c | 4 +-
drivers/scsi/qla2xxx/qla_iocb.c | 2 +-
drivers/scsi/qla2xxx/qla_nx.h | 2 +-
drivers/scsi/qla4xxx/ql4_init.c | 2 +-
drivers/scsi/scsi_transport_fc.c | 2 +-
drivers/serial/68360serial.c | 6 +-
drivers/serial/cpm_uart/cpm_uart_core.c | 2 +-
drivers/serial/nwpserial.c | 2 +-
drivers/serial/sn_console.c | 6 +-
drivers/staging/winbond/wbusb.c | 2 +-
drivers/usb/class/cdc-acm.c | 2 +-
drivers/usb/class/usblp.c | 2 +-
drivers/usb/host/fhci-sched.c | 2 +-
drivers/usb/serial/kl5kusb105.c | 2 +-
drivers/usb/wusbcore/wusbhc.c | 2 +-
drivers/uwb/wlp/wss-lc.c | 2 +-
drivers/video/backlight/locomolcd.c | 4 +-
drivers/video/carminefb.c | 2 +-
drivers/video/tgafb.c | 2 +-
fs/Kconfig | 2 +-
fs/befs/linuxvfs.c | 2 +-
fs/compat.c | 2 +-
fs/compat_ioctl.c | 2 +-
fs/ecryptfs/crypto.c | 2 +-
fs/ext4/extents.c | 2 +-
fs/ext4/mballoc.c | 2 +-
fs/ext4/super.c | 2 +-
fs/freevxfs/vxfs_super.c | 2 +-
fs/ncpfs/inode.c | 4 +-
fs/ocfs2/dlm/dlmdebug.c | 6 +-
fs/ocfs2/dlmfs/dlmfs.c | 3 +-
fs/ocfs2/dlmglue.c | 4 +-
fs/ocfs2/super.c | 2 +-
fs/reiserfs/inode.c | 2 +-
include/linux/fscache.h | 3 +-
include/linux/ide.h | 2 +-
include/linux/if_link.h | 2 +-
include/linux/jffs2.h | 2 +-
include/linux/kernel.h | 6 --
include/linux/lru_cache.h | 2 +-
include/linux/netdevice.h | 2 +-
include/linux/reiserfs_fs.h | 2 +-
include/linux/types.h | 5 +-
kernel/cpuset.c | 2 +-
kernel/debug/debug_core.c | 2 +-
kernel/debug/gdbstub.c | 2 +-
kernel/power/hibernate.c | 2 +-
kernel/power/snapshot.c | 2 +-
kernel/power/swap.c | 2 +-
kernel/time/tick-broadcast.c | 2 +-
lib/Kconfig.debug | 2 +-
lib/devres.c | 2 +-
lib/random32.c | 2 +-
net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +-
net/netfilter/ipvs/ip_vs_lblc.c | 2 +-
net/netfilter/ipvs/ip_vs_lblcr.c | 2 +-
net/sctp/associola.c | 2 +-
net/sctp/protocol.c | 2 +-
security/smack/smack_lsm.c | 2 +-
sound/drivers/Kconfig | 2 +-
sound/pci/trident/trident_main.c | 2 +-
sound/soc/fsl/mpc8610_hpcd.c | 2 +-
sound/soc/imx/imx-ssi.c | 2 +-
sound/soc/soc-core.c | 2 +-
sound/usb/pcm.c | 2 +-
310 files changed, 461 insertions(+), 574 deletions(-)
^ permalink raw reply [flat|nested] 25+ messages in thread
* [GIT] trivial
@ 2010-05-19 12:59 Jiri Kosina
0 siblings, 0 replies; 25+ messages in thread
From: Jiri Kosina @ 2010-05-19 12:59 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
Linus,
please pull from for-linus branch from
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-linus
to receive patches from trivial tree. Mostly comment and typo fixes all
over the place.
Anand Gadiyar (1):
fix "seperate" typos in comments
Andreas Dilger (1):
add descriptive comment for TIF_MEMDIE task flag declaration.
Arce, Abraham (3):
EEPROM: Header file cleanup
EEPROM: 93cx6: Header file cleanup
EEPROM: max6875: Header file cleanup
Bill Pemberton (6):
doc: Change urls for sparse
cciss: fix shadows sparse warning
jbd2: use NULL instead of 0 when pointer is needed
PCI: make bitfield unsigned
rtc-v3020: make bitfield unsigned
agp: use NULL instead of 0 when pointer is needed
Dan Carpenter (2):
wd7000: typo spin_unlock_irq() => spin_lock_irq()
i2o: cleanup some exit paths
Francis Galiegue (1):
Documentation/: it's -> its where appropriate
Gilles Espinasse (1):
Fix comment and Kconfig typos for 'require' and 'fragment'
Greg Thelen (3):
mm: fix typo in refill_stock() comment
memcg: fix typo in memcg documentation
cpuset: Fix documentation punctuation
Henrik Kretzschmar (1):
cocbalt_lcdfb: correct sections
Huang Weiyi (1):
omfs: remove unused version.h include
Jan Kiszka (5):
UML: Remove unused variable from line driver
UML: Clean up asm/system.h
UML: Drop private round_down definition
UML: Fix compiler warning due to missing task_struct declaration
uml: i386: Avoid redefinition of NR_syscalls
Jani Nikula (1):
powerpc/BSR: fix device_create() return value check
Jiri Kosina (3):
hpet: x86_64 and i386 are not different code any more
UML: add kernel.h include to signal.c
Merge branch 'master' into for-next
Justin P. Mattock (3):
fix comment typo in sound/pci/hda/hda_local.h
Remove empty comment in acpi/power.c
Fix comment typo in percpu.h
Martyn Welch (2):
rtc: e-mail corrections following split of GE Fanuc joint venture
stk17ta8: renaming e-mail corrections following split of GE Fanuc joint venture
Rob Landley (1):
Documentation/filesystems/proc.txt typo fix.
Robert P. J. Day (2):
kobj: add comment and multiple inclusion protection
kobj: kref.h incorrectly describes itself as kref.c.
Thadeu Lima de Souza Cascardo (1):
doc: inode uses a mutex instead of a semaphore.
Thomas Weber (4):
kconfig: util: Fix typo in comment
Fix typos in comments
i2c: twl.h: Fix comment typos and tab
Powerpc: wii: Fix typo in comment
Venkatesh Pallipadi (1):
HPET maintainer email update
Viral Mehta (1):
kfifo: fix kerneldoc for kfifo_avail and kfifo_in_locked
Wolfram Sang (1):
vlynq: make whole Kconfig-menu dependant on architecture
Documentation/ABI/testing/sysfs-devices-memory | 2 +-
Documentation/DMA-API-HOWTO.txt | 2 +-
Documentation/DocBook/libata.tmpl | 2 +-
Documentation/PCI/pci-error-recovery.txt | 4 +-
Documentation/Smack.txt | 2 +-
Documentation/arm/SA1100/ADSBitsy | 2 +-
Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen | 2 +-
Documentation/atomic_ops.txt | 2 +-
Documentation/blackfin/bfin-gpio-notes.txt | 2 +-
Documentation/cachetlb.txt | 6 +-
Documentation/cgroups/cgroups.txt | 2 +-
Documentation/cgroups/cpusets.txt | 38 +++++++-------
Documentation/cgroups/memcg_test.txt | 2 +-
Documentation/cgroups/memory.txt | 2 +-
Documentation/connector/connector.txt | 2 +-
Documentation/dvb/ci.txt | 2 +-
Documentation/dvb/contributors.txt | 2 +-
Documentation/filesystems/Locking | 4 +-
.../filesystems/autofs4-mount-control.txt | 2 +-
Documentation/filesystems/ceph.txt | 2 +-
Documentation/filesystems/dlmfs.txt | 2 +-
Documentation/filesystems/fiemap.txt | 12 ++--
Documentation/filesystems/fuse.txt | 4 +-
Documentation/filesystems/hpfs.txt | 2 +-
Documentation/filesystems/logfs.txt | 8 ++--
Documentation/filesystems/nfs/rpc-cache.txt | 2 +-
Documentation/filesystems/proc.txt | 6 +-
Documentation/filesystems/smbfs.txt | 2 +-
Documentation/filesystems/vfs.txt | 2 +-
Documentation/hwmon/lm85 | 2 +-
Documentation/input/joystick.txt | 2 +-
Documentation/intel_txt.txt | 2 +-
Documentation/kbuild/kconfig-language.txt | 2 +-
Documentation/kbuild/kconfig.txt | 2 +-
Documentation/kernel-docs.txt | 10 ++--
Documentation/kprobes.txt | 2 +-
Documentation/laptops/laptop-mode.txt | 2 +-
Documentation/lguest/lguest.c | 2 +-
Documentation/md.txt | 2 +-
Documentation/netlabel/lsm_interface.txt | 2 +-
Documentation/networking/ifenslave.c | 2 +-
Documentation/networking/packet_mmap.txt | 4 +-
Documentation/power/regulator/consumer.txt | 10 ++--
Documentation/power/regulator/machine.txt | 2 +-
Documentation/power/regulator/overview.txt | 6 +-
Documentation/powerpc/booting-without-of.txt | 2 +-
Documentation/powerpc/dts-bindings/xilinx.txt | 2 +-
Documentation/powerpc/phyp-assisted-dump.txt | 2 +-
Documentation/rt-mutex-design.txt | 2 +-
Documentation/scsi/ChangeLog.lpfc | 4 +-
Documentation/scsi/FlashPoint.txt | 2 +-
Documentation/scsi/dtc3x80.txt | 2 +-
Documentation/scsi/ncr53c8xx.txt | 2 +-
Documentation/scsi/osst.txt | 2 +-
Documentation/scsi/scsi_fc_transport.txt | 4 +-
Documentation/scsi/sym53c8xx_2.txt | 2 +-
Documentation/sound/alsa/soc/dapm.txt | 4 +-
Documentation/sound/alsa/soc/machine.txt | 2 +-
Documentation/sound/alsa/soc/overview.txt | 2 +-
Documentation/sparse.txt | 4 +-
Documentation/sysfs-rules.txt | 2 +-
Documentation/trace/events.txt | 8 ++--
Documentation/usb/WUSB-Design-overview.txt | 2 +-
Documentation/vm/numa_memory_policy.txt | 4 +-
Documentation/w1/w1.generic | 2 +-
MAINTAINERS | 8 +--
arch/alpha/include/asm/thread_info.h | 2 +-
arch/arm/include/asm/thread_info.h | 2 +-
arch/arm/mach-s3c2443/clock.c | 2 +-
arch/arm/plat-samsung/include/plat/gpio-core.h | 2 +-
arch/avr32/include/asm/thread_info.h | 2 +-
arch/blackfin/include/asm/thread_info.h | 2 +-
arch/cris/include/asm/thread_info.h | 2 +-
arch/frv/include/asm/thread_info.h | 2 +-
arch/h8300/include/asm/thread_info.h | 2 +-
arch/ia64/include/asm/thread_info.h | 2 +-
arch/m32r/include/asm/thread_info.h | 2 +-
arch/m68k/include/asm/thread_info_mm.h | 2 +-
arch/m68k/include/asm/thread_info_no.h | 2 +-
arch/microblaze/include/asm/thread_info.h | 2 +-
arch/mips/include/asm/thread_info.h | 2 +-
arch/mips/sibyte/bcm1480/irq.c | 2 +-
arch/mips/sibyte/sb1250/irq.c | 2 +-
arch/mn10300/include/asm/thread_info.h | 2 +-
arch/parisc/include/asm/thread_info.h | 2 +-
arch/powerpc/include/asm/thread_info.h | 2 +-
arch/powerpc/platforms/embedded6xx/wii.c | 4 +-
arch/s390/include/asm/thread_info.h | 2 +-
arch/score/include/asm/thread_info.h | 2 +-
arch/sh/include/asm/thread_info.h | 2 +-
arch/sparc/include/asm/thread_info_32.h | 2 +-
arch/sparc/include/asm/thread_info_64.h | 2 +-
arch/um/drivers/line.c | 1 -
arch/um/include/asm/system.h | 3 -
arch/um/include/asm/thread_info.h | 7 +--
arch/um/kernel/skas/syscall.c | 4 +-
arch/um/sys-i386/asm/elf.h | 2 +
arch/um/sys-x86_64/asm/elf.h | 2 +
arch/um/sys-x86_64/signal.c | 3 +-
arch/x86/include/asm/percpu.h | 2 +-
arch/x86/include/asm/thread_info.h | 2 +-
arch/xtensa/include/asm/thread_info.h | 2 +-
crypto/Kconfig | 2 +-
drivers/acpi/osl.c | 4 +-
drivers/acpi/power.c | 1 -
drivers/ata/ata_piix.c | 2 +-
drivers/block/cciss.c | 3 +-
drivers/char/agp/generic.c | 2 +-
drivers/char/bsr.c | 2 +-
drivers/firewire/ohci.c | 2 +-
drivers/gpu/drm/drm_bufs.c | 2 +-
drivers/gpu/drm/i915/intel_display.c | 4 +-
drivers/gpu/drm/radeon/atombios.h | 4 +-
drivers/infiniband/hw/ipath/ipath_iba6110.c | 2 +-
drivers/infiniband/hw/ipath/ipath_iba6120.c | 4 +-
drivers/infiniband/hw/ipath/ipath_iba7220.c | 2 +-
drivers/isdn/hardware/mISDN/hfcmulti.c | 2 +-
drivers/isdn/hisax/hfc4s8s_l1.c | 2 +-
drivers/macintosh/windfarm_pm81.c | 2 +-
drivers/media/dvb/dvb-usb/friio-fe.c | 2 +-
drivers/message/i2o/i2o_config.c | 16 ++----
drivers/misc/eeprom/eeprom.c | 36 ++++++--------
drivers/misc/eeprom/eeprom_93cx6.c | 39 ++++++---------
drivers/misc/eeprom/max6875.c | 52 ++++++++++----------
drivers/net/bnx2x_hsi.h | 2 +-
drivers/net/ps3_gelic_wireless.c | 2 +-
drivers/net/smsc911x.c | 4 +-
drivers/pci/hotplug/cpqphp_core.c | 2 +-
drivers/pci/pci.c | 2 +-
drivers/pci/pci.h | 2 +-
drivers/ps3/ps3-sys-manager.c | 2 +-
drivers/regulator/core.c | 2 +-
drivers/rtc/rtc-rx8581.c | 6 +-
drivers/rtc/rtc-stk17ta8.c | 4 +-
drivers/s390/char/sclp_cpi_sys.c | 2 +-
drivers/scsi/bfa/include/defs/bfa_defs_cee.h | 2 +-
drivers/scsi/bfa/include/defs/bfa_defs_status.h | 4 +-
drivers/spi/spi_mpc8xxx.c | 2 +-
drivers/staging/vt6655/rxtx.c | 14 +++---
drivers/staging/vt6656/rxtx.c | 6 +-
drivers/usb/host/ehci-omap.c | 2 +-
drivers/usb/wusbcore/wa-xfer.c | 2 +-
drivers/video/cobalt_lcdfb.c | 2 +-
drivers/virtio/virtio_pci.c | 2 +-
drivers/vlynq/Kconfig | 2 +-
fs/jbd2/journal.c | 2 +-
fs/jfs/jfs_dmap.c | 2 +-
fs/logfs/dir.c | 2 +-
fs/logfs/logfs.h | 2 +-
fs/logfs/logfs_abi.h | 10 ++--
fs/omfs/inode.c | 1 -
include/linux/i2c/twl.h | 8 ++--
include/linux/kfifo.h | 4 +-
include/linux/kobj_map.h | 9 +++
include/linux/kref.h | 2 +-
include/linux/rtc-v3020.h | 2 +-
kernel/cgroup.c | 2 +-
mm/memcontrol.c | 2 +-
mm/page_alloc.c | 2 +-
net/ipv4/ipmr.c | 2 +-
net/wimax/op-rfkill.c | 2 +-
scripts/kconfig/util.c | 2 +-
scripts/package/mkspec | 2 +-
sound/pci/emu10k1/emu10k1_main.c | 2 +-
sound/pci/hda/hda_local.h | 2 +-
165 files changed, 313 insertions(+), 328 deletions(-)
^ permalink raw reply [flat|nested] 25+ messages in thread
* [GIT] trivial
@ 2010-03-08 23:06 Jiri Kosina
0 siblings, 0 replies; 25+ messages in thread
From: Jiri Kosina @ 2010-03-08 23:06 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
Linus,
please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-linus
to receive trivial patch queue contents for 2.6.34. Nothing earth-shaking
there (what a surprise :) ).
Thanks!
Adam Buchbinder (7):
Fix a grammar error (redundant "be") in comment
Fix misspelling of "truly" in a label.
Fix misspellings of "truly" in comments.
Fix misspellings of "invocation" in comments.
Fix misspellings of "separate" in strings.
Fix misspelling of "successful" and variants in comments.
Fix misspelling of "should" and "shouldn't" in comments.
Ali Gholami Rudi (1):
doc: fix checking socket() in net tstamp example
Anton Blanchard (1):
Remove reference to kthread_create_on_cpu
Baruch Siach (1):
devres: typo fix s/dev/devm/
Daniel Mack (3):
tree-wide: s/widht/width/g typo in comments
tree-wide: fix 'lenght' typo in comments and code
tree-wide: Assorted spelling fixes
Edward Z. Yang (1):
Remove redundant trailing semicolons from macros
Geert Uytterhoeven (1):
ataflop: Killl warning about unused variable flags
GeunSik Lim (1):
doc: cpuset: Update the cpuset flag file
Jaak Ristioja (1):
bio: Fix outdated comment about bio_alloc_bioset()
Jasper Spaans (1):
arch/x86/kernel/apic/apic_flat_64.c: Make comment match the code
Jean Delvare (1):
devres/irq: Fix devm_irq_match comment
Jiri Kosina (6):
crypto: fix typo in Kconfig help text
No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h
Remove drivers/parport/ChangeLog
Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed
Remove fs/ntfs/ChangeLog
Merge branch 'for-next' into for-linus
Jonathan Corbet (1):
Remove drivers/char/ChangeLog
Julia Lawall (1):
fs/qnx4: decrement sizeof size in strncmp
Justin P. Mattock (2):
fix comment typo in pci-dma.c
fix comment typos in avc.c
Mulyadi Santosa (1):
doc: typo - Table 1-2 should refer to "status", not "statm"
Nikanth Karthikesan (1):
doc: fix typo in comment explaining rb_tree usage
Pavel Roskin (1):
drm/kms: fix spelling in error message
Peter Huewe (5):
uwb/i1480: add __init/__exit macros
isdn/hardware: add __init/__exit macros to mISDNisar.c
w1: add __init/__exit macros to w1.c
media/dvb: add __init/__exit macros to bt878.c
isdn/mISDN: add __init/__exit macros to dsp_core.c
Robert P. J. Day (1):
xen: Fix misspelled CONFIG variable in comment.
Rudy Matela (1):
Coding style correction of some wan drivers
Sebastian Andrzej Siewior (1):
tree wide: remove execute flag from .c files
Shahar Havivi (1):
vt: remove unused variables
Shaun Patterson (1):
vmiclock: fix comment spelling mistake
Stefan Weil (2):
Fix spelling of 'platform' in comments and doc
Fix spelling of 'platform' in log messages
Thadeu Lima de Souza Cascardo (8):
fix ext3/ext4 comment typo compain -> complain
fix comment typo boo -> boot in ksysfs.c
doc: fix leve -> level typo in pm-runtime doc
fix comment typo leve -> level in powerpc
doc: update 00-INDEX for Documentation/laptops/
doc: fix Defaultd -> Defaults typo in EISA doc
doc: capitalization and other minor fixes in pnp doc
doc: fix console doc typo
Uwe Kleine-König (5):
fix typos "precidence" -> "precedence" in comments
tree-wide: fix typos "ammount" -> "amount"
grammar fix in comment
fix typo "definetly" -> "definitely" in comment
tree-wide: fix typos "ass?o[sc]iac?te" -> "associate" in comments
Documentation/DocBook/mtdnand.tmpl | 6 +-
Documentation/DocBook/v4l/common.xml | 2 +-
Documentation/DocBook/v4l/vidioc-g-parm.xml | 2 +-
Documentation/arm/Samsung-S3C24XX/CPUfreq.txt | 4 +-
Documentation/cgroups/cpusets.txt | 127 +-
Documentation/console/console.txt | 2 +-
Documentation/driver-model/platform.txt | 2 +-
Documentation/eisa.txt | 2 +-
Documentation/filesystems/proc.txt | 2 +-
Documentation/hwmon/abituguru | 2 +-
Documentation/input/rotary-encoder.txt | 2 +-
Documentation/laptops/00-INDEX | 4 +
Documentation/networking/skfp.txt | 2 +-
.../networking/timestamping/timestamping.c | 2 +-
Documentation/pnp.txt | 13 +-
Documentation/power/runtime_pm.txt | 2 +-
Documentation/s390/kvm.txt | 2 +-
Documentation/scsi/ChangeLog.lpfc | 10 +-
Documentation/trace/ftrace.txt | 2 +-
arch/arm/boot/bootp/init.S | 2 +-
arch/arm/common/clkdev.c | 2 +-
arch/arm/mach-at91/include/mach/at91_mci.h | 2 +-
arch/arm/mach-davinci/include/mach/i2c.h | 2 +-
arch/arm/mach-ep93xx/micro9.c | 2 +-
arch/arm/mach-nomadik/board-nhk8815.c | 2 +-
arch/arm/mach-s3c2410/include/mach/spi-gpio.h | 2 +-
arch/arm/mach-s5pc100/setup-sdhci.c | 4 +-
arch/arm/mach-u300/core.c | 4 +-
arch/arm/mach-u300/include/mach/debug-macro.S | 2 +-
arch/arm/plat-s3c/include/plat/gpio-cfg-helpers.h | 2 +-
arch/arm/plat-s3c/include/plat/nand.h | 2 +-
.../arm/plat-s3c/include/plat/regs-usb-hsotg-phy.h | 2 +-
arch/arm/plat-s3c24xx/include/plat/cpu-freq-core.h | 2 +-
arch/blackfin/include/asm/nand.h | 4 +-
arch/cris/arch-v10/lib/old_checksum.c | 2 +-
arch/cris/arch-v32/mm/tlb.c | 2 +-
arch/h8300/include/asm/io.h | 2 +-
arch/ia64/sn/kernel/setup.c | 2 +-
arch/m68k/atari/atakeyb.c | 2 +-
arch/m68k/include/asm/fbio.h | 2 +-
arch/m68k/include/asm/io_no.h | 2 +-
arch/powerpc/boot/dts/kmeter1.dts | 2 +-
arch/powerpc/kernel/legacy_serial.c | 2 +-
arch/powerpc/mm/init_32.c | 2 +-
arch/s390/crypto/sha_common.c | 2 +-
arch/s390/include/asm/cio.h | 2 +-
arch/s390/kernel/sclp.S | 2 +-
arch/sh/kernel/cpu/clock.c | 2 +-
arch/sparc/include/asm/fbio.h | 2 +-
arch/sparc/kernel/perf_event.c | 2 +-
arch/x86/crypto/twofish-i586-asm_32.S | 10 +-
arch/x86/crypto/twofish-x86_64-asm_64.S | 20 +-
arch/x86/kernel/apic/apic_flat_64.c | 2 +-
arch/x86/kernel/head_64.S | 2 +-
arch/x86/kernel/pci-calgary_64.c | 2 +-
arch/x86/kernel/pci-dma.c | 2 +-
arch/x86/kernel/ptrace.c | 2 +-
arch/x86/kernel/tsc.c | 2 +-
arch/x86/kernel/vmiclock_32.c | 2 +-
arch/x86/xen/smp.c | 2 +-
arch/xtensa/kernel/entry.S | 4 +-
block/bsg.c | 2 +-
crypto/Kconfig | 4 +-
drivers/acpi/dock.c | 2 +-
drivers/acpi/proc.c | 2 +-
drivers/ata/libata-core.c | 2 +-
drivers/ata/libata-sff.c | 2 +-
drivers/ata/pata_acpi.c | 2 +-
drivers/ata/pata_hpt3x3.c | 2 +-
drivers/ata/pata_pcmcia.c | 2 +-
drivers/block/drbd/drbd_int.h | 4 +-
drivers/block/drbd/drbd_req.h | 2 +-
drivers/char/ChangeLog | 775 ---------
drivers/char/agp/intel-agp.c | 2 +-
drivers/char/applicom.c | 2 +-
drivers/char/hvc_iseries.c | 2 +-
drivers/char/hw_random/n2-drv.c | 2 +-
drivers/char/ip2/i2hw.h | 2 +-
drivers/char/pty.c | 2 +-
drivers/char/random.c | 2 +-
drivers/char/serial167.c | 2 +-
drivers/char/tty_io.c | 2 +-
drivers/char/vt.c | 6 +-
drivers/crypto/hifn_795x.c | 2 +-
drivers/dma/coh901318_lli.h | 2 +-
drivers/gpu/drm/nouveau/nouveau_bios.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_drv.h | 2 +-
drivers/gpu/drm/radeon/radeon_state.c | 2 +-
drivers/gpu/drm/via/via_irq.c | 4 +-
drivers/i2c/algos/i2c-algo-pcf.c | 2 +-
drivers/i2c/busses/i2c-pxa.c | 2 +-
drivers/ieee1394/pcilynx.c | 2 +-
drivers/infiniband/hw/ehca/ehca_qes.h | 4 +-
drivers/infiniband/hw/ehca/ehca_reqs.c | 2 +-
drivers/input/misc/yealink.h | 2 +-
drivers/input/serio/i8042.c | 2 +-
drivers/input/tablet/aiptek.c | 2 +-
drivers/isdn/hardware/mISDN/mISDNisar.c | 4 +-
drivers/isdn/i4l/isdn_common.c | 2 +-
drivers/isdn/mISDN/dsp_core.c | 4 +-
drivers/isdn/mISDN/l1oip_core.c | 4 +-
drivers/isdn/sc/hardware.h | 2 +-
drivers/media/dvb/dvb-core/dvb_frontend.h | 8 +-
drivers/media/video/bt8xx/bttv-cards.c | 4 +-
drivers/media/video/gspca/ov519.c | 2 +-
drivers/media/video/pwc/philips.txt | 2 +-
drivers/media/video/sn9c102/sn9c102_sensor.h | 2 +-
drivers/media/video/tea6420.c | 2 +-
drivers/message/i2o/iop.c | 2 +-
drivers/mfd/sm501.c | 8 +-
drivers/mmc/card/sdio_uart.c | 2 +-
drivers/mmc/host/mxcmmc.c | 2 +-
drivers/mtd/chips/jedec_probe.c | 2 +-
drivers/mtd/maps/plat-ram.c | 2 +-
drivers/mtd/nand/bcm_umi_nand.c | 4 +-
drivers/mtd/nand/mxc_nand.c | 2 +-
drivers/net/atlx/atl2.h | 2 +-
drivers/net/chelsio/sge.c | 2 +-
drivers/net/cs89x0.c | 2 +-
drivers/net/cxgb3/sge.c | 4 +-
drivers/net/davinci_emac.c | 2 +-
drivers/net/e1000e/82571.c | 2 +-
drivers/net/e1000e/lib.c | 2 +-
drivers/net/igb/igb_main.c | 2 +-
drivers/net/irda/sa1100_ir.c | 2 +-
drivers/net/ks8851.c | 2 +-
drivers/net/qlge/qlge_ethtool.c | 2 +-
drivers/net/qlge/qlge_main.c | 2 +-
drivers/net/sfc/regs.h | 2 +-
drivers/net/skfp/ess.c | 2 +-
drivers/net/smsc9420.c | 2 +-
drivers/net/spider_net.c | 4 +-
drivers/net/sungem.c | 2 +-
drivers/net/tehuti.c | 2 +-
drivers/net/tokenring/tms380tr.c | 4 +-
drivers/net/tun.c | 2 +-
drivers/net/typhoon.c | 6 +-
drivers/net/ucc_geth.c | 2 +-
drivers/net/wan/cosa.c | 10 +-
drivers/net/wan/hdlc_cisco.c | 8 +-
drivers/net/wan/hdlc_x25.c | 4 +-
drivers/net/wimax/i2400m/fw.c | 2 +-
drivers/net/wimax/i2400m/i2400m.h | 2 +-
drivers/net/wimax/i2400m/sdio.c | 4 +-
drivers/net/wimax/i2400m/usb.c | 4 +-
drivers/net/wireless/ath/ar9170/main.c | 2 +-
drivers/net/wireless/iwmc3200wifi/lmac.h | 2 +-
drivers/net/wireless/rt2x00/rt2500usb.c | 4 +-
drivers/net/wireless/rt2x00/rt2800usb.c | 4 +-
drivers/net/wireless/rt2x00/rt2x00debug.c | 2 +-
drivers/net/wireless/rt2x00/rt2x00dev.c | 2 +-
drivers/net/wireless/rt2x00/rt2x00queue.c | 2 +-
drivers/net/wireless/rt2x00/rt61pci.c | 2 +-
drivers/net/wireless/rt2x00/rt73usb.c | 6 +-
drivers/net/wireless/zd1211rw/zd_mac.c | 2 +-
drivers/parport/ChangeLog | 583 -------
drivers/platform/x86/thinkpad_acpi.c | 4 +-
drivers/s390/char/raw3270.c | 2 +-
drivers/s390/char/sclp.c | 2 +-
drivers/scsi/a100u2w.c | 2 +-
drivers/scsi/initio.c | 2 +-
drivers/scsi/libfc/fc_fcp.c | 4 +-
drivers/scsi/lpfc/lpfc_els.c | 4 +-
drivers/scsi/lpfc/lpfc_scsi.c | 4 +-
drivers/scsi/pcmcia/nsp_cs.h | 2 +-
drivers/scsi/pm8001/pm8001_hwi.c | 2 +-
drivers/scsi/pm8001/pm8001_sas.c | 2 +-
drivers/scsi/pmcraid.h | 2 +-
drivers/scsi/sd.c | 2 +-
drivers/serial/samsung.c | 2 +-
drivers/spi/spi_s3c24xx.c | 2 +-
drivers/usb/musb/davinci.c | 2 +-
drivers/usb/musb/musb_regs.h | 2 +-
drivers/usb/serial/cypress_m8.c | 2 +-
drivers/usb/serial/opticon.c | 2 +-
drivers/usb/serial/symbolserial.c | 2 +-
drivers/usb/wusbcore/wusbhc.h | 2 +-
drivers/uwb/i1480/i1480-est.c | 4 +-
drivers/uwb/uwbd.c | 2 +-
drivers/video/68328fb.c | 2 +-
drivers/video/mbx/mbxfb.c | 2 +-
drivers/video/omap/lcdc.c | 2 +-
drivers/video/pm2fb.c | 2 +-
drivers/video/s1d13xxxfb.c | 4 +-
drivers/video/sm501fb.c | 2 +-
drivers/video/sstfb.c | 2 +-
drivers/w1/w1.c | 4 +-
drivers/zorro/zorro.ids | 2 +-
fs/affs/bitmap.c | 2 +-
fs/binfmt_elf_fdpic.c | 2 +-
fs/bio.c | 7 +-
fs/buffer.c | 2 +-
fs/cifs/asn1.c | 2 +-
fs/cifs/cifs_dfs_ref.c | 2 +-
fs/cifs/cifssmb.c | 2 +-
fs/dlm/member.c | 2 +-
fs/ext3/super.c | 2 +-
fs/ext4/mballoc.c | 2 +-
fs/ext4/super.c | 2 +-
fs/fuse/inode.c | 2 +-
fs/gfs2/ops_fstype.c | 2 +-
fs/jbd/transaction.c | 2 +-
fs/locks.c | 2 +-
fs/mpage.c | 2 +-
fs/namei.c | 2 +-
fs/nfsd/nfs4xdr.c | 2 +-
fs/ntfs/ChangeLog | 1702 --------------------
fs/ocfs2/dlmglue.c | 2 +-
fs/ocfs2/extent_map.c | 2 +-
fs/qnx4/inode.c | 3 +-
fs/reiserfs/bitmap.c | 2 +-
fs/udf/inode.c | 2 +-
include/linux/dm9000.h | 2 +-
include/linux/hil.h | 16 +-
include/linux/lru_cache.h | 2 +-
include/linux/mmzone.h | 2 +-
include/linux/rbtree.h | 8 +-
include/linux/sched.h | 2 +-
include/math-emu/op-common.h | 2 +-
include/media/davinci/vpfe_capture.h | 2 +-
include/net/irda/irttp.h | 2 +-
kernel/audit.c | 2 +-
kernel/irq/chip.c | 2 +-
kernel/irq/devres.c | 4 +-
kernel/ksysfs.c | 2 +-
kernel/params.c | 6 +-
kernel/sched_cpupri.c | 2 +-
kernel/trace/ring_buffer.c | 4 +-
kernel/trace/trace.h | 2 +-
mm/highmem.c | 2 +-
mm/slub.c | 2 +-
net/ipv4/tcp_timer.c | 2 +-
net/mac80211/mesh_plink.c | 2 +-
net/netfilter/nf_conntrack_sip.c | 4 +-
net/netfilter/xt_hashlimit.c | 2 +-
net/sctp/sm_sideeffect.c | 2 +-
scripts/gfp-translate | 2 +-
security/selinux/avc.c | 6 +-
sound/pci/rme9652/hdspm.c | 2 +-
sound/soc/codecs/wm8990.c | 2 +-
tools/perf/perf.c | 2 +-
tools/perf/util/hist.c | 2 +-
242 files changed, 396 insertions(+), 3454 deletions(-)
mode change 100755 => 100644 arch/arm/mach-omap2/board-3630sdp.c
mode change 100755 => 100644 arch/arm/mach-omap2/board-zoom-peripherals.c
delete mode 100644 drivers/char/ChangeLog
mode change 100755 => 100644 drivers/mtd/chips/cfi_util.c
mode change 100755 => 100644 drivers/mtd/inftlcore.c
delete mode 100644 drivers/parport/ChangeLog
delete mode 100644 fs/ntfs/ChangeLog
^ permalink raw reply [flat|nested] 25+ messages in thread
* [GIT] trivial
@ 2009-12-07 17:53 Jiri Kosina
0 siblings, 0 replies; 25+ messages in thread
From: Jiri Kosina @ 2009-12-07 17:53 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
Linus,
could you please pull from 'for-linus' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git for-linus
to receive accumulated trivial fixes all over the tree.
The diffstat looks quite huge, mostly because this time we have several patches
that fix up some common typos all over the tree (but usually it makes sense to
fix these, as they make grepping for things much more convenient).
In addition to that, we have some Documentation updates, __init/__exit cleanups
and removal of some code that has been dead for years.
Thanks.
Documentation/ABI/testing/procfs-diskstats | 2 +-
Documentation/ABI/testing/sysfs-block | 2 +-
Documentation/DocBook/genericirq.tmpl | 4 +-
Documentation/DocBook/mtdnand.tmpl | 2 +-
Documentation/DocBook/v4l/videodev2.h.xml | 2 +-
Documentation/DocBook/writing-an-alsa-driver.tmpl | 2 +-
Documentation/dvb/README.dvb-usb | 2 +-
Documentation/edac.txt | 7 +-
Documentation/lguest/lguest.c | 2 +-
Documentation/oops-tracing.txt | 2 +
Documentation/power/regulator/consumer.txt | 2 +-
Documentation/scsi/ChangeLog.megaraid_sas | 2 +-
Documentation/spi/spi-summary | 2 +-
Documentation/sysctl/kernel.txt | 6 +-
Documentation/sysctl/vm.txt | 2 +-
Documentation/timers/hpet.txt | 2 +-
Documentation/video4linux/gspca.txt | 2 +-
Documentation/vm/page-types.c | 2 +-
Documentation/vm/slub.txt | 2 +-
arch/alpha/mm/numa.c | 2 +-
arch/arm/common/scoop.c | 2 +-
arch/arm/mach-bcmring/include/csp/reg.h | 2 +-
.../mach-bcmring/include/mach/csp/dmacHw_priv.h | 2 +-
arch/arm/mach-bcmring/include/mach/csp/mm_addr.h | 2 +-
arch/arm/mach-bcmring/include/mach/dma.h | 2 +-
arch/arm/mach-lh7a40x/include/mach/hardware.h | 2 +-
arch/arm/mach-orion5x/pci.c | 2 +-
arch/arm/mach-pxa/include/mach/palmld.h | 2 +-
arch/arm/mach-pxa/include/mach/palmt5.h | 2 +-
arch/arm/mach-pxa/include/mach/palmtc.h | 2 +-
arch/arm/mach-pxa/include/mach/palmte2.h | 2 +-
arch/arm/mach-pxa/include/mach/palmtx.h | 2 +-
arch/arm/mach-pxa/include/mach/palmz72.h | 2 +-
arch/arm/mach-s3c2400/Kconfig | 6 --
arch/arm/mach-s3c2410/Kconfig | 2 -
arch/arm/mach-s3c2412/Kconfig | 4 -
arch/arm/mach-s3c2440/Kconfig | 3 -
arch/arm/mach-s3c2442/Kconfig | 4 -
arch/arm/mach-s3c2443/Kconfig | 2 -
arch/arm/mach-s3c6400/Kconfig | 2 -
arch/arm/mach-s3c6400/setup-sdhci.c | 2 +-
arch/arm/mach-s3c6410/Kconfig | 2 -
arch/arm/mach-s3c6410/setup-sdhci.c | 2 +-
arch/arm/mach-s5pc100/Kconfig | 2 -
arch/arm/mach-sa1100/dma.c | 2 +-
arch/arm/mach-u300/include/mach/u300-regs.h | 2 +-
arch/arm/plat-mxc/include/mach/iomux-mx3.h | 2 +-
arch/arm/plat-mxc/include/mach/iomux-mxc91231.h | 2 +-
arch/arm/plat-mxc/pwm.c | 2 +-
arch/arm/plat-omap/dma.c | 2 +-
arch/arm/plat-omap/include/mach/omap16xx.h | 2 +-
arch/arm/plat-s3c/Kconfig | 2 -
arch/arm/plat-s3c24xx/Kconfig | 2 -
arch/arm/plat-s3c24xx/include/plat/map.h | 2 +-
arch/arm/plat-s3c64xx/Kconfig | 2 -
arch/arm/plat-s5pc1xx/Kconfig | 2 -
arch/avr32/boards/hammerhead/Kconfig | 2 +-
arch/blackfin/kernel/traps.c | 2 +-
.../mach-bf518/include/mach/defBF51x_base.h | 4 +-
.../mach-bf527/include/mach/defBF52x_base.h | 4 +-
arch/blackfin/mach-bf537/include/mach/defBF534.h | 4 +-
arch/blackfin/mach-bf548/include/mach/defBF544.h | 4 +-
arch/blackfin/mach-bf548/include/mach/defBF547.h | 4 +-
arch/blackfin/mach-bf548/include/mach/defBF548.h | 4 +-
arch/blackfin/mach-bf548/include/mach/defBF549.h | 4 +-
arch/cris/arch-v10/mm/fault.c | 3 +-
arch/cris/arch-v10/mm/tlb.c | 22 -------
arch/cris/mm/fault.c | 2 +-
arch/ia64/hp/common/sba_iommu.c | 2 +-
arch/ia64/ia32/ia32_entry.S | 2 +-
arch/ia64/include/asm/perfmon_default_smpl.h | 2 +-
arch/ia64/include/asm/sn/shubio.h | 2 +-
arch/ia64/kernel/esi.c | 2 +-
arch/ia64/kernel/perfmon.c | 2 +-
arch/m68k/ifpsp060/src/fpsp.S | 28 +++++-----
arch/m68k/ifpsp060/src/pfpsp.S | 26 ++++----
arch/m68k/include/asm/bootinfo.h | 2 +-
arch/microblaze/lib/memcpy.c | 2 +-
arch/microblaze/lib/memmove.c | 2 +-
arch/microblaze/lib/memset.c | 2 +-
arch/mips/include/asm/mach-pnx833x/gpio.h | 2 +-
arch/mips/include/asm/sgi/ioc.h | 2 +-
arch/mips/include/asm/sibyte/sb1250_mac.h | 2 +-
arch/mips/include/asm/sn/sn0/hubio.h | 2 +-
arch/mips/kernel/smtc.c | 2 +-
arch/mips/math-emu/dp_sub.c | 2 +-
arch/mips/txx9/generic/smsc_fdc37m81x.c | 2 +-
arch/parisc/kernel/perf.c | 2 +-
arch/powerpc/include/asm/reg_fsl_emb.h | 2 +-
arch/powerpc/kernel/kgdb.c | 2 +-
arch/powerpc/kernel/tau_6xx.c | 2 +-
arch/powerpc/kernel/vdso.c | 2 +-
arch/powerpc/oprofile/op_model_cell.c | 6 +-
arch/powerpc/platforms/52xx/mpc52xx_pci.c | 2 +-
arch/powerpc/platforms/powermac/pci.c | 2 +-
arch/powerpc/sysdev/dart_iommu.c | 2 +-
arch/s390/math-emu/math.c | 4 +-
arch/sh/include/mach-common/mach/titan.h | 2 +-
arch/x86/include/asm/desc_defs.h | 4 +-
arch/x86/include/asm/mmzone_32.h | 2 +-
arch/x86/include/asm/sigcontext.h | 4 +-
arch/x86/include/asm/uv/uv_bau.h | 2 +-
arch/x86/kernel/acpi/boot.c | 2 +-
arch/x86/kernel/amd_iommu.c | 4 +-
arch/x86/kernel/cpu/perf_event.c | 2 +-
arch/x86/kernel/kprobes.c | 4 +-
arch/x86/mm/kmmio.c | 4 +-
block/blk-iopoll.c | 2 +-
drivers/Kconfig | 2 -
drivers/acpi/video_detect.c | 10 ++--
drivers/ata/ata_piix.c | 2 +-
drivers/ata/libata-sff.c | 6 +-
drivers/ata/pata_cs5535.c | 2 +-
drivers/ata/sata_fsl.c | 6 +-
drivers/atm/iphase.c | 2 +-
drivers/base/dd.c | 2 +-
drivers/block/ataflop.c | 3 -
drivers/block/cciss_cmd.h | 2 +-
drivers/bluetooth/btmrvl_sdio.c | 2 +-
drivers/bluetooth/hci_ldisc.c | 2 +-
drivers/char/mem.c | 2 +-
drivers/char/mspec.c | 2 +-
drivers/char/n_r3964.c | 2 +-
drivers/char/rio/route.h | 2 +-
drivers/char/tty_ioctl.c | 2 +-
drivers/cpuidle/governor.c | 4 +-
drivers/crypto/hifn_795x.c | 2 +-
drivers/dma/at_hdmac.c | 2 +-
drivers/firewire/core-topology.c | 2 +-
drivers/gpu/drm/drm_crtc.c | 4 +-
drivers/gpu/drm/i915/i915_gem.c | 2 +-
drivers/gpu/drm/i915/intel_fb.c | 2 +-
drivers/gpu/drm/i915/intel_sdvo.c | 2 +-
drivers/gpu/drm/radeon/atombios.h | 16 +++---
drivers/gpu/drm/radeon/r600.c | 4 +-
drivers/gpu/drm/radeon/radeon_fb.c | 2 +-
drivers/gpu/drm/radeon/radeon_state.c | 2 +-
drivers/gpu/drm/radeon/radeon_ttm.c | 2 +-
drivers/gpu/drm/radeon/rv770.c | 4 +-
drivers/gpu/drm/ttm/ttm_bo_util.c | 2 +-
drivers/hwmon/adm1029.c | 2 +-
drivers/hwmon/lm93.c | 2 +-
drivers/ieee1394/dv1394.c | 2 +-
drivers/infiniband/hw/cxgb3/cxio_hal.c | 2 +-
drivers/infiniband/hw/ipath/ipath_iba6110.c | 2 +-
drivers/infiniband/hw/ipath/ipath_sd7220.c | 4 +-
drivers/infiniband/hw/mlx4/qp.c | 2 +-
drivers/infiniband/ulp/iser/iser_verbs.c | 2 +-
drivers/input/serio/hp_sdc.c | 2 +-
drivers/input/serio/hp_sdc_mlc.c | 2 +-
drivers/input/touchscreen/atmel-wm97xx.c | 2 +-
drivers/input/touchscreen/mainstone-wm97xx.c | 4 +-
drivers/input/touchscreen/zylonite-wm97xx.c | 2 +-
drivers/isdn/act2000/Kconfig | 4 -
drivers/isdn/capi/Kconfig | 4 -
drivers/isdn/capi/capidrv.c | 2 +-
drivers/isdn/hardware/eicon/di.c | 2 +-
drivers/isdn/hardware/eicon/maintidi.c | 4 +-
drivers/isdn/hardware/mISDN/hfcsusb.c | 2 +-
drivers/isdn/hardware/mISDN/hfcsusb.h | 2 +-
drivers/isdn/hardware/mISDN/mISDNisar.c | 2 +-
drivers/isdn/hisax/hfc_usb.c | 2 +-
drivers/isdn/hysdn/Kconfig | 4 -
drivers/isdn/i4l/isdn_net.c | 2 +-
drivers/isdn/i4l/isdn_ppp.c | 6 +-
drivers/isdn/i4l/isdn_ttyfax.c | 2 +-
drivers/isdn/icn/Kconfig | 4 -
drivers/isdn/mISDN/dsp_core.c | 2 +-
drivers/isdn/mISDN/tei.c | 2 +-
drivers/isdn/pcbit/Kconfig | 4 -
drivers/isdn/sc/Kconfig | 4 -
drivers/macintosh/therm_windtunnel.c | 2 +-
drivers/md/dm-crypt.c | 2 +-
drivers/media/common/saa7146_i2c.c | 2 +-
drivers/media/dvb/dvb-core/dvb_frontend.h | 2 +-
drivers/media/dvb/dvb-core/dvb_net.c | 2 +-
drivers/media/dvb/dvb-usb/anysee.c | 2 +-
drivers/media/dvb/dvb-usb/dibusb-mb.c | 2 +-
drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 2 +-
drivers/media/dvb/dvb-usb/usb-urb.c | 4 +-
drivers/media/dvb/frontends/au8522_decoder.c | 2 +-
drivers/media/dvb/frontends/cx24110.c | 4 +-
drivers/media/dvb/frontends/cx24113.c | 2 +-
drivers/media/dvb/frontends/dib3000mb.c | 2 +-
drivers/media/dvb/frontends/drx397xD.c | 2 +-
drivers/media/dvb/frontends/lgdt330x.c | 4 +-
drivers/media/dvb/frontends/stb0899_drv.c | 2 +-
drivers/media/dvb/ttpci/av7110.c | 4 +-
drivers/media/dvb/ttpci/budget-patch.c | 2 +-
drivers/media/radio/radio-mr800.c | 2 +-
drivers/media/video/cx18/cx18-av-core.h | 2 +-
drivers/media/video/cx18/cx18-driver.c | 4 +-
drivers/media/video/cx18/cx18-mailbox.h | 2 +-
drivers/media/video/cx231xx/cx231xx-avcore.c | 8 ++-
drivers/media/video/cx23885/cx23885-core.c | 4 +-
drivers/media/video/cx23885/cx23885-dvb.c | 2 +-
drivers/media/video/cx88/cx88-core.c | 2 +-
drivers/media/video/davinci/dm355_ccdc.c | 6 +-
drivers/media/video/davinci/dm644x_ccdc.c | 4 +-
drivers/media/video/davinci/vpss.c | 2 +-
drivers/media/video/gspca/sonixb.c | 2 +-
drivers/media/video/gspca/spca500.c | 2 +-
drivers/media/video/gspca/spca501.c | 6 +-
drivers/media/video/gspca/sunplus.c | 2 +-
drivers/media/video/gspca/zc3xx.c | 2 +-
drivers/media/video/ivtv/ivtv-driver.c | 4 +-
drivers/media/video/ov772x.c | 2 +-
drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 2 +-
drivers/media/video/s2255drv.c | 2 +-
drivers/media/video/saa7134/saa7134-core.c | 4 +-
drivers/media/video/saa7164/saa7164-core.c | 4 +-
drivers/media/video/zoran/zoran.h | 2 +-
drivers/message/i2o/i2o_block.c | 2 +-
drivers/message/i2o/iop.c | 4 +-
drivers/misc/sgi-gru/grufile.c | 2 +-
drivers/mmc/card/sdio_uart.c | 40 +++++++------
drivers/mmc/host/s3cmci.c | 2 +-
drivers/mtd/chips/Kconfig | 3 -
drivers/mtd/devices/Kconfig | 3 -
drivers/mtd/devices/slram.c | 2 +-
drivers/mtd/lpddr/Kconfig | 3 -
drivers/mtd/maps/Kconfig | 8 +--
drivers/mtd/nand/Kconfig | 2 -
drivers/mtd/nand/diskonchip.c | 2 +-
drivers/mtd/nand/nand_ecc.c | 2 +-
drivers/mtd/nand/s3c2410.c | 2 +-
drivers/mtd/onenand/Kconfig | 4 -
drivers/mtd/ubi/Kconfig | 2 -
drivers/net/82596.c | 2 +-
drivers/net/amd8111e.c | 7 ++-
drivers/net/appletalk/cops.c | 2 +-
drivers/net/ariadne.h | 2 +-
drivers/net/atl1c/atl1c_main.c | 2 +-
drivers/net/benet/be_cmds.h | 2 +-
drivers/net/benet/be_main.c | 2 +-
drivers/net/bnx2x_reg.h | 2 +-
drivers/net/bonding/bond_alb.c | 2 +-
drivers/net/cxgb3/sge.c | 2 +-
drivers/net/ehea/ehea_ethtool.c | 4 +-
drivers/net/hamradio/baycom_ser_fdx.c | 2 +-
drivers/net/irda/smsc-ircc2.c | 2 +-
drivers/net/iseries_veth.c | 2 +-
drivers/net/lasi_82596.c | 2 +-
drivers/net/lib82596.c | 2 +-
drivers/net/mlx4/en_rx.c | 2 +-
drivers/net/mlx4/en_tx.c | 2 +-
drivers/net/mlx4/mlx4_en.h | 2 +-
drivers/net/ps3_gelic_net.c | 2 +-
drivers/net/ps3_gelic_wireless.h | 2 +-
drivers/net/qla3xxx.c | 2 +-
drivers/net/s2io.c | 2 +-
drivers/net/sis900.c | 4 +-
drivers/net/skfp/h/smc.h | 8 +-
drivers/net/skfp/skfddi.c | 2 +-
drivers/net/sky2.c | 2 +-
drivers/net/smsc911x.c | 2 +-
drivers/net/smsc911x.h | 2 +-
drivers/net/spider_net.c | 2 +-
drivers/net/stmmac/gmac.c | 2 +-
drivers/net/stmmac/gmac.h | 4 +-
drivers/net/tokenring/ibmtr.c | 2 +-
drivers/net/tokenring/smctr.c | 2 +-
drivers/net/ucc_geth.c | 2 +-
drivers/net/ucc_geth.h | 20 +++---
drivers/net/usb/smsc95xx.c | 2 +-
drivers/net/wan/hdlc_fr.c | 2 +-
drivers/net/wan/lmc/lmc_main.c | 2 +-
drivers/net/wimax/i2400m/rx.c | 2 +-
drivers/net/wireless/ath/ath5k/base.h | 4 +-
drivers/net/wireless/ath/ath5k/eeprom.c | 2 +-
drivers/net/wireless/ath/ath5k/phy.c | 6 +-
drivers/net/wireless/ath/ath9k/rc.c | 2 +-
drivers/net/wireless/b43/main.c | 2 +-
drivers/net/wireless/b43legacy/main.c | 2 +-
drivers/net/wireless/ipw2x00/ipw2100.c | 6 +-
drivers/net/wireless/ipw2x00/ipw2200.c | 8 +-
drivers/net/wireless/ipw2x00/libipw_module.c | 2 +-
drivers/net/wireless/iwmc3200wifi/hal.c | 2 +-
drivers/net/wireless/iwmc3200wifi/rx.c | 2 +-
drivers/net/wireless/libertas/if_sdio.c | 2 +-
drivers/net/wireless/orinoco/hermes_dld.c | 4 +-
drivers/net/wireless/prism54/isl_ioctl.c | 4 +-
drivers/net/wireless/rt2x00/rt2400pci.h | 2 +-
drivers/net/wireless/rt2x00/rt2500pci.h | 2 +-
drivers/net/wireless/rt2x00/rt2500usb.h | 2 +-
drivers/net/wireless/rt2x00/rt61pci.h | 2 +-
drivers/net/wireless/rt2x00/rt73usb.h | 2 +-
drivers/net/wireless/wavelan_cs.c | 2 +-
drivers/net/wireless/zd1211rw/zd_mac.c | 2 +-
drivers/parisc/ccio-dma.c | 2 +-
drivers/platform/Kconfig | 2 -
drivers/platform/x86/thinkpad_acpi.c | 2 +-
drivers/pnp/pnpbios/rsparser.c | 8 +-
drivers/ps3/ps3-sys-manager.c | 2 +-
drivers/rtc/rtc-ds1511.c | 4 +-
drivers/rtc/rtc-stk17ta8.c | 2 +-
drivers/rtc/rtc-v3020.c | 2 +-
drivers/s390/block/dasd_proc.c | 2 +-
drivers/s390/char/fs3270.c | 2 +-
drivers/s390/cio/chp.c | 2 +-
drivers/s390/cio/cmf.c | 2 +-
drivers/s390/net/qeth_core_mpc.h | 2 +-
drivers/sbus/char/envctrl.c | 4 +-
drivers/scsi/3w-9xxx.c | 2 +-
drivers/scsi/3w-xxxx.c | 2 +-
drivers/scsi/53c700.c | 2 +-
drivers/scsi/aacraid/aacraid.h | 6 +-
drivers/scsi/aacraid/comminit.c | 2 +-
drivers/scsi/advansys.c | 2 +-
drivers/scsi/aic7xxx/aic79xx.seq | 4 +-
drivers/scsi/aic7xxx/aic79xx_core.c | 2 +-
drivers/scsi/aic7xxx/aic79xx_osm.c | 2 +-
drivers/scsi/aic7xxx/aic7xxx.seq | 2 +-
drivers/scsi/aic7xxx/aic7xxx_core.c | 2 +-
drivers/scsi/aic7xxx/aic7xxx_osm.c | 2 +-
drivers/scsi/aic94xx/aic94xx_reg_def.h | 2 +-
drivers/scsi/bfa/include/defs/bfa_defs_pport.h | 2 +-
drivers/scsi/bfa/include/defs/bfa_defs_tsensor.h | 2 +-
drivers/scsi/bfa/include/protocol/ct.h | 4 +-
drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +-
drivers/scsi/dc395x.c | 2 +-
drivers/scsi/dmx3191d.c | 2 +-
drivers/scsi/hptiop.c | 2 +-
drivers/scsi/libfc/fc_lport.c | 2 +-
drivers/scsi/libiscsi_tcp.c | 2 +-
drivers/scsi/lpfc/lpfc_attr.c | 4 +-
drivers/scsi/lpfc/lpfc_els.c | 4 +-
drivers/scsi/lpfc/lpfc_init.c | 62 ++++++++++----------
drivers/scsi/lpfc/lpfc_sli.c | 10 ++--
drivers/scsi/megaraid.h | 2 +-
drivers/scsi/megaraid/mbox_defs.h | 2 +-
drivers/scsi/megaraid/megaraid_mbox.c | 2 +-
drivers/scsi/mpt2sas/mpt2sas_scsih.c | 2 +-
drivers/scsi/ncr53c8xx.c | 2 +-
drivers/scsi/nsp32.c | 2 +-
drivers/scsi/pmcraid.c | 6 +-
drivers/scsi/pmcraid.h | 6 +-
drivers/scsi/scsi_netlink.c | 2 +-
drivers/scsi/scsi_transport_sas.c | 6 +-
drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +-
drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 +-
drivers/scsi/sym53c8xx_2/sym_hipd.h | 2 +-
drivers/scsi/wd7000.c | 2 +-
drivers/serial/8250_pnp.c | 4 +-
drivers/serial/pmac_zilog.h | 2 +-
drivers/serial/ucc_uart.c | 2 +-
drivers/spi/spidev.c | 2 +-
drivers/staging/otus/80211core/pub_zfi.h | 2 +-
drivers/staging/otus/zdcompat.h | 2 +-
drivers/staging/rtl8187se/r8180.h | 2 +-
drivers/staging/rtl8192su/r8192S_phyreg.h | 2 +-
drivers/telephony/ixj.c | 4 +-
drivers/usb/atm/ueagle-atm.c | 2 +-
drivers/usb/class/usbtmc.c | 2 +-
drivers/usb/core/message.c | 2 +-
drivers/usb/gadget/f_acm.c | 2 +-
drivers/usb/gadget/pxa27x_udc.c | 2 +-
drivers/usb/host/ehci-hcd.c | 2 +-
drivers/usb/host/fhci-sched.c | 2 +-
drivers/usb/wusbcore/crypto.c | 2 +-
drivers/usb/wusbcore/wa-xfer.c | 4 +-
drivers/uwb/i1480/dfu/usb.c | 2 +-
drivers/uwb/neh.c | 2 +-
drivers/uwb/wlp/txrx.c | 2 +-
drivers/video/atmel_lcdfb.c | 2 +-
drivers/video/aty/atyfb_base.c | 4 +-
drivers/video/backlight/atmel-pwm-bl.c | 2 +-
drivers/video/backlight/tosa_lcd.c | 2 +-
drivers/video/console/sticore.c | 2 +-
drivers/video/fb_defio.c | 2 +-
drivers/video/gbefb.c | 2 +-
drivers/video/omap/lcd_ams_delta.c | 4 +-
drivers/video/omap/lcd_mipid.c | 4 +-
drivers/video/sgivwfb.c | 4 +-
drivers/video/stifb.c | 4 +-
drivers/video/tdfxfb.c | 2 +-
drivers/video/via/dvi.c | 4 +-
drivers/video/vt8623fb.c | 2 +-
drivers/watchdog/coh901327_wdt.c | 2 +-
drivers/watchdog/machzwd.c | 2 +-
drivers/watchdog/sb_wdog.c | 4 +-
drivers/watchdog/wdrtas.c | 6 +-
fs/binfmt_elf.c | 2 +-
fs/bio.c | 2 +-
fs/btrfs/extent_map.c | 2 +-
fs/cifs/README | 2 +-
fs/cifs/cifsglob.h | 2 +-
fs/cifs/cifspdu.h | 2 +-
fs/cifs/inode.c | 4 +-
fs/cifs/smbdes.c | 2 +-
fs/compat_ioctl.c | 2 +-
fs/debugfs/inode.c | 6 +-
fs/dlm/plock.c | 2 +-
fs/ext3/inode.c | 2 +-
fs/ext4/inode.c | 8 +-
fs/ext4/mballoc.c | 2 +-
fs/jffs2/compr.c | 2 +-
fs/jffs2/readinode.c | 2 +-
fs/jffs2/xattr.c | 2 +-
fs/jfs/jfs_dmap.c | 4 +-
fs/ncpfs/ioctl.c | 2 +-
fs/notify/inotify/inotify_user.c | 4 -
fs/ntfs/compress.c | 2 +-
fs/ntfs/file.c | 4 +-
fs/ntfs/logfile.c | 2 +-
fs/ocfs2/alloc.c | 2 +-
fs/ocfs2/blockcheck.c | 2 +-
fs/ocfs2/dlm/dlmmaster.c | 2 +-
fs/ocfs2/dlmglue.c | 2 +-
fs/ocfs2/journal.c | 2 +-
fs/ocfs2/refcounttree.c | 2 +-
fs/omfs/bitmap.c | 2 +-
fs/qnx4/bitmap.c | 2 +-
fs/qnx4/dir.c | 6 +-
fs/qnx4/inode.c | 26 ++++----
fs/qnx4/namei.c | 6 +-
fs/reiserfs/fix_node.c | 2 +-
fs/ubifs/recovery.c | 2 +-
fs/xfs/quota/xfs_dquot.h | 2 +-
include/asm-generic/memory_model.h | 2 +-
include/asm-generic/unistd.h | 2 +-
include/linux/cciss_ioctl.h | 2 +-
include/linux/chio.h | 2 +-
include/linux/dm-log-userspace.h | 2 +-
include/linux/in6.h | 2 +-
include/linux/irq.h | 2 +-
include/linux/mfd/ezx-pcap.h | 4 +-
include/linux/pktcdvd.h | 2 +-
include/linux/serial_reg.h | 8 +-
include/linux/spi/spi_bitbang.h | 2 +-
include/linux/sysctl.h | 10 ++--
include/linux/usb/wusb.h | 2 +-
include/linux/videodev2.h | 2 +-
include/net/sctp/structs.h | 2 +-
include/net/tcp.h | 2 +-
include/net/wimax.h | 2 +-
include/sound/ac97_codec.h | 2 +-
include/sound/wm8993.h | 2 +-
include/video/sgivw.h | 11 ++--
ipc/msg.c | 2 +-
kernel/irq/spurious.c | 2 +-
kernel/perf_event.c | 4 +-
kernel/time/clocksource.c | 2 +-
lib/Kconfig.debug | 2 +-
lib/decompress_bunzip2.c | 2 +-
lib/dma-debug.c | 2 +-
lib/idr.c | 4 +-
lib/swiotlb.c | 2 +-
mm/filemap.c | 2 +-
mm/kmemleak.c | 4 +-
mm/memcontrol.c | 6 +-
mm/memory-failure.c | 2 +-
mm/truncate.c | 2 +-
net/bluetooth/bnep/core.c | 4 +-
net/ipv4/netfilter/ipt_ECN.c | 2 +-
net/irda/irlap.c | 14 ++--
net/irda/irlap_event.c | 2 +-
net/irda/irlmp.c | 4 +-
net/mac80211/mesh_pathtbl.c | 4 +-
net/netlabel/netlabel_domainhash.c | 2 +-
net/sched/act_api.c | 2 +-
net/sctp/sm_sideeffect.c | 2 +-
net/sctp/sm_statefuns.c | 2 +-
net/sunrpc/xprtrdma/svc_rdma_sendto.c | 2 +-
net/wimax/op-reset.c | 2 +-
samples/Kconfig | 3 -
scripts/kconfig/mconf.c | 2 +-
security/selinux/netlabel.c | 2 +-
security/selinux/ss/services.c | 2 +-
sound/Kconfig | 6 +--
sound/isa/cs423x/cs4236.c | 2 +-
sound/isa/opti9xx/miro.c | 2 +-
sound/isa/opti9xx/opti92x-ad1848.c | 2 +-
sound/oss/Kconfig | 2 -
sound/oss/dmasound/dmasound_paula.c | 2 +-
sound/pci/ca0106/ca0106_proc.c | 2 +-
sound/pci/cs46xx/imgs/cwcdma.asp | 9 ++-
sound/pci/emu10k1/emu10k1x.c | 2 +-
sound/pci/hda/patch_cirrus.c | 2 +-
sound/pci/hda/patch_cmedia.c | 2 +-
sound/pci/hda/patch_realtek.c | 2 +-
sound/pci/ice1712/juli.c | 2 +-
sound/pci/rme9652/hdspm.c | 4 +-
sound/soc/codecs/uda134x.c | 4 +-
sound/soc/codecs/wm8903.c | 6 +-
sound/soc/codecs/wm8993.c | 4 +-
sound/soc/s3c24xx/s3c24xx_simtec.c | 2 +-
sound/soc/s6000/s6000-pcm.c | 2 +-
sound/sound_core.c | 2 +-
sound/synth/emux/soundfont.c | 2 +-
490 files changed, 721 insertions(+), 832 deletions(-)
Adam Buchbinder (2):
reiserfs: fix misspelling of "journaled"
tree-wide: fix misspelling of "definition" in comments
Alberto Bertogli (1):
fs/debugfs/inode.c: fix comment typos
Amerigo Wang (1):
fix URL in hpet.txt
Anders Larsen (1):
qnx4fs: add missing KERN_xxx to printk() calls
Andrew Sharp (1):
fix my email address.
André Goddard Rosa (1):
tree-wide: fix assorted typos all over the place
Brandon Philips (1):
sky2: fix sky2_link_down copy/paste comment error
Claudio Scordino (1):
atmel_lcdfb.c: fix printk() type mismatch
Davidlohr Bueso (1):
fix typos/grammos in Documentation/edac.txt
Dirk Hohndel (1):
tree-wide: fix a very frequent spelling mistake
Dr. David Alan Gilbert (1):
doc: fix regulator docs cut-and-pasteism
Felipe Contreras (1):
ipc: fix unused variable warning
Giuseppe Scrivano (1):
inotify: remove superfluous return code check
Jean Delvare (1):
comment typo fix: sybsystem -> subsystem
Jiri Kosina (3):
CIRS: turn local_save_flags() + local_irq_disable()into local_irq_save()
CRIS: remove code that has been commented out for many years
ataflop: remove buggy/commented-out IRQ disable from do_fd_request()
Justin P. Mattock (1):
doc: Fix a typo in slub.txt.
Krzysztof Halasa (3):
drivers/ata/libata-sff.c: comment spelling fixes
doc: Fix IRQ chip docs
mtd: Fix comment in Kconfig
Liuweni (1):
fix kerneldoc for set_irq_msi()
Michael Roth (1):
Kconfig: Remove useless and sometimes wrong comments
Nick Bowler (1):
docs: Describe the 'C' taint flag in oops-tracing.txt
Otavio Salvador (1):
pata_cs5535: fix comment header typo
Ozan Çağlayan (1):
ehci-hcd: Fix typo in an error message
Peng Tao (1):
mm: fix comments for invalidate_inode_pages2()
Peter Huewe (2):
add __init/__exit macros to omap video drivers
media/video: add __init/__exit macros to various drivers
Randy Dunlap (1):
docs: fix core_pipe_limit info
Rudy Matela (1):
hdlc: spelling fix in find_pvc() comment
Thadeu Lima de Souza Cascardo (4):
tree-wide: fix some typos and punctuation in comments
sdio_uart: coding style fixes
spidev: fix double "of of" in comment
sysctl: add missing comments
Thiago Farina (1):
sgivwfb: Make use of ARRAY_SIZE.
Uwe Kleine-König (5):
tree-wide: fix typos "selct" + "slect" -> "select"
tree-wide: fix typos "aquire" -> "acquire", "cumsumed" -> "consumed"
move stk17ta8's probe function to .devinit.text
tree-wide: fix typos "offest" -> "offset"
tree-wide: fix typos "couter" -> "counter"
^ permalink raw reply [flat|nested] 25+ messages in thread
end of thread, other threads:[~2014-04-02 14:19 UTC | newest]
Thread overview: 25+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-24 12:02 [GIT] trivial Jiri Kosina
-- strict thread matches above, loose matches on Subject: below --
2014-04-02 14:19 Jiri Kosina
2013-11-15 23:22 Jiri Kosina
2013-07-04 13:26 Jiri Kosina
2013-04-30 8:31 Jiri Kosina
2013-04-30 20:39 ` Jiri Kosina
2013-02-21 10:14 Jiri Kosina
2012-12-12 21:53 Jiri Kosina
2012-10-01 13:16 Jiri Kosina
2012-05-22 10:31 Jiri Kosina
2012-03-20 22:57 Jiri Kosina
2012-01-05 21:39 Jiri Kosina
2011-10-25 9:23 Jiri Kosina
2011-07-30 19:24 Jiri Kosina
2011-07-25 20:26 Jiri Kosina
2011-05-23 12:33 Jiri Kosina
2011-03-18 13:24 Jiri Kosina
2011-01-12 8:49 Jiri Kosina
2010-10-23 21:39 Jiri Kosina
2010-10-24 20:47 ` Linus Torvalds
2010-10-24 21:37 ` Jiri Kosina
2010-08-04 14:34 Jiri Kosina
2010-05-19 12:59 Jiri Kosina
2010-03-08 23:06 Jiri Kosina
2009-12-07 17:53 Jiri Kosina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).