Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-07 13:53:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Pull trivial tree updates from Jiri Kosina.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  fat: fix error message for bogus number of directory entries
  fat: fix typo s/supeblock/superblock/
  ASoC: max9877: Remove unused function declaration
  dw2102: don't output spurious blank lines to the kernel log
  init: fix Kconfig text
  ARM: io: fix comment grammar
  ocfs: fix ocfs2_xattr_user_get() argument name
  scsi/qla2xxx: Remove erroneous unused macro qla82xx_get_temp_val1()
This commit is contained in:
Linus Torvalds 2016-07-28 14:22:25 -07:00
commit 69c4289449
6 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/include/asm/io.h
View File

@ -282,7 +282,7 @@ extern void _memset_io(volatile void __iomem *, int, size_t);
* These perform PCI memory accesses via an ioremap region. They don't * These perform PCI memory accesses via an ioremap region. They don't
* take an address as such, but a cookie. * take an address as such, but a cookie.
* *
* Again, this are defined to perform little endian accesses. See the * Again, these are defined to perform little endian accesses. See the
* IO port primitives for more information. * IO port primitives for more information.
*/ */
#ifndef readl #ifndef readl

1
drivers/scsi/qla2xxx/qla_nx.h
View File

@ -1183,7 +1183,6 @@ static const int MD_MIU_TEST_AGT_RDDATA[] = { 0x410000A8, 0x410000AC,
#define CRB_NIU_XG_PAUSE_CTL_P1 0x8 #define CRB_NIU_XG_PAUSE_CTL_P1 0x8
#define qla82xx_get_temp_val(x) ((x) >> 16) #define qla82xx_get_temp_val(x) ((x) >> 16)
#define qla82xx_get_temp_val1(x) ((x) && 0x0000FFFF)
#define qla82xx_get_temp_state(x) ((x) & 0xffff) #define qla82xx_get_temp_state(x) ((x) & 0xffff)
#define qla82xx_encode_temp(val, state) (((val) << 16) | (state)) #define qla82xx_encode_temp(val, state) (((val) << 16) | (state))

4
fs/fat/inode.c
View File

@ -1589,7 +1589,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat,
/* /*
* GFP_KERNEL is ok here, because while we do hold the * GFP_KERNEL is ok here, because while we do hold the
* supeblock lock, memory pressure can't call back into * superblock lock, memory pressure can't call back into
* the filesystem, since we're only just about to mount * the filesystem, since we're only just about to mount
* it and have no inodes etc active! * it and have no inodes etc active!
*/ */
@ -1726,7 +1726,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat,
sbi->dir_entries = bpb.fat_dir_entries; sbi->dir_entries = bpb.fat_dir_entries;
if (sbi->dir_entries & (sbi->dir_per_block - 1)) { if (sbi->dir_entries & (sbi->dir_per_block - 1)) {
if (!silent) if (!silent)
fat_msg(sb, KERN_ERR, "bogus directory-entries per block" fat_msg(sb, KERN_ERR, "bogus number of directory entries"
" (%u)", sbi->dir_entries); " (%u)", sbi->dir_entries);
goto out_invalid; goto out_invalid;
} }

2
fs/ocfs2/xattr.c
View File

@ -7344,7 +7344,7 @@ const struct xattr_handler ocfs2_xattr_trusted_handler = {
* 'user' attributes support * 'user' attributes support
*/ */
static int ocfs2_xattr_user_get(const struct xattr_handler *handler, static int ocfs2_xattr_user_get(const struct xattr_handler *handler,
struct dentry *unusde, struct inode *inode, struct dentry *unused, struct inode *inode,
const char *name, void *buffer, size_t size) const char *name, void *buffer, size_t size)
{ {
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);

4
init/Kconfig
View File

@ -852,8 +852,8 @@ config LOG_CPU_MAX_BUF_SHIFT
used as it forces an exact (power of two) size of the ring buffer. used as it forces an exact (power of two) size of the ring buffer.
The number of possible CPUs is used for this computation ignoring The number of possible CPUs is used for this computation ignoring
hotplugging making the compuation optimal for the the worst case hotplugging making the computation optimal for the worst case
scenerio while allowing a simple algorithm to be used from bootup. scenario while allowing a simple algorithm to be used from bootup.
Examples shift values and their meaning: Examples shift values and their meaning:
17 => 128 KB for each CPU 17 => 128 KB for each CPU

2
sound/soc/codecs/max9877.h
View File

@ -32,6 +32,4 @@
#define MAX9877_BYPASS (1 << 6) #define MAX9877_BYPASS (1 << 6)
#define MAX9877_SHDN (1 << 7) #define MAX9877_SHDN (1 << 7)
extern int max9877_add_controls(struct snd_soc_codec *codec);
#endif #endif