Message ID 20120615.154255.1670197217275981715.davem@davemloft.net
State Accepted
Delegated to: David Miller
Headers show


git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git master


David Miller June 15, 2012, 10:42 p.m.
1) Two fixes to icside, one for a build failure and another for
   a warning.  From Christian Dietrich.

2) Fix a bit operation that did erroneous masking, from Julia

Please pull, thanks a lot!

The following changes since commit eea5b5510fc5545d15b69da8e485a7424ae388cf:

  Merge tag 'please-pull-mce' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras (2012-06-05 15:15:04 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git master

for you to fetch changes up to e58c5de8f59d124907c993ea3126c69493b7eec7:

  drivers/ide/ide-cs.c: adjust suspicious bit operation (2012-06-12 15:51:41 -0700)

Christian Dietrich (2):
      ide: icside.c: Fix compile with CONFIG_BLK_DEV_IDEDMA_ICS=n
      ide: icside.c: fix printk format string compile warning

Julia Lawall (1):
      drivers/ide/ide-cs.c: adjust suspicious bit operation

 drivers/ide/icside.c |   17 ++++++++---------
 drivers/ide/ide-cs.c |    3 ++-
 2 files changed, 10 insertions(+), 10 deletions(-)
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html