Huacai Chen cf33c1ee52 bcache: Fix building error on MIPS ...

This patch try to fix the building error on MIPS. The reason is MIPS
has already defined the PTR macro, which conflicts with the PTR macro
in include/uapi/linux/bcache.h.

[fixed by mlyle: corrected a line-length issue]

Cc: stable@vger.kernel.org
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Reviewed-by: Michael Lyle <mlyle@lyle.org>
Signed-off-by: Michael Lyle <mlyle@lyle.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

2017-11-24 16:22:58 -07:00

..

acpi

Merge tag 'tty-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2017-11-13 21:05:31 -08:00

asm-generic

include/asm-generic/topology.h: remove unused parent_node() macro

2017-11-17 16:10:05 -08:00

clocksource

Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

2017-11-15 10:56:56 -08:00

crypto

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2017-11-14 10:52:09 -08:00

drm

Merge tag 'drm-for-v4.15-amd-dc' of git://people.freedesktop.org/~airlied/linux

2017-11-17 14:34:42 -08:00

dt-bindings

Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

2017-11-17 20:04:24 -08:00

keys

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

kvm

KVM: arm/arm64: Rework kvm_timer_should_fire

2017-11-06 16:23:17 +01:00

lib

lib: Add shared copies of some GCC library routines

2017-09-25 15:50:57 -07:00

linux

Merge tag 'nfsd-4.15' of git://linux-nfs.org/~bfields/linux

2017-11-18 11:22:04 -08:00

math-emu

…

media

Merge tag 'media/v4.15-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2017-11-15 20:30:12 -08:00

memory

…

misc

…

net

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-11-17 20:18:37 -08:00

pcmcia

…

ras

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

rdma

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

2017-11-15 14:54:53 -08:00

scsi

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2017-11-14 16:23:44 -08:00

soc

Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

2017-11-17 20:04:24 -08:00

sound

Merge tag 'asoc-v4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

2017-11-13 15:45:57 +01:00

target

Merge tag 'configfs-for-4.15' of git://git.infradead.org/users/hch/configfs

2017-11-14 14:44:04 -08:00

trace

Merge tag 'nfsd-4.15' of git://linux-nfs.org/~bfields/linux

2017-11-18 11:22:04 -08:00

uapi

bcache: Fix building error on MIPS

2017-11-24 16:22:58 -07:00

video

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

xen

Merge tag 'for-linus-4.15-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2017-11-16 13:06:27 -08:00