Merge remote-tracking branch 'kmap_atomic/kmap_atomic'

Conflicts:
	Documentation/feature-removal-schedule.txt

diff --cc Documentation/feature-removal-schedule.txt
index dca11ea6d2d510151027699260ba2daecbcd136e,65aef30315eedbc4987014195a5051e6ba4847aa..0209440c827eb318c09d0ced0e9b4a79391ce2fc
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -554,12 -554,8 +554,20 @@@ Who:     Don Fry <donald.h.fry@intel.com
  
  ----------------------------
  
 +What: pci_scan_bus_parented()
 +When: 3.5
 +Why:  The pci_scan_bus_parented() interface creates a new root bus.  The
 +      bus is created with default resources (ioport_resource and
 +      iomem_resource) that are always wrong, so we rely on arch code to
 +      correct them later.  Callers of pci_scan_bus_parented() should
 +      convert to using pci_scan_root_bus() so they can supply a list of
 +      bus resources when the bus is created.
 +Who:  Bjorn Helgaas <bhelgaas@google.com>
++
++----------------------------
++
+ What: kmap_atomic(page, km_type)
+ When: 3.5
+ Why:  The old kmap_atomic() with two arguments is deprecated, we only
+       keep it for backward compatibility for few cycles and then drop it.
+ Who:  Cong Wang <amwang@redhat.com>

diff --cc arch/mips/mm/c-r4k.c
Simple merge

diff --cc arch/mips/mm/init.c
Simple merge

diff --cc arch/powerpc/mm/mem.c
Simple merge

diff --cc arch/x86/mm/highmem_32.c
Simple merge

diff --cc drivers/block/loop.c
Simple merge

diff --cc drivers/gpu/drm/ttm/ttm_tt.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000/e1000_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/netdev.c
Simple merge

diff --cc drivers/net/ethernet/sun/cassini.c
Simple merge

diff --cc drivers/net/hyperv/netvsc_drv.c
Simple merge

diff --cc drivers/net/hyperv/rndis_filter.c
Simple merge

diff --cc drivers/scsi/cxgbi/libcxgbi.c
Simple merge

diff --cc drivers/scsi/ips.c
Simple merge

diff --cc drivers/staging/hv/storvsc_drv.c
index 18f8771769be44cb1c8050394b0b6dca2d1732a0,05b8bdc09bf4460335ee4eb1f1eb33bad5fdabca..311e10dfb2b252f960464e1d1b13a91893afbd13
--- 1/drivers/staging/hv/storvsc_drv.c
--- 2/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@@ -963,27 -870,9 +962,27 @@@ static unsigned int copy_from_bounce_bu
  
                        if (bounce_sgl[j].offset == bounce_sgl[j].length) {
                                /* full */
-                               kunmap_atomic((void *)bounce_addr, KM_IRQ0);
+                               kunmap_atomic((void *)bounce_addr);
                                j++;
  
 +                              /*
 +                               * It is possible that the number of elements
 +                               * in the bounce buffer may not be equal to
 +                               * the number of elements in the original
 +                               * scatter list. Handle this correctly.
 +                               */
 +
 +                              if (j == bounce_sgl_count) {
 +                                      /*
 +                                       * We are done; cleanup and return.
 +                                       */
 +                                      kunmap_atomic((void *)(dest_addr -
 +                                                      orig_sgl[i].offset),
 +                                                      KM_IRQ0);
 +                                      local_irq_restore(flags);
 +                                      return total_copied;
 +                              }
 +
                                /* if we need to use another bounce buffer */
                                if (destlen || i != orig_sgl_count - 1)
                                        bounce_addr =

diff --cc drivers/staging/zcache/zcache-main.c
Simple merge

diff --cc fs/btrfs/inode.c
Simple merge

diff --cc fs/fuse/dev.c
Simple merge

diff --cc fs/fuse/file.c
Simple merge

diff --cc fs/gfs2/aops.c
Simple merge

diff --cc fs/gfs2/quota.c
Simple merge

diff --cc fs/jbd/journal.c
Simple merge

diff --cc fs/jbd2/journal.c
Simple merge

diff --cc fs/logfs/dir.c
Simple merge

diff --cc fs/logfs/readwrite.c
Simple merge

diff --cc fs/logfs/segment.c
Simple merge

diff --cc fs/nfs/nfs4proc.c
Simple merge

diff --cc lib/swiotlb.c
Simple merge

diff --cc mm/filemap.c
Simple merge

diff --cc mm/swapfile.c
Simple merge

diff --cc mm/vmalloc.c
Simple merge