Merge branch 'for-next' into for-linus
Jiri Kosina [Mon, 7 Dec 2009 17:36:35 +0000 (18:36 +0100)]
Conflicts:

kernel/irq/chip.c

48 files changed:
1  2 
Documentation/vm/page-types.c
arch/arm/mach-s3c6410/Kconfig
arch/arm/plat-omap/dma.c
arch/x86/kernel/amd_iommu.c
arch/x86/kernel/cpu/perf_event.c
arch/x86/kernel/kprobes.c
arch/x86/mm/kmmio.c
drivers/ata/sata_fsl.c
drivers/gpu/drm/radeon/atombios.h
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/radeon_ttm.c
drivers/gpu/drm/radeon/rv770.c
drivers/isdn/hardware/eicon/maintidi.c
drivers/isdn/hisax/hfc_usb.c
drivers/isdn/i4l/isdn_ppp.c
drivers/media/video/s2255drv.c
drivers/net/benet/be_cmds.h
drivers/net/benet/be_main.c
drivers/net/cxgb3/sge.c
drivers/net/s2io.c
drivers/net/smsc911x.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/ipw2x00/ipw2100.c
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/ipw2x00/libipw_module.c
drivers/net/wireless/wavelan_cs.c
drivers/platform/x86/thinkpad_acpi.c
drivers/rtc/rtc-v3020.c
drivers/scsi/pmcraid.c
drivers/usb/host/ehci-hcd.c
drivers/video/atmel_lcdfb.c
drivers/video/gbefb.c
fs/btrfs/extent_map.c
fs/cifs/inode.c
fs/compat_ioctl.c
fs/ext3/inode.c
fs/ext4/inode.c
fs/ocfs2/refcounttree.c
include/net/sctp/structs.h
kernel/irq/spurious.c
kernel/perf_event.c
lib/Kconfig.debug
lib/swiotlb.c
net/sctp/sm_sideeffect.c
net/sctp/sm_statefuns.c
samples/Kconfig
security/selinux/ss/services.c
sound/pci/hda/patch_realtek.c

Simple merge
Simple merge
Simple merge
@@@ -2486,11 -2393,10 +2486,11 @@@ static struct iommu_ops amd_iommu_ops 
  
  int __init amd_iommu_init_passthrough(void)
  {
 +      struct amd_iommu *iommu;
        struct pci_dev *dev = NULL;
 -      u16 devid, devid2;
 +      u16 devid;
  
-       /* allocate passthroug domain */
+       /* allocate passthrough domain */
        pt_domain = protection_domain_alloc();
        if (!pt_domain)
                return -ENOMEM;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1657,24 -1659,33 +1657,24 @@@ static void isdn_ppp_mp_receive(isdn_ne
                                         * packets */
        newfrag = skb;
  
 -      /* Insert new fragment into the proper sequence slot.  */
 -      skb_queue_walk(&mp->frags, frag) {
 -              if (MP_SEQ(frag) == newseq) {
 -                      isdn_ppp_mp_free_skb(mp, newfrag);
 -                      newfrag = NULL;
 -                      break;
 -              }
 -              if (MP_LT(newseq, MP_SEQ(frag))) {
 -                      __skb_queue_before(&mp->frags, frag, newfrag);
 -                      newfrag = NULL;
 -                      break;
 -              }
 -      }
 -      if (newfrag)
 -              __skb_queue_tail(&mp->frags, newfrag);
 +      /* if this new fragment is before the first one, then enqueue it now. */
 +      if ((frag = mp->frags) == NULL || MP_LT(newseq, MP_SEQ(frag))) {
 +              newfrag->next = frag;
 +              mp->frags = frag = newfrag;
 +              newfrag = NULL;
 +      }
  
 -      frag = skb_peek(&mp->frags);
 -      start = ((MP_FLAGS(frag) & MP_BEGIN_FRAG) &&
 -               (MP_SEQ(frag) == mp->seq)) ? frag : NULL;
 -      if (!start)
 -              goto check_overflow;
 +      start = MP_FLAGS(frag) & MP_BEGIN_FRAG &&
 +                              MP_SEQ(frag) == mp->seq ? frag : NULL;
  
 -      /* main fragment traversing loop
 +      /* 
 +       * main fragment traversing loop
         *
         * try to accomplish several tasks:
 +       * - insert new fragment into the proper sequence slot (once that's done
 +       *   newfrag will be set to NULL)
         * - reassemble any complete fragment sequence (non-null 'start'
-        *   indicates there is a continguous sequence present)
+        *   indicates there is a contiguous sequence present)
         * - discard any incomplete sequences that are below minseq -- due
         *   to the fact that sender always increment sequence number, if there
         *   is an incomplete sequence below minseq, no new fragments would
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/cifs/inode.c
Simple merge
Simple merge
diff --cc fs/ext3/inode.c
Simple merge
diff --cc fs/ext4/inode.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/swiotlb.c
Simple merge
Simple merge
Simple merge
diff --cc samples/Kconfig
@@@ -40,11 -38,4 +38,10 @@@ config SAMPLE_KRETPROBE
        default m
        depends on SAMPLE_KPROBES && KRETPROBES
  
 +config SAMPLE_HW_BREAKPOINT
 +      tristate "Build kernel hardware breakpoint examples -- loadable module only"
 +      depends on HAVE_HW_BREAKPOINT && m
 +      help
 +        This builds kernel hardware breakpoint example modules.
 +
  endif # SAMPLES
Simple merge
Simple merge