Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/fs/aio.c b/fs/aio.c
index ca1c5180a17f..287a1bc7a182 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -367,8 +367,7 @@ void fastcall __put_ioctx(struct kioctx *ctx)
 {
         unsigned nr_events = ctx->max_reqs;
 
-        if (unlikely(ctx->reqs_active))
-                BUG();
+        BUG_ON(ctx->reqs_active);
 
         cancel_delayed_work(&ctx->wq);
         flush_workqueue(aio_wq);
@@ -505,8 +504,7 @@ static int __aio_put_req(struct kioctx *ctx, struct kiocb *req)
         assert_spin_locked(&ctx->ctx_lock);
 
         req->ki_users --;
-        if (unlikely(req->ki_users < 0))
-                BUG();
+        BUG_ON(req->ki_users < 0);
         if (likely(req->ki_users))
                 return 0;
         list_del(&req->ki_list);                /* remove from active_reqs */