Alexandre Bounine
de74e00a96
rapidio: add destination ID allocation mechanism ...
Replace the single global destination ID counter with per-net allocation
mechanism to allow independent destID management for each available
RapidIO network. Using bitmap based mechanism instead of counters allows
destination ID release and reuse in systems that support hot-swap.
Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Li Yang <leoli@freescale.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-10-06 03:05:23 +09:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2012-10-03 23:29:23 -07:00
SCSI for-linus on 20121002
2012-10-02 19:01:32 -07:00
sections: fix section conflicts in drivers/atm
2012-10-06 03:04:40 +09:00
firmware: use 'kernel_read()' to read firmware into kernel buffer
2012-10-04 09:19:02 -07:00
bcma: change delays to follow timers-howto guide
2012-09-28 13:54:02 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2012-10-02 11:11:09 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
drivers: bus: omap_l3: fixup merge conflict resolution
2012-10-01 19:39:48 -07:00
sections: fix section conflicts in drivers/char
2012-10-06 03:04:41 +09:00
spi: Updates for v3.7
2012-10-02 17:26:42 -07:00
Power management updates for 3.7-rc1
2012-10-02 18:32:35 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
Power management updates for 3.7-rc1
2012-10-02 18:32:35 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2012-10-04 09:06:34 -07:00
drivers/dma/dmaengine.c: lower the priority of 'failed to get' dma channel message
2012-10-06 03:04:36 +09:00
Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2012-10-02 09:54:49 -07:00
Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2012-10-02 09:54:49 -07:00
firewire: addendum to address handler RCU conversion
2012-09-28 11:47:42 +02:00
So this is the LW GPIO patch stack for v3.7:
2012-10-02 16:05:10 -07:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2012-10-03 23:29:23 -07:00
Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2012-10-02 09:54:49 -07:00
ARM: soc: multiplatform enablement
2012-10-01 19:11:38 -07:00
idr: rename MAX_LEVEL to MAX_IDR_LEVEL
2012-10-06 03:04:56 +09:00
sections: fix section conflicts in drivers/ide
2012-10-06 03:04:41 +09:00
idr: rename MAX_LEVEL to MAX_IDR_LEVEL
2012-10-06 03:04:56 +09:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-10-02 17:16:10 -07:00
PCI changes for the 3.7 merge window:
2012-10-01 12:05:36 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2012-10-02 09:54:49 -07:00
sections: fix section conflicts in drivers/macintosh
2012-10-06 03:04:41 +09:00
Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2012-10-02 09:54:49 -07:00
Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2012-10-02 09:54:49 -07:00
memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl()
2012-09-26 14:04:09 -07:00
sections: fix section conflicts in drivers/mfd
2012-10-06 03:04:42 +09:00
Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2012-10-02 09:54:49 -07:00
sections: fix section conflicts in drivers/mmc
2012-10-06 03:04:42 +09:00
The main change is the way we reserve eraseblocks for bad blocks
2012-10-02 20:49:15 -07:00
rapidio/rionet: rework to support multiple RIO master ports
2012-10-06 03:05:23 +09:00
NFC: Fix missing mutex unlock in pn533_send_cmd_frame_async
2012-09-27 10:47:48 +02:00
Devicetree updates for 3.7
2012-10-03 09:44:08 -07:00
Features:
2012-10-02 22:09:10 -07:00
ARM: soc: multiplatform enablement
2012-10-01 19:11:38 -07:00
These are the bulk pinctrl changes for kernel v3.7:
2012-10-02 16:20:20 -07:00
sections: fix section conflicts in drivers/platform/x86
2012-10-06 03:04:43 +09:00
Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2012-10-02 09:54:49 -07:00
idr: rename MAX_LEVEL to MAX_IDR_LEVEL
2012-10-06 03:04:56 +09:00
rapidio: add destination ID allocation mechanism
2012-10-06 03:05:23 +09:00
Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2012-10-02 09:54:49 -07:00
- Remoteproc Recovery - by Fernando Guzman Lugo - when a remote processor
2012-10-04 09:11:57 -07:00
drivers/rtc/rtc-s35390a.c: add wakealarm support for rtc-s35390A rtc chip
2012-10-06 03:05:08 +09:00
SCSI for-linus on 20121002
2012-10-02 19:01:32 -07:00
sections: fix section conflicts in drivers/scsi
2012-10-06 03:04:44 +09:00
ARM: soc: multiplatform enablement
2012-10-01 19:11:38 -07:00
Devicetree updates for 3.7
2012-10-03 09:44:08 -07:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2012-10-03 23:29:23 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-10-01 09:06:36 -07:00
idr: rename MAX_LEVEL to MAX_IDR_LEVEL
2012-10-06 03:04:56 +09:00
Features:
2012-10-02 22:09:10 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-10-02 20:25:04 -07:00
switch simple cases of fget_light to fdget
2012-09-26 22:20:08 -04:00
vhost_set_vring(): turn pollstart/pollstop into bool
2012-09-26 21:10:12 -04:00
drivers/video/backlight/platform_lcd.c: add support for device tree based probe
2012-10-06 03:04:54 +09:00
char/misc driver merge for 3.7-rc1
2012-10-01 12:09:59 -07:00
ARM: soc: general cleanups
2012-10-01 18:19:05 -07:00
Features:
2012-10-02 22:09:10 -07:00
ARM: soc: driver specific changes
2012-10-01 18:46:13 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
de74e00a96