mirror of https://gitee.com/openkylin/linux.git
d3ec4844d4
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
fs: Merge split strings
treewide: fix potentially dangerous trailing ';' in #defined values/expressions
uwb: Fix misspelling of neighbourhood in comment
net, netfilter: Remove redundant goto in ebt_ulog_packet
trivial: don't touch files that are removed in the staging tree
lib/vsprintf: replace link to Draft by final RFC number
doc: Kconfig: `to be' -> `be'
doc: Kconfig: Typo: square -> squared
doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
drivers/net: static should be at beginning of declaration
drivers/media: static should be at beginning of declaration
drivers/i2c: static should be at beginning of declaration
XTENSA: static should be at beginning of declaration
SH: static should be at beginning of declaration
MIPS: static should be at beginning of declaration
ARM: static should be at beginning of declaration
rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
Update my e-mail address
PCIe ASPM: forcedly -> forcibly
gma500: push through device driver tree
...
Fix up trivial conflicts:
- arch/arm/mach-ep93xx/dma-m2p.c (deleted)
- drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
- drivers/net/r8169.c (just context changes)
|
||
|---|---|---|
| .. | ||
| Makefile | ||
| asm-offsets.c | ||
| backtrace.c | ||
| compat.c | ||
| compat_signal.c | ||
| early_printk.c | ||
| entry.S | ||
| futex_64.S | ||
| hardwall.c | ||
| head_32.S | ||
| head_64.S | ||
| hvglue.lds | ||
| init_task.c | ||
| intvec_32.S | ||
| intvec_64.S | ||
| irq.c | ||
| machine_kexec.c | ||
| messaging.c | ||
| module.c | ||
| pci-dma.c | ||
| pci.c | ||
| proc.c | ||
| process.c | ||
| ptrace.c | ||
| reboot.c | ||
| regs_32.S | ||
| regs_64.S | ||
| relocate_kernel.S | ||
| setup.c | ||
| signal.c | ||
| single_step.c | ||
| smp.c | ||
| smpboot.c | ||
| stack.c | ||
| sys.c | ||
| sysfs.c | ||
| tile-desc_32.c | ||
| tile-desc_64.c | ||
| time.c | ||
| tlb.c | ||
| traps.c | ||
| vmlinux.lds.S | ||