linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the akpm-current tree with the pci tree
@ 2014-09-25  7:47 Stephen Rothwell
  2014-09-25 19:30 ` Peter Feiner
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2014-09-25  7:47 UTC (permalink / raw)
  To: Andrew Morton, Bjorn Helgaas
  Cc: linux-next, linux-kernel, Liviu Dudau, Peter Feiner

[-- Attachment #1: Type: text/plain, Size: 1461 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
include/asm-generic/pgtable.h between commit b766eafe6828 ("PCI: Add
pci_remap_iospace() to map bus I/O resources") from the pci tree and
commit 4cc2f91f2636 ("mm: softdirty: enable write notifications on VMAs
after VM_SOFTDIRTY cleared") from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/asm-generic/pgtable.h
index 977e545a64c3,f6acf1195182..000000000000
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
@@@ -249,10 -249,18 +249,22 @@@ static inline int pmd_same(pmd_t pmd_a
  #define pgprot_writecombine pgprot_noncached
  #endif
  
 +#ifndef pgprot_device
 +#define pgprot_device pgprot_noncached
 +#endif
 +
+ #ifndef pgprot_modify
+ #define pgprot_modify pgprot_modify
+ static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
+ {
+ 	if (pgprot_val(oldprot) == pgprot_val(pgprot_noncached(oldprot)))
+ 		newprot = pgprot_noncached(newprot);
+ 	if (pgprot_val(oldprot) == pgprot_val(pgprot_writecombine(oldprot)))
+ 		newprot = pgprot_writecombine(newprot);
+ 	return newprot;
+ }
+ #endif
+ 
  /*
   * When walking page tables, get the address of the next boundary,
   * or the end address of the range if that comes earlier.  Although no

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
* linux-next: manual merge of the akpm-current tree with the pci tree
@ 2018-07-10  6:57 Stephen Rothwell
  0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2018-07-10  6:57 UTC (permalink / raw)
  To: Andrew Morton, Bjorn Helgaas
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Doug Meyer,
	Logan Gunthorpe

[-- Attachment #1: Type: text/plain, Size: 1457 bytes --]

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  drivers/ntb/hw/mscc/ntb_hw_switchtec.c

between commit:

  cfdfc14e7fb8 ("switchtec: Use generic PCI Vendor ID and Class Code")

from the pci tree and commit:

  a2a35435484e ("ntb: ntb_hw_switchtec: cleanup 64bit IO defines to use the common header")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/ntb/hw/mscc/ntb_hw_switchtec.c
index 5ee5f40b4dfc,f403da24b833..000000000000
--- a/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
+++ b/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
@@@ -13,13 -13,13 +13,14 @@@
   *
   */
  
- #include <linux/switchtec.h>
- #include <linux/module.h>
+ #include <linux/interrupt.h>
+ #include <linux/io-64-nonatomic-lo-hi.h>
  #include <linux/delay.h>
  #include <linux/kthread.h>
- #include <linux/interrupt.h>
+ #include <linux/module.h>
  #include <linux/ntb.h>
 +#include <linux/pci.h>
+ #include <linux/switchtec.h>
  
  MODULE_DESCRIPTION("Microsemi Switchtec(tm) NTB Driver");
  MODULE_VERSION("0.1");

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
* linux-next: manual merge of the akpm-current tree with the pci tree
@ 2013-12-23  3:45 Stephen Rothwell
  0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2013-12-23  3:45 UTC (permalink / raw)
  To: Andrew Morton, Bjorn Helgaas; +Cc: linux-next, linux-kernel, Joe Perches

[-- Attachment #1: Type: text/plain, Size: 1854 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
scripts/checkpatch.pl between commit 92e112fdbb3c ("PCI/checkpatch:
Deprecate DEFINE_PCI_DEVICE_TABLE") from the pci tree and commit
369353832de3 ("checkpatch.pl: check for function declarations without
arguments") from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc scripts/checkpatch.pl
index 9fb30b15c9dc,8f3aecd3e27b..000000000000
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@@ -2634,13 -2630,19 +2630,22 @@@ sub process 
  				$herecurr);
                 }
  
+ # check for function declarations without arguments like "int foo()"
+ 		if ($line =~ /(\b$Type\s+$Ident)\s*\(\s*\)/) {
+ 			if (ERROR("FUNCTION_WITHOUT_ARGS",
+ 				  "Bad function definition - $1() should probably be $1(void)\n" . $herecurr) &&
+ 			    $fix) {
+ 				$fixed[$linenr - 1] =~ s/(\b($Type)\s+($Ident))\s*\(\s*\)/$2 $3(void)/;
+ 			}
+ 		}
+ 
 -# check for declarations of struct pci_device_id
 -		if ($line =~ /\bstruct\s+pci_device_id\s+\w+\s*\[\s*\]\s*\=\s*\{/) {
 -			WARN("DEFINE_PCI_DEVICE_TABLE",
 -			     "Use DEFINE_PCI_DEVICE_TABLE for struct pci_device_id\n" . $herecurr);
 +# check for uses of DEFINE_PCI_DEVICE_TABLE
 +		if ($line =~ /\bDEFINE_PCI_DEVICE_TABLE\s*\(\s*(\w+)\s*\)\s*=/) {
 +			if (WARN("DEFINE_PCI_DEVICE_TABLE",
 +				 "Prefer struct pci_device_id over deprecated DEFINE_PCI_DEVICE_TABLE\n" . $herecurr) &&
 +			    $fix) {
 +				$fixed[$linenr - 1] =~ s/\b(?:static\s+|)DEFINE_PCI_DEVICE_TABLE\s*\(\s*(\w+)\s*\)\s*=\s*/static const struct pci_device_id $1\[\] = /;
 +			}
  		}
  
  # check for new typedefs, only function parameters and sparse annotations

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-07-10  6:57 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-25  7:47 linux-next: manual merge of the akpm-current tree with the pci tree Stephen Rothwell
2014-09-25 19:30 ` Peter Feiner
2014-09-25 19:47   ` Andrew Morton
2014-09-26  9:00     ` Liviu Dudau
  -- strict thread matches above, loose matches on Subject: below --
2018-07-10  6:57 Stephen Rothwell
2013-12-23  3:45 Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).