mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
2630628b2dbc3fc320aafaf84836119e4e3d62f1
linux/drivers
History
Lars Ellenberg 2630628b2d drbd: avoid redefinition of BITS_PER_PAGE 
Apparently we now implicitly get definitions for BITS_PER_PAGE and
BITS_PER_PAGE_MASK from the pid_namespace.h

Instead of renaming our defines, I chose to define only if not yet
defined, but to double check the value if already defined.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
2015-11-25 09:22:02 -07:00
..
accessibility
…
acpi
Merge branches 'acpi-smbus', 'acpi-ec' and 'acpi-pci'
2015-11-20 01:22:52 +01:00
amba
…
android
…
ata
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2015-11-13 20:35:54 -08:00
atm
…
auxdisplay
…
base
Merge branch 'pm-sleep'
2015-11-20 01:22:33 +01:00
bcma
…
block
drbd: avoid redefinition of BITS_PER_PAGE
2015-11-25 09:22:02 -07:00
bluetooth
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-11-10 18:11:41 -08:00
bus
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2015-11-10 15:00:03 -08:00
cdrom
…
char
ipmi watchdog : add panic_wdt_timeout parameter
2015-11-16 06:28:43 -06:00
clk
Merge tag 'for-4.4' of git://git.osdn.jp/gitroot/uclinux-h8/linux
2015-11-12 15:26:39 -08:00
clocksource
clocksource: Disallow drivers for ARCH_USES_GETTIMEOFFSET
2015-11-16 19:07:08 +01:00
connector
mm, page_alloc: distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd
2015-11-06 17:50:42 -08:00
cpufreq
Merge branches 'pm-cpufreq' and 'acpi-cppc'
2015-11-20 01:22:10 +01:00
cpuidle
…
crypto
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2015-11-17 09:40:05 -08:00
dca
…
devfreq
…
dio
…
dma
dmaengine: at_hdmac: use %pad format string for dma_addr_t
2015-11-16 09:21:05 +05:30
dma-buf
dma-buf/fence: add fence_wait_any_timeout function v2
2015-10-30 01:16:16 -04:00
edac
Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
2015-11-06 14:22:15 -08:00
eisa
…
extcon
Merge branches 'ib-extcon-mfd-4.4', 'ib-mfd-i2c-v4.4', 'ib-mfd-power-4.4', 'ib-mfd-regmap-4.4' and 'ib-mfd-regulator-4.4' into ibs-for-mfd-merged
2015-10-26 14:48:22 +00:00
firewire
Merge tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
2015-11-11 10:21:34 -08:00
firmware
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2015-11-10 15:00:03 -08:00
fmc
…
fpga
fpga: socfpga: Fix check of return value of devm_request_irq
2015-10-29 15:20:25 -07:00
gpio
Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
2015-11-06 14:22:15 -08:00
gpu
Merge tag 'drm-intel-fixes-2015-11-19' of git://anongit.freedesktop.org/drm-intel into drm-fixes
2015-11-20 09:45:31 +10:00
hid
HID: wacom: fixup quirks setup for WACOM_DEVICETYPE_PAD
2015-11-17 00:24:14 +01:00
hsi
hsi: controllers:remove redundant code
2015-10-30 16:10:40 +01:00
hv
drivers/hv: share Hyper-V SynIC constants with userspace
2015-11-04 16:24:33 +01:00
hwmon
hwmon: (scpi) skip unsupported sensors properly
2015-11-16 09:59:50 -08:00
hwspinlock
…
hwtracing
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2015-11-13 20:04:17 -08:00
i2c
i2c: i801: add Intel Lewisburg device IDs
2015-11-20 16:22:21 +01:00
ide
mm, page_alloc: rename __GFP_WAIT to __GFP_RECLAIM
2015-11-06 17:50:42 -08:00
idle
…
iio
Merge tag 'iio-fixes-for-4.4a' of ssh://ra.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
2015-11-18 13:15:50 -08:00
infiniband
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2015-11-13 20:35:54 -08:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2015-11-13 21:41:14 -08:00
iommu
s390/pci_dma: handle dma table failures
2015-11-09 09:10:49 +01:00
ipack
…
irqchip
irqchip/gic: Add save/restore of the active state
2015-11-17 14:25:59 +01:00
isdn
Merge tag 'tty-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
2015-11-04 21:35:12 -08:00
leds
Merge tag 'spi-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
2015-11-05 13:15:12 -08:00
lguest
…
lightnvm
lightnvm: add free and bad lun info to show luns
2015-11-20 08:33:21 -07:00
macintosh
…
mailbox
mailbox: mailbox-test: avoid reading iomem twice
2015-11-04 14:03:04 +05:30
mcb
mcb: Destroy IDA on module unload
2015-10-29 09:02:16 +09:00
md
dm thin: fix regression in advertised discard limits
2015-11-23 14:54:46 -05:00
media
various: fix pci_set_dma_mask return value checking
2015-11-20 16:17:32 -08:00
memory
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2015-11-10 15:00:03 -08:00
memstick
…
message
Merge tag '4.4-scsi-mkp' into misc
2015-11-12 07:06:18 -05:00
mfd
Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
2015-11-06 14:22:15 -08:00
misc
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2015-11-13 20:04:17 -08:00
mmc
mmc: remove bondage between REQ_META and reliable write
2015-11-09 14:04:52 +01:00
mtd
mtd: nand: fix shutdown/reboot for multi-chip systems
2015-11-16 10:51:39 -08:00
net
various: fix pci_set_dma_mask return value checking
2015-11-20 16:17:32 -08:00
nfc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-11-10 18:11:41 -08:00
ntb
NTB: fix 32-bit compiler warning
2015-11-08 16:24:43 -05:00
nubus
…
nvdimm
libnvdimm, pmem: fix size trim in pmem_direct_access()
2015-11-12 09:55:23 -08:00
nvme
nvme: add missing unmaps in nvme_queue_rq
2015-11-24 15:24:05 -07:00
nvmem
…
of
Merge tag 'pm+acpi-4.4-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2015-11-12 11:50:33 -08:00
oprofile
…
parisc
pci: remove pci_dma_supported
2015-11-10 16:32:11 -08:00
parport
…
pci
Merge branches 'acpi-smbus', 'acpi-ec' and 'acpi-pci'
2015-11-20 01:22:52 +01:00
pcmcia
…
perf
Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
2015-11-04 14:47:13 -08:00
phy
phy: qcom-ufs: fix build error when the component is built as a module
2015-11-09 17:44:24 -05:00
pinctrl
Merge tag 'gpio-v4.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
2015-11-02 12:59:12 -08:00
platform
Merge tag 'chrome-platform-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform
2015-11-13 21:53:18 -08:00
pnp
…
power
Merge tag 'mfd-for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
2015-11-06 10:23:50 -08:00
powercap
…
pps
…
ps3
…
ptp
…
pwm
Merge tag 'pwm/for-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
2015-11-11 09:16:10 -08:00
rapidio
…
ras
…
regulator
Merge tag 'spi-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
2015-11-05 13:15:12 -08:00
remoteproc
…
reset
…
rpmsg
…
rtc
Merge tag 'rtc-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
2015-11-10 10:01:21 -08:00
s390
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2015-11-18 08:59:29 -08:00
sbus
…
scsi
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2015-11-13 20:35:54 -08:00
sfi
…
sh
drivers: sh: Get rid of CONFIG_ARCH_SHMOBILE_MULTI
2015-11-17 02:12:46 +09:00
sn
…
soc
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2015-11-10 15:00:03 -08:00
spi
Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/ti-qspi' and 'spi/topic/txx9' into spi-next
2015-11-04 11:02:16 +00:00
spmi
Merge tag 'char-misc-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2015-11-04 22:15:15 -08:00
ssb
ssb: add Kconfig entry for compiling SoC related code
2015-10-28 21:05:21 +02:00
staging
Revert "Staging: wilc1000: coreconfigurator: Drop unneeded wrapper functions"
2015-11-18 13:22:44 -08:00
target
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2015-11-13 20:35:54 -08:00
tc
…
thermal
thermal: rockchip: fix compile error
2015-11-11 19:52:39 -08:00
thunderbolt
…
tty
serial: export fsl8250_handle_irq
2015-11-20 16:19:54 -08:00
uio
…
usb
usblp: do not set TASK_INTERRUPTIBLE before lock
2015-11-19 16:31:42 -08:00
uwb
Merge tag 'driver-core-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2015-11-04 21:50:37 -08:00
vfio
Merge tag 'vfio-v4.4-rc1' of git://github.com/awilliam/linux-vfio
2015-11-13 17:05:32 -08:00
vhost
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2015-11-13 20:04:17 -08:00
video
Merge tag 'fbdev-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
2015-11-10 10:00:09 -08:00
virt
…
virtio
…
vlynq
…
vme
Merge tag 'char-misc-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2015-11-04 22:15:15 -08:00
w1
Merge tag 'for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
2015-11-05 12:28:15 -08:00
watchdog
Merge git://www.linux-watchdog.org/linux-watchdog
2015-11-10 10:11:12 -08:00
xen
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2015-11-13 20:04:17 -08:00
zorro
…
Kconfig
Merge tag 'char-misc-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2015-11-04 22:15:15 -08:00
Makefile
null_blk: register as a LightNVM device
2015-11-16 15:22:28 -07:00