public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* linux-next: manual merge of the driver-core.current tree with Linus tree
@ 2013-01-01 23:37 Stephen Rothwell
  2013-01-05  2:33 ` Greg KH
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2013-01-01 23:37 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Bill Pemberton, Wolfram Sang

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

Hi Greg,

Today's linux-next merge of the driver-core.current tree got a conflict
in drivers/i2c/busses/i2c-au1550.c between commit 0b255e927d47 ("i2c:
remove __dev* attributes from subsystem") from Linus' tree and commit
eeb30d064414 ("Drivers: i2c: remove __dev* attributes") from the
driver-core.current tree.

I fixed it up (I used the driver-core.current version) and can carry the
fix as necessary (no action is required).

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

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

^ permalink raw reply	[flat|nested] 6+ messages in thread
* linux-next: manual merge of the driver-core.current tree with Linus' tree
@ 2025-06-15 23:38 Stephen Rothwell
  0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2025-06-15 23:38 UTC (permalink / raw)
  To: Greg KH
  Cc: Danilo Krummrich, Linux Kernel Mailing List,
	Linux Next Mailing List, Viresh Kumar

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

Hi all,

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

  rust/helpers/helpers.c

between commit:

  c7f005f70d22 ("rust: cpu: Add CpuId::current() to retrieve current CPU ID")

from Linus' tree and commit:

  1b56e765bf89 ("rust: completion: implement initial abstraction")

from the driver-core.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 rust/helpers/helpers.c
index 16fa9bca5949,6451cfd94a8d..000000000000
--- a/rust/helpers/helpers.c
+++ b/rust/helpers/helpers.c
@@@ -13,7 -13,7 +13,8 @@@
  #include "build_assert.c"
  #include "build_bug.c"
  #include "clk.c"
+ #include "completion.c"
 +#include "cpu.c"
  #include "cpufreq.c"
  #include "cpumask.c"
  #include "cred.c"

[-- 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 driver-core.current tree with Linus' tree
@ 2012-12-23 22:52 Stephen Rothwell
  2012-12-23 22:56 ` Stephen Rothwell
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2012-12-23 22:52 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, linux-kernel, Bill Pemberton, Wolfram Sang,
	Jean Delvare

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

Hi Greg,

Today's linux-next merge of the driver-core.current tree got conflicts
in 21 files in drivers/i2c between commit 0b255e927d47 ("i2c: remove
__dev* attributes from subsystem") from Linus' tree and commit
eeb30d064414 ("Drivers: i2c: remove __dev* attributes") from the
driver-core.current tree.

I fixed it up (taking a mixture of both commits) and can carry the fix as
necessary (no action is required).

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

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

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-06-15 23:38 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-01 23:37 linux-next: manual merge of the driver-core.current tree with Linus tree Stephen Rothwell
2013-01-05  2:33 ` Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2025-06-15 23:38 linux-next: manual merge of the driver-core.current tree with Linus' tree Stephen Rothwell
2012-12-23 22:52 Stephen Rothwell
2012-12-23 22:56 ` Stephen Rothwell
2012-12-23 23:30   ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox