You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 9f3938346a Merge branch 'kmap_atomic' of git://github.com/congwang/linux ... Pull kmap_atomic cleanup from Cong Wang. It's been in -next for a long time, and it gets rid of the (no longer used) second argument to k[un]map_atomic(). Fix up a few trivial conflicts in various drivers, and do an "evil merge" to catch some new uses that have come in since Cong's tree. * 'kmap_atomic' of git://github.com/congwang/linux: (59 commits) feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal highmem: kill all __kmap_atomic() [swarren@nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename] drbd: remove the second argument of k[un]map_atomic() zcache: remove the second argument of k[un]map_atomic() gma500: remove the second argument of k[un]map_atomic() dm: remove the second argument of k[un]map_atomic() tomoyo: remove the second argument of k[un]map_atomic() sunrpc: remove the second argument of k[un]map_atomic() rds: remove the second argument of k[un]map_atomic() net: remove the second argument of k[un]map_atomic() mm: remove the second argument of k[un]map_atomic() lib: remove the second argument of k[un]map_atomic() power: remove the second argument of k[un]map_atomic() kdb: remove the second argument of k[un]map_atomic() udf: remove the second argument of k[un]map_atomic() ubifs: remove the second argument of k[un]map_atomic() squashfs: remove the second argument of k[un]map_atomic() reiserfs: remove the second argument of k[un]map_atomic() ocfs2: remove the second argument of k[un]map_atomic() ntfs: remove the second argument of k[un]map_atomic() ...		13 years ago
..
Kbuild	archs: replace unifdef-y with header-y	15 years ago
asm-offsets.h	kbuild: move asm-offsets.h to include/generated	15 years ago
atomic.h	atomic: cleanup asm-generic atomic*.h inclusion	14 years ago
auxvec.h	FRV: Move to arch/frv/include/asm/	16 years ago
ax88796.h	FRV: Move to arch/frv/include/asm/	16 years ago
bitops.h	asm-generic: add another generic ext2 atomic bitops	14 years ago
bitsperlong.h	asm-generic: introduce asm/bitsperlong.h	16 years ago
bug.h	FRV: Stop gcc from generating uninitialised variable warnings after BUG()	16 years ago
bugs.h	FRV: Move to arch/frv/include/asm/	16 years ago
busctl-regs.h	FRV: Move to arch/frv/include/asm/	16 years ago
byteorder.h	FRV: Move to arch/frv/include/asm/	16 years ago
cache.h	FRV: ARCH_KMALLOC_MINALIGN was already defined	15 years ago
cacheflush.h	block: add helpers to run flush_dcache_page() against a bio and a request's pages	15 years ago
checksum.h	FRV: Move to arch/frv/include/asm/	16 years ago
cpu-irqs.h	FRV: Move to arch/frv/include/asm/	16 years ago
cpumask.h	FRV: Move to arch/frv/include/asm/	16 years ago
cputime.h	FRV: Move to arch/frv/include/asm/	16 years ago
current.h	FRV: Move to arch/frv/include/asm/	16 years ago
delay.h	FRV: Move to arch/frv/include/asm/	16 years ago
device.h	FRV: Move to arch/frv/include/asm/	16 years ago
div64.h	FRV: Move to arch/frv/include/asm/	16 years ago
dm9000.h	FRV: Move to arch/frv/include/asm/	16 years ago
dma-mapping.h	dma-mapping: remove dma_is_consistent API	15 years ago
dma.h	FRV: Move to arch/frv/include/asm/	16 years ago
elf.h	elf: kill USE_ELF_CORE_DUMP	15 years ago
emergency-restart.h	FRV: Move to arch/frv/include/asm/	16 years ago
errno.h	FRV: Move to arch/frv/include/asm/	16 years ago
fb.h	FRV: Move to arch/frv/include/asm/	16 years ago
fcntl.h	FRV: Move to arch/frv/include/asm/	16 years ago
fpu.h	FRV: Move to arch/frv/include/asm/	16 years ago
ftrace.h	FRV: Move to arch/frv/include/asm/	16 years ago
futex.h	futex: Sanitize futex ops argument types	14 years ago
gdb-stub.h	frv: extend gdbstub to support more features of gdb	15 years ago
gpio-regs.h	FRV: Move to arch/frv/include/asm/	16 years ago
hardirq.h	atomic: use <linux/atomic.h>	14 years ago
highmem.h	highmem: kill all __kmap_atomic()	13 years ago
hw_irq.h	FRV: Move to arch/frv/include/asm/	16 years ago
io.h	frv: switch to GENERIC_PCI_IOMAP	13 years ago
ioctl.h	FRV: Move to arch/frv/include/asm/	16 years ago
ioctls.h	ioctl: Use asm-generic/ioctls.h on frv (enables termiox)	14 years ago
ipcbuf.h	consolidate a bunch of ipcbuf.h instances	13 years ago
irc-regs.h	FRV: Move to arch/frv/include/asm/	16 years ago
irq.h	FRV: Move to arch/frv/include/asm/	16 years ago
irq_regs.h	FRV: Move to arch/frv/include/asm/	16 years ago
irqflags.h	Fix IRQ flag handling naming	15 years ago
kdebug.h	FRV: Move to arch/frv/include/asm/	16 years ago
kmap_types.h	FRV: Move to arch/frv/include/asm/	16 years ago
linkage.h	FRV: Move to arch/frv/include/asm/	16 years ago
local.h	FRV: Move to arch/frv/include/asm/	16 years ago
local64.h	arch: Implement local64_t	15 years ago
math-emu.h	FRV: Move to arch/frv/include/asm/	16 years ago
mb-regs.h	FRV: Move to arch/frv/include/asm/	16 years ago
mb86943a.h	FRV: Move to arch/frv/include/asm/	16 years ago
mb93091-fpga-irqs.h	FRV: Move to arch/frv/include/asm/	16 years ago
mb93093-fpga-irqs.h	FRV: Move to arch/frv/include/asm/	16 years ago
mb93493-irqs.h	FRV: Move to arch/frv/include/asm/	16 years ago
mb93493-regs.h	FRV: Move to arch/frv/include/asm/	16 years ago
mc146818rtc.h	FRV: Move to arch/frv/include/asm/	16 years ago
mem-layout.h	dma-mapping: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN	15 years ago
mman.h	mm: remove duplicate asm/mman.h files	16 years ago
mmu.h	FRV: Move to arch/frv/include/asm/	16 years ago
mmu_context.h	FRV: Move to arch/frv/include/asm/	16 years ago
module.h	FRV: Move to arch/frv/include/asm/	16 years ago
msgbuf.h	FRV: Move to arch/frv/include/asm/	16 years ago
mutex.h	FRV: Move to arch/frv/include/asm/	16 years ago
page.h	FDPIC: Respect PT_GNU_STACK exec protection markings when creating NOMMU stack	15 years ago
param.h	UAPI: Make FRV use asm-generic/param.h	13 years ago
pci.h	Fix common misspellings	14 years ago
percpu.h	FRV: Move to arch/frv/include/asm/	16 years ago
perf_event.h	perf, arch: Rework perf_event_index()	13 years ago
pgalloc.h	mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()	16 years ago
pgtable.h	mm: remove pte_*map_nested()	14 years ago
poll.h	FRV: Move to arch/frv/include/asm/	16 years ago
posix_types.h	FRV: Move to arch/frv/include/asm/	16 years ago
processor.h	frv, exec: remove redundant set_fs(USER_DS)	14 years ago
ptrace.h	ptrace: unify show_regs() prototype	14 years ago
registers.h	FRV: Move to arch/frv/include/asm/	16 years ago
resource.h	FRV: Move to arch/frv/include/asm/	16 years ago
scatterlist.h	remove needless ISA_DMA_THRESHOLD	15 years ago
sections.h	FRV: Move to arch/frv/include/asm/	16 years ago
segment.h	frv: fix kernel/user segment handling in NOMMU mode	15 years ago
sembuf.h	FRV: Move to arch/frv/include/asm/	16 years ago
serial-regs.h	FRV: Move to arch/frv/include/asm/	16 years ago
serial.h	FRV: Move to arch/frv/include/asm/	16 years ago
setup.h	FRV: Move to arch/frv/include/asm/	16 years ago
shmbuf.h	FRV: Move to arch/frv/include/asm/	16 years ago
shmparam.h	FRV: Move to arch/frv/include/asm/	16 years ago
sigcontext.h	FRV: Move to arch/frv/include/asm/	16 years ago
siginfo.h	FRV: Move to arch/frv/include/asm/	16 years ago
signal.h	FRV: Fix interaction with new generic header stuff	16 years ago
smp.h	FRV: Move to arch/frv/include/asm/	16 years ago
socket.h	net: Add framework to allow sending packets with customized CRC.	13 years ago
sockios.h	FRV: Move to arch/frv/include/asm/	16 years ago
spinlock.h	FRV: Move to arch/frv/include/asm/	16 years ago
spr-regs.h	Fix common misspellings	14 years ago
stat.h	FRV: Move to arch/frv/include/asm/	16 years ago
statfs.h	FRV: Move to arch/frv/include/asm/	16 years ago
string.h	FRV: Move to arch/frv/include/asm/	16 years ago
swab.h	FRV: Move to arch/frv/include/asm/	16 years ago
syscall.h	FRV: Implement new-style ptrace	16 years ago
system.h	FRV: Do some cleanups	14 years ago
termbits.h	tty: Add EXTPROC support for LINEMODE	15 years ago
termios.h	asm-generic: rename termios.h, signal.h and mman.h	16 years ago
thread_info.h	freezer: remove now unused TIF_FREEZE	13 years ago
timer-regs.h	FRV: Move to arch/frv/include/asm/	16 years ago
timex.h	FRV: Move to arch/frv/include/asm/	16 years ago
tlb.h	FRV: Move to arch/frv/include/asm/	16 years ago
tlbflush.h	FRV: Move to arch/frv/include/asm/	16 years ago
topology.h	FRV: Move to arch/frv/include/asm/	16 years ago
types.h	consolidate umode_t declarations	13 years ago
uaccess.h	frv: fix kernel/user segment handling in NOMMU mode	15 years ago
ucontext.h	FRV: Move to arch/frv/include/asm/	16 years ago
unaligned.h	FRV: Move to arch/frv/include/asm/	16 years ago
unistd.h	ns: Wire up the setns system call	14 years ago
user.h	FRV: Move to arch/frv/include/asm/	16 years ago
vga.h	FRV: Move to arch/frv/include/asm/	16 years ago
virtconvert.h	Fix common misspellings	14 years ago
xor.h	FRV: Move to arch/frv/include/asm/	16 years ago